diff --git a/Documentation/Helm-Charts/ceph-cluster-chart.md b/Documentation/Helm-Charts/ceph-cluster-chart.md index f1237fd35..684e14a2e 100644 --- a/Documentation/Helm-Charts/ceph-cluster-chart.md +++ b/Documentation/Helm-Charts/ceph-cluster-chart.md @@ -63,6 +63,8 @@ The following table lists the configurable parameters of the rook-operator chart |-----------|-------------|---------| | `cephBlockPools` | A list of CephBlockPool configurations to deploy | See [below](#ceph-block-pools) | | `cephBlockPoolsVolumeSnapshotClass` | Settings for the block pool snapshot class | See [RBD Snapshots](../Storage-Configuration/Ceph-CSI/ceph-csi-snapshot.md#rbd-snapshots) | +| `cephClusterMetadata.annotations` | | `{}` | +| `cephClusterMetadata.labels` | | `{}` | | `cephClusterSpec` | Cluster configuration. | See [below](#ceph-cluster-spec) | | `cephFileSystemVolumeSnapshotClass` | Settings for the filesystem snapshot class | See [CephFS Snapshots](../Storage-Configuration/Ceph-CSI/ceph-csi-snapshot.md#cephfs-snapshots) | | `cephFileSystems` | A list of CephFileSystem configurations to deploy | See [below](#ceph-file-systems) | diff --git a/deploy/charts/rook-ceph-cluster/templates/cephcluster.yaml b/deploy/charts/rook-ceph-cluster/templates/cephcluster.yaml index 41075e9df..5827aa6d4 100644 --- a/deploy/charts/rook-ceph-cluster/templates/cephcluster.yaml +++ b/deploy/charts/rook-ceph-cluster/templates/cephcluster.yaml @@ -4,6 +4,14 @@ kind: CephCluster metadata: name: {{ .Values.clusterName | default .Release.Namespace | quote }} namespace: {{ .Release.Namespace | quote }} # namespace:cluster + {{- with .Values.cephClusterMetadata.labels }} + labels: + {{- . | toYaml | nindent 4 }} + {{- end }} + {{- with .Values.cephClusterMetadata.annotations }} + annotations: + {{- . | toYaml | nindent 4 }} + {{- end }} spec: {{- with .Values.monitoring }} monitoring: diff --git a/deploy/charts/rook-ceph-cluster/values.yaml b/deploy/charts/rook-ceph-cluster/values.yaml index e85c33473..08bad1516 100644 --- a/deploy/charts/rook-ceph-cluster/values.yaml +++ b/deploy/charts/rook-ceph-cluster/values.yaml @@ -85,6 +85,11 @@ monitoring: # imagePullSecrets: # - name: my-registry-secret +# Labels and annotations to add to the CephCluster CR +cephClusterMetadata: + annotations: {} + labels: {} + # Specify these values to override the Ceph image in the cephClusterSpec below. # If specifying these values, do not include the cephVersion section in the cephClusterSpec. cephImage: