From c13507eb0c878dc1d41ea2d68fa9c8faf99fc5f1 Mon Sep 17 00:00:00 2001 From: wilmardo Date: Tue, 10 Mar 2020 12:28:59 +0100 Subject: [PATCH 1/3] refact: namespace all labels in the helm charts Signed-off-by: wilmardo --- .../templates/csiplugin-configmap.yaml | 8 +++---- .../templates/nodeplugin-daemonset.yaml | 21 +++++++------------ .../templates/nodeplugin-grpc-service.yaml | 11 ++++------ .../templates/nodeplugin-http-service.yaml | 11 ++++------ .../templates/nodeplugin-rolebinding.yaml | 8 +++---- .../templates/nodeplugin-serviceaccount.yaml | 8 +++---- .../templates/provisioner-clusterrole.yaml | 8 +++---- .../provisioner-clusterrolebinding.yaml | 8 +++---- .../templates/provisioner-deployment.yaml | 21 +++++++------------ .../templates/provisioner-grpc-service.yaml | 11 ++++------ .../templates/provisioner-http-service.yaml | 11 ++++------ .../templates/provisioner-role.yaml | 8 +++---- .../templates/provisioner-rolebinding.yaml | 8 +++---- .../provisioner-rules-clusterrole.yaml | 8 +++---- .../templates/provisioner-serviceaccount.yaml | 8 +++---- .../templates/csiplugin-configmap.yaml | 8 +++---- .../templates/nodeplugin-daemonset.yaml | 21 +++++++------------ .../templates/nodeplugin-grpc-service.yaml | 11 ++++------ .../templates/nodeplugin-http-service.yaml | 11 ++++------ .../templates/nodeplugin-role.yaml | 8 +++---- .../templates/nodeplugin-rolebinding.yaml | 8 +++---- .../templates/nodeplugin-serviceaccount.yaml | 8 +++---- .../templates/provisioner-clusterrole.yaml | 8 +++---- .../provisioner-clusterrolebinding.yaml | 8 +++---- .../templates/provisioner-deployment.yaml | 21 +++++++------------ .../templates/provisioner-grpc-service.yaml | 11 ++++------ .../templates/provisioner-http-service.yaml | 11 ++++------ .../templates/provisioner-role.yaml | 8 +++---- .../templates/provisioner-rolebinding.yaml | 8 +++---- .../provisioner-rules-clusterrole.yaml | 8 +++---- .../templates/provisioner-serviceaccount.yaml | 8 +++---- 31 files changed, 121 insertions(+), 203 deletions(-) diff --git a/charts/ceph-csi-cephfs/templates/csiplugin-configmap.yaml b/charts/ceph-csi-cephfs/templates/csiplugin-configmap.yaml index de007232136..ddc7e30d43d 100644 --- a/charts/ceph-csi-cephfs/templates/csiplugin-configmap.yaml +++ b/charts/ceph-csi-cephfs/templates/csiplugin-configmap.yaml @@ -4,11 +4,9 @@ metadata: name: {{ .Values.configMapName | quote }} namespace: {{ .Release.Namespace }} labels: - app: {{ include "ceph-csi-cephfs.name" . }} - chart: {{ include "ceph-csi-cephfs.chart" . }} - component: {{ .Values.provisioner.name }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + app.kubernetes.io/name: {{ include "ceph-csi-cephfs.name" . }} + helm.sh/chart: {{ include "ceph-csi-cephfs.chart" . }} + app.kubernetes.io/component: {{ .Values.provisioner.name }} data: config.json: |- {{ toJson .Values.csiConfig | indent 4 -}} diff --git a/charts/ceph-csi-cephfs/templates/nodeplugin-daemonset.yaml b/charts/ceph-csi-cephfs/templates/nodeplugin-daemonset.yaml index 9c14132d8fc..cdce79c1c64 100644 --- a/charts/ceph-csi-cephfs/templates/nodeplugin-daemonset.yaml +++ b/charts/ceph-csi-cephfs/templates/nodeplugin-daemonset.yaml @@ -4,27 +4,22 @@ metadata: name: {{ include "ceph-csi-cephfs.nodeplugin.fullname" . }} namespace: {{ .Release.Namespace }} labels: - app: {{ include "ceph-csi-cephfs.name" . }} - chart: {{ include "ceph-csi-cephfs.chart" . }} - component: {{ .Values.nodeplugin.name }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + app.kubernetes.io/name: {{ include "ceph-csi-cephfs.name" . }} + helm.sh/chart: {{ include "ceph-csi-cephfs.chart" . }} + app.kubernetes.io/component: {{ .Values.nodeplugin.name }} spec: selector: matchLabels: - app: {{ include "ceph-csi-cephfs.name" . }} - component: {{ .Values.nodeplugin.name }} - release: {{ .Release.Name }} + app.kubernetes.io/name: {{ include "ceph-csi-cephfs.name" . }} + app.kubernetes.io/component: {{ .Values.nodeplugin.name }} updateStrategy: type: {{ .Values.nodeplugin.updateStrategy }} template: metadata: labels: - app: {{ include "ceph-csi-cephfs.name" . }} - chart: {{ include "ceph-csi-cephfs.chart" . }} - component: {{ .Values.nodeplugin.name }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + app.kubernetes.io/name: {{ include "ceph-csi-cephfs.name" . }} + helm.sh/chart: {{ include "ceph-csi-cephfs.chart" . }} + app.kubernetes.io/component: {{ .Values.nodeplugin.name }} spec: serviceAccountName: {{ include "ceph-csi-cephfs.serviceAccountName.nodeplugin" . }} hostNetwork: true diff --git a/charts/ceph-csi-cephfs/templates/nodeplugin-grpc-service.yaml b/charts/ceph-csi-cephfs/templates/nodeplugin-grpc-service.yaml index 6a2b8b34471..b827a8a540a 100644 --- a/charts/ceph-csi-cephfs/templates/nodeplugin-grpc-service.yaml +++ b/charts/ceph-csi-cephfs/templates/nodeplugin-grpc-service.yaml @@ -10,10 +10,8 @@ metadata: namespace: {{ .Release.Namespace }} labels: app: {{ include "ceph-csi-cephfs.fullname" . }} - chart: {{ include "ceph-csi-cephfs.chart" . }} - component: {{ .Values.nodeplugin.name }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + helm.sh/chart: {{ include "ceph-csi-cephfs.chart" . }} + app.kubernetes.io/component: {{ .Values.nodeplugin.name }} spec: {{- if .Values.nodeplugin.grpcMetrics.service.clusterIP }} clusterIP: "{{ .Values.nodeplugin.grpcMetrics.service.clusterIP }}" @@ -34,8 +32,7 @@ spec: port: {{ .Values.nodeplugin.grpcMetrics.service.servicePort }} targetPort: {{ .Values.nodeplugin.grpcMetrics.containerPort }} selector: - app: {{ include "ceph-csi-cephfs.name" . }} - component: {{ .Values.nodeplugin.name }} - release: {{ .Release.Name }} + app.kubernetes.io/name: {{ include "ceph-csi-cephfs.name" . }} + app.kubernetes.io/component: {{ .Values.nodeplugin.name }} type: "{{ .Values.nodeplugin.grpcMetrics.service.type }}" {{- end -}} diff --git a/charts/ceph-csi-cephfs/templates/nodeplugin-http-service.yaml b/charts/ceph-csi-cephfs/templates/nodeplugin-http-service.yaml index 95fee84f2e3..87fcd33fa73 100644 --- a/charts/ceph-csi-cephfs/templates/nodeplugin-http-service.yaml +++ b/charts/ceph-csi-cephfs/templates/nodeplugin-http-service.yaml @@ -10,10 +10,8 @@ metadata: namespace: {{ .Release.Namespace }} labels: app: {{ include "ceph-csi-cephfs.fullname" . }} - chart: {{ include "ceph-csi-cephfs.chart" . }} - component: {{ .Values.nodeplugin.name }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + helm.sh/chart: {{ include "ceph-csi-cephfs.chart" . }} + app.kubernetes.io/component: {{ .Values.nodeplugin.name }} spec: {{- if .Values.nodeplugin.httpMetrics.service.clusterIP }} clusterIP: "{{ .Values.nodeplugin.httpMetrics.service.clusterIP }}" @@ -34,8 +32,7 @@ spec: port: {{ .Values.nodeplugin.httpMetrics.service.servicePort }} targetPort: {{ .Values.nodeplugin.httpMetrics.containerPort }} selector: - app: {{ include "ceph-csi-cephfs.name" . }} - component: {{ .Values.nodeplugin.name }} - release: {{ .Release.Name }} + app.kubernetes.io/name: {{ include "ceph-csi-cephfs.name" . }} + app.kubernetes.io/component: {{ .Values.nodeplugin.name }} type: "{{ .Values.nodeplugin.httpMetrics.service.type }}" {{- end -}} diff --git a/charts/ceph-csi-cephfs/templates/nodeplugin-rolebinding.yaml b/charts/ceph-csi-cephfs/templates/nodeplugin-rolebinding.yaml index 19b3b6d8b23..6825c620661 100644 --- a/charts/ceph-csi-cephfs/templates/nodeplugin-rolebinding.yaml +++ b/charts/ceph-csi-cephfs/templates/nodeplugin-rolebinding.yaml @@ -5,11 +5,9 @@ metadata: name: {{ include "ceph-csi-cephfs.nodeplugin.fullname" . }} namespace: {{ .Release.Namespace }} labels: - app: {{ include "ceph-csi-cephfs.fullname" . }} - chart: {{ include "ceph-csi-cephfs.chart" . }} - component: {{ .Values.nodeplugin.name }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + app.kubernetes.io/name: {{ include "ceph-csi-cephfs.name" . }} + helm.sh/chart: {{ include "ceph-csi-cephfs.chart" . }} + app.kubernetes.io/component: {{ .Values.nodeplugin.name }} subjects: - kind: ServiceAccount name: {{ include "ceph-csi-cephfs.serviceAccountName.nodeplugin" . }} diff --git a/charts/ceph-csi-cephfs/templates/nodeplugin-serviceaccount.yaml b/charts/ceph-csi-cephfs/templates/nodeplugin-serviceaccount.yaml index 5dedaf4b0b8..105e2c3269b 100644 --- a/charts/ceph-csi-cephfs/templates/nodeplugin-serviceaccount.yaml +++ b/charts/ceph-csi-cephfs/templates/nodeplugin-serviceaccount.yaml @@ -5,9 +5,7 @@ metadata: name: {{ include "ceph-csi-cephfs.serviceAccountName.nodeplugin" . }} namespace: {{ .Release.Namespace }} labels: - app: {{ include "ceph-csi-cephfs.name" . }} - chart: {{ include "ceph-csi-cephfs.chart" . }} - component: {{ .Values.nodeplugin.name }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + app.kubernetes.io/name: {{ include "ceph-csi-cephfs.name" . }} + helm.sh/chart: {{ include "ceph-csi-cephfs.chart" . }} + app.kubernetes.io/component: {{ .Values.nodeplugin.name }} {{- end -}} diff --git a/charts/ceph-csi-cephfs/templates/provisioner-clusterrole.yaml b/charts/ceph-csi-cephfs/templates/provisioner-clusterrole.yaml index c656b139a08..e8e28a98083 100644 --- a/charts/ceph-csi-cephfs/templates/provisioner-clusterrole.yaml +++ b/charts/ceph-csi-cephfs/templates/provisioner-clusterrole.yaml @@ -4,11 +4,9 @@ apiVersion: rbac.authorization.k8s.io/v1 metadata: name: {{ include "ceph-csi-cephfs.provisioner.fullname" . }} labels: - app: {{ include "ceph-csi-cephfs.name" . }} - chart: {{ include "ceph-csi-cephfs.chart" . }} - component: {{ .Values.provisioner.name }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + app.kubernetes.io/name: {{ include "ceph-csi-cephfs.name" . }} + helm.sh/chart: {{ include "ceph-csi-cephfs.chart" . }} + app.kubernetes.io/component: {{ .Values.provisioner.name }} aggregationRule: clusterRoleSelectors: - matchLabels: diff --git a/charts/ceph-csi-cephfs/templates/provisioner-clusterrolebinding.yaml b/charts/ceph-csi-cephfs/templates/provisioner-clusterrolebinding.yaml index 82d5d13169e..be257515c7a 100644 --- a/charts/ceph-csi-cephfs/templates/provisioner-clusterrolebinding.yaml +++ b/charts/ceph-csi-cephfs/templates/provisioner-clusterrolebinding.yaml @@ -4,11 +4,9 @@ apiVersion: rbac.authorization.k8s.io/v1 metadata: name: {{ include "ceph-csi-cephfs.provisioner.fullname" . }} labels: - app: {{ include "ceph-csi-cephfs.name" . }} - chart: {{ include "ceph-csi-cephfs.chart" . }} - component: {{ .Values.provisioner.name }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + app.kubernetes.io/name: {{ include "ceph-csi-cephfs.name" . }} + helm.sh/chart: {{ include "ceph-csi-cephfs.chart" . }} + app.kubernetes.io/component: {{ .Values.provisioner.name }} subjects: - kind: ServiceAccount name: {{ include "ceph-csi-cephfs.serviceAccountName.provisioner" . }} diff --git a/charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml b/charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml index 19086a693b6..42df41b8160 100644 --- a/charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml +++ b/charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml @@ -4,26 +4,21 @@ metadata: name: {{ include "ceph-csi-cephfs.provisioner.fullname" . }} namespace: {{ .Release.Namespace }} labels: - app: {{ include "ceph-csi-cephfs.name" . }} - chart: {{ include "ceph-csi-cephfs.chart" . }} - component: {{ .Values.provisioner.name }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + app.kubernetes.io/name: {{ include "ceph-csi-cephfs.name" . }} + helm.sh/chart: {{ include "ceph-csi-cephfs.chart" . }} + app.kubernetes.io/component: {{ .Values.provisioner.name }} spec: replicas: {{ .Values.provisioner.replicaCount }} selector: matchLabels: - app: {{ include "ceph-csi-cephfs.name" . }} - component: {{ .Values.provisioner.name }} - release: {{ .Release.Name }} + app.kubernetes.io/name: {{ include "ceph-csi-cephfs.name" . }} + app.kubernetes.io/component: {{ .Values.provisioner.name }} template: metadata: labels: - app: {{ include "ceph-csi-cephfs.name" . }} - chart: {{ include "ceph-csi-cephfs.chart" . }} - component: {{ .Values.provisioner.name }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + app.kubernetes.io/name: {{ include "ceph-csi-cephfs.name" . }} + helm.sh/chart: {{ include "ceph-csi-cephfs.chart" . }} + app.kubernetes.io/component: {{ .Values.provisioner.name }} spec: serviceAccountName: {{ include "ceph-csi-cephfs.serviceAccountName.provisioner" . }} containers: diff --git a/charts/ceph-csi-cephfs/templates/provisioner-grpc-service.yaml b/charts/ceph-csi-cephfs/templates/provisioner-grpc-service.yaml index eacb8887526..99ec0a71650 100644 --- a/charts/ceph-csi-cephfs/templates/provisioner-grpc-service.yaml +++ b/charts/ceph-csi-cephfs/templates/provisioner-grpc-service.yaml @@ -10,10 +10,8 @@ metadata: namespace: {{ .Release.Namespace }} labels: app: {{ include "ceph-csi-cephfs.fullname" . }} - chart: {{ include "ceph-csi-cephfs.chart" . }} - component: {{ .Values.provisioner.name }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + helm.sh/chart: {{ include "ceph-csi-cephfs.chart" . }} + app.kubernetes.io/component: {{ .Values.provisioner.name }} spec: {{- if .Values.provisioner.grpcMetrics.service.clusterIP }} clusterIP: "{{ .Values.provisioner.grpcMetrics.service.clusterIP }}" @@ -34,8 +32,7 @@ spec: port: {{ .Values.provisioner.grpcMetrics.service.servicePort }} targetPort: {{ .Values.provisioner.grpcMetrics.containerPort }} selector: - app: {{ include "ceph-csi-cephfs.name" . }} - component: {{ .Values.provisioner.name }} - release: {{ .Release.Name }} + app.kubernetes.io/name: {{ include "ceph-csi-cephfs.name" . }} + app.kubernetes.io/component: {{ .Values.provisioner.name }} type: "{{ .Values.provisioner.grpcMetrics.service.type }}" {{- end -}} diff --git a/charts/ceph-csi-cephfs/templates/provisioner-http-service.yaml b/charts/ceph-csi-cephfs/templates/provisioner-http-service.yaml index 5483242421f..27a628a8d72 100644 --- a/charts/ceph-csi-cephfs/templates/provisioner-http-service.yaml +++ b/charts/ceph-csi-cephfs/templates/provisioner-http-service.yaml @@ -10,10 +10,8 @@ metadata: namespace: {{ .Release.Namespace }} labels: app: {{ include "ceph-csi-cephfs.fullname" . }} - chart: {{ include "ceph-csi-cephfs.chart" . }} - component: {{ .Values.provisioner.name }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + helm.sh/chart: {{ include "ceph-csi-cephfs.chart" . }} + app.kubernetes.io/component: {{ .Values.provisioner.name }} spec: {{- if .Values.provisioner.httpMetrics.service.clusterIP }} clusterIP: "{{ .Values.provisioner.httpMetrics.service.clusterIP }}" @@ -34,8 +32,7 @@ spec: port: {{ .Values.provisioner.httpMetrics.service.servicePort }} targetPort: {{ .Values.provisioner.httpMetrics.containerPort }} selector: - app: {{ include "ceph-csi-cephfs.name" . }} - component: {{ .Values.provisioner.name }} - release: {{ .Release.Name }} + app.kubernetes.io/name: {{ include "ceph-csi-cephfs.name" . }} + app.kubernetes.io/component: {{ .Values.provisioner.name }} type: "{{ .Values.provisioner.httpMetrics.service.type }}" {{- end -}} diff --git a/charts/ceph-csi-cephfs/templates/provisioner-role.yaml b/charts/ceph-csi-cephfs/templates/provisioner-role.yaml index 983bc60eed6..6d16259f853 100644 --- a/charts/ceph-csi-cephfs/templates/provisioner-role.yaml +++ b/charts/ceph-csi-cephfs/templates/provisioner-role.yaml @@ -5,11 +5,9 @@ metadata: name: {{ include "ceph-csi-cephfs.provisioner.fullname" . }} namespace: {{ .Release.Namespace }} labels: - app: {{ include "ceph-csi-cephfs.name" . }} - chart: {{ include "ceph-csi-cephfs.chart" . }} - component: {{ .Values.provisioner.name }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + app.kubernetes.io/name: {{ include "ceph-csi-cephfs.name" . }} + helm.sh/chart: {{ include "ceph-csi-cephfs.chart" . }} + app.kubernetes.io/component: {{ .Values.provisioner.name }} rules: - apiGroups: [""] resources: ["configmaps"] diff --git a/charts/ceph-csi-cephfs/templates/provisioner-rolebinding.yaml b/charts/ceph-csi-cephfs/templates/provisioner-rolebinding.yaml index 66fb7258068..a1942eb554b 100644 --- a/charts/ceph-csi-cephfs/templates/provisioner-rolebinding.yaml +++ b/charts/ceph-csi-cephfs/templates/provisioner-rolebinding.yaml @@ -5,11 +5,9 @@ metadata: name: {{ include "ceph-csi-cephfs.provisioner.fullname" . }} namespace: {{ .Release.Namespace }} labels: - app: {{ include "ceph-csi-cephfs.name" . }} - chart: {{ include "ceph-csi-cephfs.chart" . }} - component: {{ .Values.provisioner.name }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + app.kubernetes.io/name: {{ include "ceph-csi-cephfs.name" . }} + helm.sh/chart: {{ include "ceph-csi-cephfs.chart" . }} + app.kubernetes.io/component: {{ .Values.provisioner.name }} subjects: - kind: ServiceAccount name: {{ include "ceph-csi-cephfs.serviceAccountName.provisioner" . }} diff --git a/charts/ceph-csi-cephfs/templates/provisioner-rules-clusterrole.yaml b/charts/ceph-csi-cephfs/templates/provisioner-rules-clusterrole.yaml index 629631fa84c..469d64ac06a 100644 --- a/charts/ceph-csi-cephfs/templates/provisioner-rules-clusterrole.yaml +++ b/charts/ceph-csi-cephfs/templates/provisioner-rules-clusterrole.yaml @@ -4,11 +4,9 @@ apiVersion: rbac.authorization.k8s.io/v1 metadata: name: {{ include "ceph-csi-cephfs.provisioner.fullname" . }}-rules labels: - app: {{ include "ceph-csi-cephfs.name" . }} - chart: {{ include "ceph-csi-cephfs.chart" . }} - component: {{ .Values.provisioner.name }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + app.kubernetes.io/name: {{ include "ceph-csi-cephfs.name" . }} + helm.sh/chart: {{ include "ceph-csi-cephfs.chart" . }} + app.kubernetes.io/component: {{ .Values.provisioner.name }} rbac.cephfs.csi.ceph.com/aggregate-to-{{ include "ceph-csi-cephfs.provisioner.fullname" . }}: "true" rules: - apiGroups: [""] diff --git a/charts/ceph-csi-cephfs/templates/provisioner-serviceaccount.yaml b/charts/ceph-csi-cephfs/templates/provisioner-serviceaccount.yaml index c4ba5c1887b..66240f02a01 100644 --- a/charts/ceph-csi-cephfs/templates/provisioner-serviceaccount.yaml +++ b/charts/ceph-csi-cephfs/templates/provisioner-serviceaccount.yaml @@ -5,9 +5,7 @@ metadata: name: {{ include "ceph-csi-cephfs.serviceAccountName.provisioner" . }} namespace: {{ .Release.Namespace }} labels: - app: {{ include "ceph-csi-cephfs.name" . }} - chart: {{ include "ceph-csi-cephfs.chart" . }} - component: {{ .Values.provisioner.name }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + app.kubernetes.io/name: {{ include "ceph-csi-cephfs.name" . }} + helm.sh/chart: {{ include "ceph-csi-cephfs.chart" . }} + app.kubernetes.io/component: {{ .Values.provisioner.name }} {{- end -}} diff --git a/charts/ceph-csi-rbd/templates/csiplugin-configmap.yaml b/charts/ceph-csi-rbd/templates/csiplugin-configmap.yaml index bfc366b3e0c..31b748922e2 100644 --- a/charts/ceph-csi-rbd/templates/csiplugin-configmap.yaml +++ b/charts/ceph-csi-rbd/templates/csiplugin-configmap.yaml @@ -4,11 +4,9 @@ metadata: name: {{ .Values.configMapName | quote }} namespace: {{ .Release.Namespace }} labels: - app: {{ include "ceph-csi-rbd.name" . }} - chart: {{ include "ceph-csi-rbd.chart" . }} - component: {{ .Values.nodeplugin.name }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + app.kubernetes.io/name: {{ include "ceph-csi-rbd.name" . }} + helm.sh/chart: {{ include "ceph-csi-rbd.chart" . }} + app.kubernetes.io/component: {{ .Values.nodeplugin.name }} data: config.json: |- {{ toJson .Values.csiConfig | indent 4 -}} diff --git a/charts/ceph-csi-rbd/templates/nodeplugin-daemonset.yaml b/charts/ceph-csi-rbd/templates/nodeplugin-daemonset.yaml index f19292642f6..5f4f1961d2b 100644 --- a/charts/ceph-csi-rbd/templates/nodeplugin-daemonset.yaml +++ b/charts/ceph-csi-rbd/templates/nodeplugin-daemonset.yaml @@ -4,27 +4,22 @@ metadata: name: {{ include "ceph-csi-rbd.nodeplugin.fullname" . }} namespace: {{ .Release.Namespace }} labels: - app: {{ include "ceph-csi-rbd.name" . }} - chart: {{ include "ceph-csi-rbd.chart" . }} - component: {{ .Values.nodeplugin.name }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + app.kubernetes.io/name: {{ include "ceph-csi-rbd.name" . }} + helm.sh/chart: {{ include "ceph-csi-rbd.chart" . }} + app.kubernetes.io/component: {{ .Values.nodeplugin.name }} spec: selector: matchLabels: - app: {{ include "ceph-csi-rbd.name" . }} - component: {{ .Values.nodeplugin.name }} - release: {{ .Release.Name }} + app.kubernetes.io/name: {{ include "ceph-csi-rbd.name" . }} + app.kubernetes.io/component: {{ .Values.nodeplugin.name }} updateStrategy: type: {{ .Values.nodeplugin.updateStrategy }} template: metadata: labels: - app: {{ include "ceph-csi-rbd.name" . }} - chart: {{ include "ceph-csi-rbd.chart" . }} - component: {{ .Values.nodeplugin.name }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + app.kubernetes.io/name: {{ include "ceph-csi-rbd.name" . }} + helm.sh/chart: {{ include "ceph-csi-rbd.chart" . }} + app.kubernetes.io/component: {{ .Values.nodeplugin.name }} spec: serviceAccountName: {{ include "ceph-csi-rbd.serviceAccountName.nodeplugin" . }} hostNetwork: true diff --git a/charts/ceph-csi-rbd/templates/nodeplugin-grpc-service.yaml b/charts/ceph-csi-rbd/templates/nodeplugin-grpc-service.yaml index 39e9cf98492..0afda0939d0 100644 --- a/charts/ceph-csi-rbd/templates/nodeplugin-grpc-service.yaml +++ b/charts/ceph-csi-rbd/templates/nodeplugin-grpc-service.yaml @@ -10,10 +10,8 @@ metadata: namespace: {{ .Release.Namespace }} labels: app: {{ include "ceph-csi-rbd.fullname" . }} - chart: {{ include "ceph-csi-rbd.chart" . }} - component: {{ .Values.nodeplugin.name }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + helm.sh/chart: {{ include "ceph-csi-rbd.chart" . }} + app.kubernetes.io/component: {{ .Values.nodeplugin.name }} spec: {{- if .Values.nodeplugin.grpcMetrics.service.clusterIP }} clusterIP: "{{ .Values.nodeplugin.grpcMetrics.service.clusterIP }}" @@ -34,8 +32,7 @@ spec: port: {{ .Values.nodeplugin.grpcMetrics.service.servicePort }} targetPort: {{ .Values.nodeplugin.grpcMetrics.containerPort }} selector: - app: {{ include "ceph-csi-rbd.name" . }} - component: {{ .Values.nodeplugin.name }} - release: {{ .Release.Name }} + app.kubernetes.io/name: {{ include "ceph-csi-rbd.name" . }} + app.kubernetes.io/component: {{ .Values.nodeplugin.name }} type: "{{ .Values.nodeplugin.grpcMetrics.service.type }}" {{- end -}} diff --git a/charts/ceph-csi-rbd/templates/nodeplugin-http-service.yaml b/charts/ceph-csi-rbd/templates/nodeplugin-http-service.yaml index 68a3942e833..5d8c631ea2e 100644 --- a/charts/ceph-csi-rbd/templates/nodeplugin-http-service.yaml +++ b/charts/ceph-csi-rbd/templates/nodeplugin-http-service.yaml @@ -10,10 +10,8 @@ metadata: namespace: {{ .Release.Namespace }} labels: app: {{ include "ceph-csi-rbd.fullname" . }} - chart: {{ include "ceph-csi-rbd.chart" . }} - component: {{ .Values.nodeplugin.name }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + helm.sh/chart: {{ include "ceph-csi-rbd.chart" . }} + app.kubernetes.io/component: {{ .Values.nodeplugin.name }} spec: {{- if .Values.nodeplugin.httpMetrics.service.clusterIP }} clusterIP: "{{ .Values.nodeplugin.httpMetrics.service.clusterIP }}" @@ -34,8 +32,7 @@ spec: port: {{ .Values.nodeplugin.httpMetrics.service.servicePort }} targetPort: {{ .Values.nodeplugin.httpMetrics.containerPort }} selector: - app: {{ include "ceph-csi-rbd.name" . }} - component: {{ .Values.nodeplugin.name }} - release: {{ .Release.Name }} + app.kubernetes.io/name: {{ include "ceph-csi-rbd.name" . }} + app.kubernetes.io/component: {{ .Values.nodeplugin.name }} type: "{{ .Values.nodeplugin.httpMetrics.service.type }}" {{- end -}} diff --git a/charts/ceph-csi-rbd/templates/nodeplugin-role.yaml b/charts/ceph-csi-rbd/templates/nodeplugin-role.yaml index d9d5a0e7bc6..d907f18b5cd 100644 --- a/charts/ceph-csi-rbd/templates/nodeplugin-role.yaml +++ b/charts/ceph-csi-rbd/templates/nodeplugin-role.yaml @@ -5,11 +5,9 @@ metadata: name: {{ include "ceph-csi-rbd.nodeplugin.fullname" . }} namespace: {{ .Release.Namespace }} labels: - app: {{ include "ceph-csi-rbd.name" . }} - chart: {{ include "ceph-csi-rbd.chart" . }} - component: {{ .Values.nodeplugin.name }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + app.kubernetes.io/name: {{ include "ceph-csi-rbd.name" . }} + helm.sh/chart: {{ include "ceph-csi-rbd.chart" . }} + app.kubernetes.io/component: {{ .Values.nodeplugin.name }} rules: - apiGroups: ['policy'] resources: ['podsecuritypolicies'] diff --git a/charts/ceph-csi-rbd/templates/nodeplugin-rolebinding.yaml b/charts/ceph-csi-rbd/templates/nodeplugin-rolebinding.yaml index f4cce98afda..9da02bf43d0 100644 --- a/charts/ceph-csi-rbd/templates/nodeplugin-rolebinding.yaml +++ b/charts/ceph-csi-rbd/templates/nodeplugin-rolebinding.yaml @@ -5,11 +5,9 @@ metadata: name: {{ include "ceph-csi-rbd.nodeplugin.fullname" . }} namespace: {{ .Release.Namespace }} labels: - app: {{ include "ceph-csi-rbd.name" . }} - chart: {{ include "ceph-csi-rbd.chart" . }} - component: {{ .Values.nodeplugin.name }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + app.kubernetes.io/name: {{ include "ceph-csi-rbd.name" . }} + helm.sh/chart: {{ include "ceph-csi-rbd.chart" . }} + app.kubernetes.io/component: {{ .Values.nodeplugin.name }} subjects: - kind: ServiceAccount name: {{ include "ceph-csi-rbd.serviceAccountName.nodeplugin" . }} diff --git a/charts/ceph-csi-rbd/templates/nodeplugin-serviceaccount.yaml b/charts/ceph-csi-rbd/templates/nodeplugin-serviceaccount.yaml index 36e1ee74594..c4c5088ec46 100644 --- a/charts/ceph-csi-rbd/templates/nodeplugin-serviceaccount.yaml +++ b/charts/ceph-csi-rbd/templates/nodeplugin-serviceaccount.yaml @@ -5,9 +5,7 @@ metadata: name: {{ include "ceph-csi-rbd.serviceAccountName.nodeplugin" . }} namespace: {{ .Release.Namespace }} labels: - app: {{ include "ceph-csi-rbd.name" . }} - chart: {{ include "ceph-csi-rbd.chart" . }} - component: {{ .Values.nodeplugin.name }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + app.kubernetes.io/name: {{ include "ceph-csi-rbd.name" . }} + helm.sh/chart: {{ include "ceph-csi-rbd.chart" . }} + app.kubernetes.io/component: {{ .Values.nodeplugin.name }} {{- end -}} diff --git a/charts/ceph-csi-rbd/templates/provisioner-clusterrole.yaml b/charts/ceph-csi-rbd/templates/provisioner-clusterrole.yaml index 21745ed4950..c432104ef26 100644 --- a/charts/ceph-csi-rbd/templates/provisioner-clusterrole.yaml +++ b/charts/ceph-csi-rbd/templates/provisioner-clusterrole.yaml @@ -4,11 +4,9 @@ apiVersion: rbac.authorization.k8s.io/v1 metadata: name: {{ include "ceph-csi-rbd.provisioner.fullname" . }} labels: - app: {{ include "ceph-csi-rbd.name" . }} - chart: {{ include "ceph-csi-rbd.chart" . }} - component: {{ .Values.provisioner.name }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + app.kubernetes.io/name: {{ include "ceph-csi-rbd.name" . }} + helm.sh/chart: {{ include "ceph-csi-rbd.chart" . }} + app.kubernetes.io/component: {{ .Values.provisioner.name }} aggregationRule: clusterRoleSelectors: - matchLabels: diff --git a/charts/ceph-csi-rbd/templates/provisioner-clusterrolebinding.yaml b/charts/ceph-csi-rbd/templates/provisioner-clusterrolebinding.yaml index 5a086103ab0..e1968aa3063 100644 --- a/charts/ceph-csi-rbd/templates/provisioner-clusterrolebinding.yaml +++ b/charts/ceph-csi-rbd/templates/provisioner-clusterrolebinding.yaml @@ -4,11 +4,9 @@ apiVersion: rbac.authorization.k8s.io/v1 metadata: name: {{ include "ceph-csi-rbd.provisioner.fullname" . }} labels: - app: {{ include "ceph-csi-rbd.name" . }} - chart: {{ include "ceph-csi-rbd.chart" . }} - component: {{ .Values.provisioner.name }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + app.kubernetes.io/name: {{ include "ceph-csi-rbd.name" . }} + helm.sh/chart: {{ include "ceph-csi-rbd.chart" . }} + app.kubernetes.io/component: {{ .Values.provisioner.name }} subjects: - kind: ServiceAccount name: {{ include "ceph-csi-rbd.serviceAccountName.provisioner" . }} diff --git a/charts/ceph-csi-rbd/templates/provisioner-deployment.yaml b/charts/ceph-csi-rbd/templates/provisioner-deployment.yaml index 04026fc372b..5ab5006d325 100644 --- a/charts/ceph-csi-rbd/templates/provisioner-deployment.yaml +++ b/charts/ceph-csi-rbd/templates/provisioner-deployment.yaml @@ -4,26 +4,21 @@ metadata: name: {{ include "ceph-csi-rbd.provisioner.fullname" . }} namespace: {{ .Release.Namespace }} labels: - app: {{ include "ceph-csi-rbd.name" . }} - chart: {{ include "ceph-csi-rbd.chart" . }} - component: {{ .Values.provisioner.name }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + app.kubernetes.io/name: {{ include "ceph-csi-rbd.name" . }} + helm.sh/chart: {{ include "ceph-csi-rbd.chart" . }} + app.kubernetes.io/component: {{ .Values.provisioner.name }} spec: replicas: {{ .Values.provisioner.replicaCount }} selector: matchLabels: - app: {{ include "ceph-csi-rbd.name" . }} - component: {{ .Values.provisioner.name }} - release: {{ .Release.Name }} + app.kubernetes.io/name: {{ include "ceph-csi-rbd.name" . }} + app.kubernetes.io/component: {{ .Values.provisioner.name }} template: metadata: labels: - app: {{ include "ceph-csi-rbd.name" . }} - chart: {{ include "ceph-csi-rbd.chart" . }} - component: {{ .Values.provisioner.name }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + app.kubernetes.io/name: {{ include "ceph-csi-rbd.name" . }} + helm.sh/chart: {{ include "ceph-csi-rbd.chart" . }} + app.kubernetes.io/component: {{ .Values.provisioner.name }} spec: serviceAccountName: {{ include "ceph-csi-rbd.serviceAccountName.provisioner" . }} containers: diff --git a/charts/ceph-csi-rbd/templates/provisioner-grpc-service.yaml b/charts/ceph-csi-rbd/templates/provisioner-grpc-service.yaml index cb0c2aaff6b..14a3466dd4e 100644 --- a/charts/ceph-csi-rbd/templates/provisioner-grpc-service.yaml +++ b/charts/ceph-csi-rbd/templates/provisioner-grpc-service.yaml @@ -10,10 +10,8 @@ metadata: namespace: {{ .Release.Namespace }} labels: app: {{ include "ceph-csi-rbd.fullname" . }} - chart: {{ include "ceph-csi-rbd.chart" . }} - component: {{ .Values.provisioner.name }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + helm.sh/chart: {{ include "ceph-csi-rbd.chart" . }} + app.kubernetes.io/component: {{ .Values.provisioner.name }} spec: {{- if .Values.provisioner.grpcMetrics.service.clusterIP }} clusterIP: "{{ .Values.provisioner.grpcMetrics.service.clusterIP }}" @@ -34,8 +32,7 @@ spec: port: {{ .Values.provisioner.grpcMetrics.service.servicePort }} targetPort: {{ .Values.provisioner.grpcMetrics.containerPort }} selector: - app: {{ include "ceph-csi-rbd.name" . }} - component: {{ .Values.provisioner.name }} - release: {{ .Release.Name }} + app.kubernetes.io/name: {{ include "ceph-csi-rbd.name" . }} + app.kubernetes.io/component: {{ .Values.provisioner.name }} type: "{{ .Values.provisioner.grpcMetrics.service.type }}" {{- end -}} diff --git a/charts/ceph-csi-rbd/templates/provisioner-http-service.yaml b/charts/ceph-csi-rbd/templates/provisioner-http-service.yaml index 0d4c925ecff..7cdd8c445a6 100644 --- a/charts/ceph-csi-rbd/templates/provisioner-http-service.yaml +++ b/charts/ceph-csi-rbd/templates/provisioner-http-service.yaml @@ -10,10 +10,8 @@ metadata: namespace: {{ .Release.Namespace }} labels: app: {{ include "ceph-csi-rbd.fullname" . }} - chart: {{ include "ceph-csi-rbd.chart" . }} - component: {{ .Values.provisioner.name }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + helm.sh/chart: {{ include "ceph-csi-rbd.chart" . }} + app.kubernetes.io/component: {{ .Values.provisioner.name }} spec: {{- if .Values.provisioner.httpMetrics.service.clusterIP }} clusterIP: "{{ .Values.provisioner.httpMetrics.service.clusterIP }}" @@ -34,8 +32,7 @@ spec: port: {{ .Values.provisioner.httpMetrics.service.servicePort }} targetPort: {{ .Values.provisioner.httpMetrics.containerPort }} selector: - app: {{ include "ceph-csi-rbd.name" . }} - component: {{ .Values.provisioner.name }} - release: {{ .Release.Name }} + app.kubernetes.io/name: {{ include "ceph-csi-rbd.name" . }} + app.kubernetes.io/component: {{ .Values.provisioner.name }} type: "{{ .Values.provisioner.httpMetrics.service.type }}" {{- end -}} diff --git a/charts/ceph-csi-rbd/templates/provisioner-role.yaml b/charts/ceph-csi-rbd/templates/provisioner-role.yaml index 332104fd0a9..f7e01ad323c 100644 --- a/charts/ceph-csi-rbd/templates/provisioner-role.yaml +++ b/charts/ceph-csi-rbd/templates/provisioner-role.yaml @@ -5,11 +5,9 @@ metadata: name: {{ include "ceph-csi-rbd.provisioner.fullname" . }} namespace: {{ .Release.Namespace }} labels: - app: {{ include "ceph-csi-rbd.name" . }} - chart: {{ include "ceph-csi-rbd.chart" . }} - component: {{ .Values.provisioner.name }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + app.kubernetes.io/name: {{ include "ceph-csi-rbd.name" . }} + helm.sh/chart: {{ include "ceph-csi-rbd.chart" . }} + app.kubernetes.io/component: {{ .Values.provisioner.name }} rules: - apiGroups: [""] resources: ["configmaps"] diff --git a/charts/ceph-csi-rbd/templates/provisioner-rolebinding.yaml b/charts/ceph-csi-rbd/templates/provisioner-rolebinding.yaml index 23fa39fed39..6d1f003b2fb 100644 --- a/charts/ceph-csi-rbd/templates/provisioner-rolebinding.yaml +++ b/charts/ceph-csi-rbd/templates/provisioner-rolebinding.yaml @@ -5,11 +5,9 @@ metadata: name: {{ include "ceph-csi-rbd.provisioner.fullname" . }} namespace: {{ .Release.Namespace }} labels: - app: {{ include "ceph-csi-rbd.name" . }} - chart: {{ include "ceph-csi-rbd.chart" . }} - component: {{ .Values.provisioner.name }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + app.kubernetes.io/name: {{ include "ceph-csi-rbd.name" . }} + helm.sh/chart: {{ include "ceph-csi-rbd.chart" . }} + app.kubernetes.io/component: {{ .Values.provisioner.name }} subjects: - kind: ServiceAccount name: {{ include "ceph-csi-rbd.serviceAccountName.provisioner" . }} diff --git a/charts/ceph-csi-rbd/templates/provisioner-rules-clusterrole.yaml b/charts/ceph-csi-rbd/templates/provisioner-rules-clusterrole.yaml index 025db945a60..629c1e54294 100644 --- a/charts/ceph-csi-rbd/templates/provisioner-rules-clusterrole.yaml +++ b/charts/ceph-csi-rbd/templates/provisioner-rules-clusterrole.yaml @@ -4,11 +4,9 @@ apiVersion: rbac.authorization.k8s.io/v1 metadata: name: {{ include "ceph-csi-rbd.provisioner.fullname" . }}-rules labels: - app: {{ include "ceph-csi-rbd.name" . }} - chart: {{ include "ceph-csi-rbd.chart" . }} - component: {{ .Values.provisioner.name }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + app.kubernetes.io/name: {{ include "ceph-csi-rbd.name" . }} + helm.sh/chart: {{ include "ceph-csi-rbd.chart" . }} + app.kubernetes.io/component: {{ .Values.provisioner.name }} rbac.rbd.csi.ceph.com/aggregate-to-{{ include "ceph-csi-rbd.provisioner.fullname" . }}: "true" rules: - apiGroups: [""] diff --git a/charts/ceph-csi-rbd/templates/provisioner-serviceaccount.yaml b/charts/ceph-csi-rbd/templates/provisioner-serviceaccount.yaml index 893b43a9c82..e6779b6240f 100644 --- a/charts/ceph-csi-rbd/templates/provisioner-serviceaccount.yaml +++ b/charts/ceph-csi-rbd/templates/provisioner-serviceaccount.yaml @@ -5,9 +5,7 @@ metadata: name: {{ include "ceph-csi-rbd.serviceAccountName.provisioner" . }} namespace: {{ .Release.Namespace }} labels: - app: {{ include "ceph-csi-rbd.name" . }} - chart: {{ include "ceph-csi-rbd.chart" . }} - component: {{ .Values.provisioner.name }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + app.kubernetes.io/name: {{ include "ceph-csi-rbd.name" . }} + helm.sh/chart: {{ include "ceph-csi-rbd.chart" . }} + app.kubernetes.io/component: {{ .Values.provisioner.name }} {{- end -}} From 90b18c3a507b744941d739507cecdcff0b3c41fc Mon Sep 17 00:00:00 2001 From: wilmardo Date: Tue, 10 Mar 2020 12:29:06 +0100 Subject: [PATCH 2/3] feat: adds new required helm labels to charts Signed-off-by: wilmardo --- .../ceph-csi-cephfs/templates/csiplugin-configmap.yaml | 3 +++ .../ceph-csi-cephfs/templates/nodeplugin-daemonset.yaml | 9 +++++++++ .../templates/nodeplugin-grpc-service.yaml | 6 ++++++ .../templates/nodeplugin-http-service.yaml | 6 ++++++ .../templates/nodeplugin-rolebinding.yaml | 3 +++ .../templates/nodeplugin-serviceaccount.yaml | 3 +++ .../templates/provisioner-clusterrole.yaml | 3 +++ .../templates/provisioner-clusterrolebinding.yaml | 3 +++ .../templates/provisioner-deployment.yaml | 9 +++++++++ .../templates/provisioner-grpc-service.yaml | 6 ++++++ .../templates/provisioner-http-service.yaml | 6 ++++++ charts/ceph-csi-cephfs/templates/provisioner-role.yaml | 3 +++ .../templates/provisioner-rolebinding.yaml | 3 +++ .../templates/provisioner-rules-clusterrole.yaml | 3 +++ .../templates/provisioner-serviceaccount.yaml | 3 +++ charts/ceph-csi-rbd/templates/csiplugin-configmap.yaml | 3 +++ charts/ceph-csi-rbd/templates/nodeplugin-daemonset.yaml | 9 +++++++++ .../ceph-csi-rbd/templates/nodeplugin-grpc-service.yaml | 6 ++++++ .../ceph-csi-rbd/templates/nodeplugin-http-service.yaml | 6 ++++++ charts/ceph-csi-rbd/templates/nodeplugin-role.yaml | 3 +++ .../ceph-csi-rbd/templates/nodeplugin-rolebinding.yaml | 3 +++ .../templates/nodeplugin-serviceaccount.yaml | 3 +++ .../ceph-csi-rbd/templates/provisioner-clusterrole.yaml | 3 +++ .../templates/provisioner-clusterrolebinding.yaml | 3 +++ .../ceph-csi-rbd/templates/provisioner-deployment.yaml | 9 +++++++++ .../ceph-csi-rbd/templates/provisioner-grpc-service.yaml | 6 ++++++ .../ceph-csi-rbd/templates/provisioner-http-service.yaml | 6 ++++++ charts/ceph-csi-rbd/templates/provisioner-role.yaml | 3 +++ .../ceph-csi-rbd/templates/provisioner-rolebinding.yaml | 3 +++ .../templates/provisioner-rules-clusterrole.yaml | 3 +++ .../templates/provisioner-serviceaccount.yaml | 3 +++ 31 files changed, 141 insertions(+) diff --git a/charts/ceph-csi-cephfs/templates/csiplugin-configmap.yaml b/charts/ceph-csi-cephfs/templates/csiplugin-configmap.yaml index ddc7e30d43d..56b79b87243 100644 --- a/charts/ceph-csi-cephfs/templates/csiplugin-configmap.yaml +++ b/charts/ceph-csi-cephfs/templates/csiplugin-configmap.yaml @@ -7,6 +7,9 @@ metadata: app.kubernetes.io/name: {{ include "ceph-csi-cephfs.name" . }} helm.sh/chart: {{ include "ceph-csi-cephfs.chart" . }} app.kubernetes.io/component: {{ .Values.provisioner.name }} + app.kubernetes.io/managed-by: {{ .Release.Service }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/version: {{ .Chart.AppVersion }} data: config.json: |- {{ toJson .Values.csiConfig | indent 4 -}} diff --git a/charts/ceph-csi-cephfs/templates/nodeplugin-daemonset.yaml b/charts/ceph-csi-cephfs/templates/nodeplugin-daemonset.yaml index cdce79c1c64..d622c06f2d2 100644 --- a/charts/ceph-csi-cephfs/templates/nodeplugin-daemonset.yaml +++ b/charts/ceph-csi-cephfs/templates/nodeplugin-daemonset.yaml @@ -7,11 +7,17 @@ metadata: app.kubernetes.io/name: {{ include "ceph-csi-cephfs.name" . }} helm.sh/chart: {{ include "ceph-csi-cephfs.chart" . }} app.kubernetes.io/component: {{ .Values.nodeplugin.name }} + app.kubernetes.io/managed-by: {{ .Release.Service }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/version: {{ .Chart.AppVersion }} spec: selector: matchLabels: app.kubernetes.io/name: {{ include "ceph-csi-cephfs.name" . }} app.kubernetes.io/component: {{ .Values.nodeplugin.name }} + app.kubernetes.io/managed-by: {{ .Release.Service }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/version: {{ .Chart.AppVersion }} updateStrategy: type: {{ .Values.nodeplugin.updateStrategy }} template: @@ -20,6 +26,9 @@ spec: app.kubernetes.io/name: {{ include "ceph-csi-cephfs.name" . }} helm.sh/chart: {{ include "ceph-csi-cephfs.chart" . }} app.kubernetes.io/component: {{ .Values.nodeplugin.name }} + app.kubernetes.io/managed-by: {{ .Release.Service }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/version: {{ .Chart.AppVersion }} spec: serviceAccountName: {{ include "ceph-csi-cephfs.serviceAccountName.nodeplugin" . }} hostNetwork: true diff --git a/charts/ceph-csi-cephfs/templates/nodeplugin-grpc-service.yaml b/charts/ceph-csi-cephfs/templates/nodeplugin-grpc-service.yaml index b827a8a540a..5e306a37d53 100644 --- a/charts/ceph-csi-cephfs/templates/nodeplugin-grpc-service.yaml +++ b/charts/ceph-csi-cephfs/templates/nodeplugin-grpc-service.yaml @@ -12,6 +12,9 @@ metadata: app: {{ include "ceph-csi-cephfs.fullname" . }} helm.sh/chart: {{ include "ceph-csi-cephfs.chart" . }} app.kubernetes.io/component: {{ .Values.nodeplugin.name }} + app.kubernetes.io/managed-by: {{ .Release.Service }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/version: {{ .Chart.AppVersion }} spec: {{- if .Values.nodeplugin.grpcMetrics.service.clusterIP }} clusterIP: "{{ .Values.nodeplugin.grpcMetrics.service.clusterIP }}" @@ -34,5 +37,8 @@ spec: selector: app.kubernetes.io/name: {{ include "ceph-csi-cephfs.name" . }} app.kubernetes.io/component: {{ .Values.nodeplugin.name }} + app.kubernetes.io/managed-by: {{ .Release.Service }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/version: {{ .Chart.AppVersion }} type: "{{ .Values.nodeplugin.grpcMetrics.service.type }}" {{- end -}} diff --git a/charts/ceph-csi-cephfs/templates/nodeplugin-http-service.yaml b/charts/ceph-csi-cephfs/templates/nodeplugin-http-service.yaml index 87fcd33fa73..629c0f1f9f1 100644 --- a/charts/ceph-csi-cephfs/templates/nodeplugin-http-service.yaml +++ b/charts/ceph-csi-cephfs/templates/nodeplugin-http-service.yaml @@ -12,6 +12,9 @@ metadata: app: {{ include "ceph-csi-cephfs.fullname" . }} helm.sh/chart: {{ include "ceph-csi-cephfs.chart" . }} app.kubernetes.io/component: {{ .Values.nodeplugin.name }} + app.kubernetes.io/managed-by: {{ .Release.Service }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/version: {{ .Chart.AppVersion }} spec: {{- if .Values.nodeplugin.httpMetrics.service.clusterIP }} clusterIP: "{{ .Values.nodeplugin.httpMetrics.service.clusterIP }}" @@ -34,5 +37,8 @@ spec: selector: app.kubernetes.io/name: {{ include "ceph-csi-cephfs.name" . }} app.kubernetes.io/component: {{ .Values.nodeplugin.name }} + app.kubernetes.io/managed-by: {{ .Release.Service }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/version: {{ .Chart.AppVersion }} type: "{{ .Values.nodeplugin.httpMetrics.service.type }}" {{- end -}} diff --git a/charts/ceph-csi-cephfs/templates/nodeplugin-rolebinding.yaml b/charts/ceph-csi-cephfs/templates/nodeplugin-rolebinding.yaml index 6825c620661..3ccbaad8bf9 100644 --- a/charts/ceph-csi-cephfs/templates/nodeplugin-rolebinding.yaml +++ b/charts/ceph-csi-cephfs/templates/nodeplugin-rolebinding.yaml @@ -8,6 +8,9 @@ metadata: app.kubernetes.io/name: {{ include "ceph-csi-cephfs.name" . }} helm.sh/chart: {{ include "ceph-csi-cephfs.chart" . }} app.kubernetes.io/component: {{ .Values.nodeplugin.name }} + app.kubernetes.io/managed-by: {{ .Release.Service }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/version: {{ .Chart.AppVersion }} subjects: - kind: ServiceAccount name: {{ include "ceph-csi-cephfs.serviceAccountName.nodeplugin" . }} diff --git a/charts/ceph-csi-cephfs/templates/nodeplugin-serviceaccount.yaml b/charts/ceph-csi-cephfs/templates/nodeplugin-serviceaccount.yaml index 105e2c3269b..29f1f4ae893 100644 --- a/charts/ceph-csi-cephfs/templates/nodeplugin-serviceaccount.yaml +++ b/charts/ceph-csi-cephfs/templates/nodeplugin-serviceaccount.yaml @@ -8,4 +8,7 @@ metadata: app.kubernetes.io/name: {{ include "ceph-csi-cephfs.name" . }} helm.sh/chart: {{ include "ceph-csi-cephfs.chart" . }} app.kubernetes.io/component: {{ .Values.nodeplugin.name }} + app.kubernetes.io/managed-by: {{ .Release.Service }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/version: {{ .Chart.AppVersion }} {{- end -}} diff --git a/charts/ceph-csi-cephfs/templates/provisioner-clusterrole.yaml b/charts/ceph-csi-cephfs/templates/provisioner-clusterrole.yaml index e8e28a98083..14f72e6ef12 100644 --- a/charts/ceph-csi-cephfs/templates/provisioner-clusterrole.yaml +++ b/charts/ceph-csi-cephfs/templates/provisioner-clusterrole.yaml @@ -7,6 +7,9 @@ metadata: app.kubernetes.io/name: {{ include "ceph-csi-cephfs.name" . }} helm.sh/chart: {{ include "ceph-csi-cephfs.chart" . }} app.kubernetes.io/component: {{ .Values.provisioner.name }} + app.kubernetes.io/managed-by: {{ .Release.Service }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/version: {{ .Chart.AppVersion }} aggregationRule: clusterRoleSelectors: - matchLabels: diff --git a/charts/ceph-csi-cephfs/templates/provisioner-clusterrolebinding.yaml b/charts/ceph-csi-cephfs/templates/provisioner-clusterrolebinding.yaml index be257515c7a..a3ea422c518 100644 --- a/charts/ceph-csi-cephfs/templates/provisioner-clusterrolebinding.yaml +++ b/charts/ceph-csi-cephfs/templates/provisioner-clusterrolebinding.yaml @@ -7,6 +7,9 @@ metadata: app.kubernetes.io/name: {{ include "ceph-csi-cephfs.name" . }} helm.sh/chart: {{ include "ceph-csi-cephfs.chart" . }} app.kubernetes.io/component: {{ .Values.provisioner.name }} + app.kubernetes.io/managed-by: {{ .Release.Service }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/version: {{ .Chart.AppVersion }} subjects: - kind: ServiceAccount name: {{ include "ceph-csi-cephfs.serviceAccountName.provisioner" . }} diff --git a/charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml b/charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml index 42df41b8160..1dd55b01345 100644 --- a/charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml +++ b/charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml @@ -7,18 +7,27 @@ metadata: app.kubernetes.io/name: {{ include "ceph-csi-cephfs.name" . }} helm.sh/chart: {{ include "ceph-csi-cephfs.chart" . }} app.kubernetes.io/component: {{ .Values.provisioner.name }} + app.kubernetes.io/managed-by: {{ .Release.Service }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/version: {{ .Chart.AppVersion }} spec: replicas: {{ .Values.provisioner.replicaCount }} selector: matchLabels: app.kubernetes.io/name: {{ include "ceph-csi-cephfs.name" . }} app.kubernetes.io/component: {{ .Values.provisioner.name }} + app.kubernetes.io/managed-by: {{ .Release.Service }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/version: {{ .Chart.AppVersion }} template: metadata: labels: app.kubernetes.io/name: {{ include "ceph-csi-cephfs.name" . }} helm.sh/chart: {{ include "ceph-csi-cephfs.chart" . }} app.kubernetes.io/component: {{ .Values.provisioner.name }} + app.kubernetes.io/managed-by: {{ .Release.Service }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/version: {{ .Chart.AppVersion }} spec: serviceAccountName: {{ include "ceph-csi-cephfs.serviceAccountName.provisioner" . }} containers: diff --git a/charts/ceph-csi-cephfs/templates/provisioner-grpc-service.yaml b/charts/ceph-csi-cephfs/templates/provisioner-grpc-service.yaml index 99ec0a71650..c34e1548789 100644 --- a/charts/ceph-csi-cephfs/templates/provisioner-grpc-service.yaml +++ b/charts/ceph-csi-cephfs/templates/provisioner-grpc-service.yaml @@ -12,6 +12,9 @@ metadata: app: {{ include "ceph-csi-cephfs.fullname" . }} helm.sh/chart: {{ include "ceph-csi-cephfs.chart" . }} app.kubernetes.io/component: {{ .Values.provisioner.name }} + app.kubernetes.io/managed-by: {{ .Release.Service }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/version: {{ .Chart.AppVersion }} spec: {{- if .Values.provisioner.grpcMetrics.service.clusterIP }} clusterIP: "{{ .Values.provisioner.grpcMetrics.service.clusterIP }}" @@ -34,5 +37,8 @@ spec: selector: app.kubernetes.io/name: {{ include "ceph-csi-cephfs.name" . }} app.kubernetes.io/component: {{ .Values.provisioner.name }} + app.kubernetes.io/managed-by: {{ .Release.Service }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/version: {{ .Chart.AppVersion }} type: "{{ .Values.provisioner.grpcMetrics.service.type }}" {{- end -}} diff --git a/charts/ceph-csi-cephfs/templates/provisioner-http-service.yaml b/charts/ceph-csi-cephfs/templates/provisioner-http-service.yaml index 27a628a8d72..32939881860 100644 --- a/charts/ceph-csi-cephfs/templates/provisioner-http-service.yaml +++ b/charts/ceph-csi-cephfs/templates/provisioner-http-service.yaml @@ -12,6 +12,9 @@ metadata: app: {{ include "ceph-csi-cephfs.fullname" . }} helm.sh/chart: {{ include "ceph-csi-cephfs.chart" . }} app.kubernetes.io/component: {{ .Values.provisioner.name }} + app.kubernetes.io/managed-by: {{ .Release.Service }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/version: {{ .Chart.AppVersion }} spec: {{- if .Values.provisioner.httpMetrics.service.clusterIP }} clusterIP: "{{ .Values.provisioner.httpMetrics.service.clusterIP }}" @@ -34,5 +37,8 @@ spec: selector: app.kubernetes.io/name: {{ include "ceph-csi-cephfs.name" . }} app.kubernetes.io/component: {{ .Values.provisioner.name }} + app.kubernetes.io/managed-by: {{ .Release.Service }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/version: {{ .Chart.AppVersion }} type: "{{ .Values.provisioner.httpMetrics.service.type }}" {{- end -}} diff --git a/charts/ceph-csi-cephfs/templates/provisioner-role.yaml b/charts/ceph-csi-cephfs/templates/provisioner-role.yaml index 6d16259f853..fdf5bb8c42a 100644 --- a/charts/ceph-csi-cephfs/templates/provisioner-role.yaml +++ b/charts/ceph-csi-cephfs/templates/provisioner-role.yaml @@ -8,6 +8,9 @@ metadata: app.kubernetes.io/name: {{ include "ceph-csi-cephfs.name" . }} helm.sh/chart: {{ include "ceph-csi-cephfs.chart" . }} app.kubernetes.io/component: {{ .Values.provisioner.name }} + app.kubernetes.io/managed-by: {{ .Release.Service }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/version: {{ .Chart.AppVersion }} rules: - apiGroups: [""] resources: ["configmaps"] diff --git a/charts/ceph-csi-cephfs/templates/provisioner-rolebinding.yaml b/charts/ceph-csi-cephfs/templates/provisioner-rolebinding.yaml index a1942eb554b..0d0de288a39 100644 --- a/charts/ceph-csi-cephfs/templates/provisioner-rolebinding.yaml +++ b/charts/ceph-csi-cephfs/templates/provisioner-rolebinding.yaml @@ -8,6 +8,9 @@ metadata: app.kubernetes.io/name: {{ include "ceph-csi-cephfs.name" . }} helm.sh/chart: {{ include "ceph-csi-cephfs.chart" . }} app.kubernetes.io/component: {{ .Values.provisioner.name }} + app.kubernetes.io/managed-by: {{ .Release.Service }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/version: {{ .Chart.AppVersion }} subjects: - kind: ServiceAccount name: {{ include "ceph-csi-cephfs.serviceAccountName.provisioner" . }} diff --git a/charts/ceph-csi-cephfs/templates/provisioner-rules-clusterrole.yaml b/charts/ceph-csi-cephfs/templates/provisioner-rules-clusterrole.yaml index 469d64ac06a..eb6becf7b13 100644 --- a/charts/ceph-csi-cephfs/templates/provisioner-rules-clusterrole.yaml +++ b/charts/ceph-csi-cephfs/templates/provisioner-rules-clusterrole.yaml @@ -7,6 +7,9 @@ metadata: app.kubernetes.io/name: {{ include "ceph-csi-cephfs.name" . }} helm.sh/chart: {{ include "ceph-csi-cephfs.chart" . }} app.kubernetes.io/component: {{ .Values.provisioner.name }} + app.kubernetes.io/managed-by: {{ .Release.Service }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/version: {{ .Chart.AppVersion }} rbac.cephfs.csi.ceph.com/aggregate-to-{{ include "ceph-csi-cephfs.provisioner.fullname" . }}: "true" rules: - apiGroups: [""] diff --git a/charts/ceph-csi-cephfs/templates/provisioner-serviceaccount.yaml b/charts/ceph-csi-cephfs/templates/provisioner-serviceaccount.yaml index 66240f02a01..b4464f956de 100644 --- a/charts/ceph-csi-cephfs/templates/provisioner-serviceaccount.yaml +++ b/charts/ceph-csi-cephfs/templates/provisioner-serviceaccount.yaml @@ -8,4 +8,7 @@ metadata: app.kubernetes.io/name: {{ include "ceph-csi-cephfs.name" . }} helm.sh/chart: {{ include "ceph-csi-cephfs.chart" . }} app.kubernetes.io/component: {{ .Values.provisioner.name }} + app.kubernetes.io/managed-by: {{ .Release.Service }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/version: {{ .Chart.AppVersion }} {{- end -}} diff --git a/charts/ceph-csi-rbd/templates/csiplugin-configmap.yaml b/charts/ceph-csi-rbd/templates/csiplugin-configmap.yaml index 31b748922e2..df745c64146 100644 --- a/charts/ceph-csi-rbd/templates/csiplugin-configmap.yaml +++ b/charts/ceph-csi-rbd/templates/csiplugin-configmap.yaml @@ -7,6 +7,9 @@ metadata: app.kubernetes.io/name: {{ include "ceph-csi-rbd.name" . }} helm.sh/chart: {{ include "ceph-csi-rbd.chart" . }} app.kubernetes.io/component: {{ .Values.nodeplugin.name }} + app.kubernetes.io/managed-by: {{ .Release.Service }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/version: {{ .Chart.AppVersion }} data: config.json: |- {{ toJson .Values.csiConfig | indent 4 -}} diff --git a/charts/ceph-csi-rbd/templates/nodeplugin-daemonset.yaml b/charts/ceph-csi-rbd/templates/nodeplugin-daemonset.yaml index 5f4f1961d2b..1dc83e11240 100644 --- a/charts/ceph-csi-rbd/templates/nodeplugin-daemonset.yaml +++ b/charts/ceph-csi-rbd/templates/nodeplugin-daemonset.yaml @@ -7,11 +7,17 @@ metadata: app.kubernetes.io/name: {{ include "ceph-csi-rbd.name" . }} helm.sh/chart: {{ include "ceph-csi-rbd.chart" . }} app.kubernetes.io/component: {{ .Values.nodeplugin.name }} + app.kubernetes.io/managed-by: {{ .Release.Service }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/version: {{ .Chart.AppVersion }} spec: selector: matchLabels: app.kubernetes.io/name: {{ include "ceph-csi-rbd.name" . }} app.kubernetes.io/component: {{ .Values.nodeplugin.name }} + app.kubernetes.io/managed-by: {{ .Release.Service }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/version: {{ .Chart.AppVersion }} updateStrategy: type: {{ .Values.nodeplugin.updateStrategy }} template: @@ -20,6 +26,9 @@ spec: app.kubernetes.io/name: {{ include "ceph-csi-rbd.name" . }} helm.sh/chart: {{ include "ceph-csi-rbd.chart" . }} app.kubernetes.io/component: {{ .Values.nodeplugin.name }} + app.kubernetes.io/managed-by: {{ .Release.Service }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/version: {{ .Chart.AppVersion }} spec: serviceAccountName: {{ include "ceph-csi-rbd.serviceAccountName.nodeplugin" . }} hostNetwork: true diff --git a/charts/ceph-csi-rbd/templates/nodeplugin-grpc-service.yaml b/charts/ceph-csi-rbd/templates/nodeplugin-grpc-service.yaml index 0afda0939d0..47b20db65cd 100644 --- a/charts/ceph-csi-rbd/templates/nodeplugin-grpc-service.yaml +++ b/charts/ceph-csi-rbd/templates/nodeplugin-grpc-service.yaml @@ -12,6 +12,9 @@ metadata: app: {{ include "ceph-csi-rbd.fullname" . }} helm.sh/chart: {{ include "ceph-csi-rbd.chart" . }} app.kubernetes.io/component: {{ .Values.nodeplugin.name }} + app.kubernetes.io/managed-by: {{ .Release.Service }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/version: {{ .Chart.AppVersion }} spec: {{- if .Values.nodeplugin.grpcMetrics.service.clusterIP }} clusterIP: "{{ .Values.nodeplugin.grpcMetrics.service.clusterIP }}" @@ -34,5 +37,8 @@ spec: selector: app.kubernetes.io/name: {{ include "ceph-csi-rbd.name" . }} app.kubernetes.io/component: {{ .Values.nodeplugin.name }} + app.kubernetes.io/managed-by: {{ .Release.Service }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/version: {{ .Chart.AppVersion }} type: "{{ .Values.nodeplugin.grpcMetrics.service.type }}" {{- end -}} diff --git a/charts/ceph-csi-rbd/templates/nodeplugin-http-service.yaml b/charts/ceph-csi-rbd/templates/nodeplugin-http-service.yaml index 5d8c631ea2e..acdab311475 100644 --- a/charts/ceph-csi-rbd/templates/nodeplugin-http-service.yaml +++ b/charts/ceph-csi-rbd/templates/nodeplugin-http-service.yaml @@ -12,6 +12,9 @@ metadata: app: {{ include "ceph-csi-rbd.fullname" . }} helm.sh/chart: {{ include "ceph-csi-rbd.chart" . }} app.kubernetes.io/component: {{ .Values.nodeplugin.name }} + app.kubernetes.io/managed-by: {{ .Release.Service }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/version: {{ .Chart.AppVersion }} spec: {{- if .Values.nodeplugin.httpMetrics.service.clusterIP }} clusterIP: "{{ .Values.nodeplugin.httpMetrics.service.clusterIP }}" @@ -34,5 +37,8 @@ spec: selector: app.kubernetes.io/name: {{ include "ceph-csi-rbd.name" . }} app.kubernetes.io/component: {{ .Values.nodeplugin.name }} + app.kubernetes.io/managed-by: {{ .Release.Service }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/version: {{ .Chart.AppVersion }} type: "{{ .Values.nodeplugin.httpMetrics.service.type }}" {{- end -}} diff --git a/charts/ceph-csi-rbd/templates/nodeplugin-role.yaml b/charts/ceph-csi-rbd/templates/nodeplugin-role.yaml index d907f18b5cd..a3707500d55 100644 --- a/charts/ceph-csi-rbd/templates/nodeplugin-role.yaml +++ b/charts/ceph-csi-rbd/templates/nodeplugin-role.yaml @@ -8,6 +8,9 @@ metadata: app.kubernetes.io/name: {{ include "ceph-csi-rbd.name" . }} helm.sh/chart: {{ include "ceph-csi-rbd.chart" . }} app.kubernetes.io/component: {{ .Values.nodeplugin.name }} + app.kubernetes.io/managed-by: {{ .Release.Service }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/version: {{ .Chart.AppVersion }} rules: - apiGroups: ['policy'] resources: ['podsecuritypolicies'] diff --git a/charts/ceph-csi-rbd/templates/nodeplugin-rolebinding.yaml b/charts/ceph-csi-rbd/templates/nodeplugin-rolebinding.yaml index 9da02bf43d0..9d4ac6bec70 100644 --- a/charts/ceph-csi-rbd/templates/nodeplugin-rolebinding.yaml +++ b/charts/ceph-csi-rbd/templates/nodeplugin-rolebinding.yaml @@ -8,6 +8,9 @@ metadata: app.kubernetes.io/name: {{ include "ceph-csi-rbd.name" . }} helm.sh/chart: {{ include "ceph-csi-rbd.chart" . }} app.kubernetes.io/component: {{ .Values.nodeplugin.name }} + app.kubernetes.io/managed-by: {{ .Release.Service }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/version: {{ .Chart.AppVersion }} subjects: - kind: ServiceAccount name: {{ include "ceph-csi-rbd.serviceAccountName.nodeplugin" . }} diff --git a/charts/ceph-csi-rbd/templates/nodeplugin-serviceaccount.yaml b/charts/ceph-csi-rbd/templates/nodeplugin-serviceaccount.yaml index c4c5088ec46..f9592e60de9 100644 --- a/charts/ceph-csi-rbd/templates/nodeplugin-serviceaccount.yaml +++ b/charts/ceph-csi-rbd/templates/nodeplugin-serviceaccount.yaml @@ -8,4 +8,7 @@ metadata: app.kubernetes.io/name: {{ include "ceph-csi-rbd.name" . }} helm.sh/chart: {{ include "ceph-csi-rbd.chart" . }} app.kubernetes.io/component: {{ .Values.nodeplugin.name }} + app.kubernetes.io/managed-by: {{ .Release.Service }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/version: {{ .Chart.AppVersion }} {{- end -}} diff --git a/charts/ceph-csi-rbd/templates/provisioner-clusterrole.yaml b/charts/ceph-csi-rbd/templates/provisioner-clusterrole.yaml index c432104ef26..f237c8d0b50 100644 --- a/charts/ceph-csi-rbd/templates/provisioner-clusterrole.yaml +++ b/charts/ceph-csi-rbd/templates/provisioner-clusterrole.yaml @@ -7,6 +7,9 @@ metadata: app.kubernetes.io/name: {{ include "ceph-csi-rbd.name" . }} helm.sh/chart: {{ include "ceph-csi-rbd.chart" . }} app.kubernetes.io/component: {{ .Values.provisioner.name }} + app.kubernetes.io/managed-by: {{ .Release.Service }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/version: {{ .Chart.AppVersion }} aggregationRule: clusterRoleSelectors: - matchLabels: diff --git a/charts/ceph-csi-rbd/templates/provisioner-clusterrolebinding.yaml b/charts/ceph-csi-rbd/templates/provisioner-clusterrolebinding.yaml index e1968aa3063..12418403a21 100644 --- a/charts/ceph-csi-rbd/templates/provisioner-clusterrolebinding.yaml +++ b/charts/ceph-csi-rbd/templates/provisioner-clusterrolebinding.yaml @@ -7,6 +7,9 @@ metadata: app.kubernetes.io/name: {{ include "ceph-csi-rbd.name" . }} helm.sh/chart: {{ include "ceph-csi-rbd.chart" . }} app.kubernetes.io/component: {{ .Values.provisioner.name }} + app.kubernetes.io/managed-by: {{ .Release.Service }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/version: {{ .Chart.AppVersion }} subjects: - kind: ServiceAccount name: {{ include "ceph-csi-rbd.serviceAccountName.provisioner" . }} diff --git a/charts/ceph-csi-rbd/templates/provisioner-deployment.yaml b/charts/ceph-csi-rbd/templates/provisioner-deployment.yaml index 5ab5006d325..038ece324be 100644 --- a/charts/ceph-csi-rbd/templates/provisioner-deployment.yaml +++ b/charts/ceph-csi-rbd/templates/provisioner-deployment.yaml @@ -7,18 +7,27 @@ metadata: app.kubernetes.io/name: {{ include "ceph-csi-rbd.name" . }} helm.sh/chart: {{ include "ceph-csi-rbd.chart" . }} app.kubernetes.io/component: {{ .Values.provisioner.name }} + app.kubernetes.io/managed-by: {{ .Release.Service }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/version: {{ .Chart.AppVersion }} spec: replicas: {{ .Values.provisioner.replicaCount }} selector: matchLabels: app.kubernetes.io/name: {{ include "ceph-csi-rbd.name" . }} app.kubernetes.io/component: {{ .Values.provisioner.name }} + app.kubernetes.io/managed-by: {{ .Release.Service }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/version: {{ .Chart.AppVersion }} template: metadata: labels: app.kubernetes.io/name: {{ include "ceph-csi-rbd.name" . }} helm.sh/chart: {{ include "ceph-csi-rbd.chart" . }} app.kubernetes.io/component: {{ .Values.provisioner.name }} + app.kubernetes.io/managed-by: {{ .Release.Service }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/version: {{ .Chart.AppVersion }} spec: serviceAccountName: {{ include "ceph-csi-rbd.serviceAccountName.provisioner" . }} containers: diff --git a/charts/ceph-csi-rbd/templates/provisioner-grpc-service.yaml b/charts/ceph-csi-rbd/templates/provisioner-grpc-service.yaml index 14a3466dd4e..db9ae29b9dc 100644 --- a/charts/ceph-csi-rbd/templates/provisioner-grpc-service.yaml +++ b/charts/ceph-csi-rbd/templates/provisioner-grpc-service.yaml @@ -12,6 +12,9 @@ metadata: app: {{ include "ceph-csi-rbd.fullname" . }} helm.sh/chart: {{ include "ceph-csi-rbd.chart" . }} app.kubernetes.io/component: {{ .Values.provisioner.name }} + app.kubernetes.io/managed-by: {{ .Release.Service }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/version: {{ .Chart.AppVersion }} spec: {{- if .Values.provisioner.grpcMetrics.service.clusterIP }} clusterIP: "{{ .Values.provisioner.grpcMetrics.service.clusterIP }}" @@ -34,5 +37,8 @@ spec: selector: app.kubernetes.io/name: {{ include "ceph-csi-rbd.name" . }} app.kubernetes.io/component: {{ .Values.provisioner.name }} + app.kubernetes.io/managed-by: {{ .Release.Service }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/version: {{ .Chart.AppVersion }} type: "{{ .Values.provisioner.grpcMetrics.service.type }}" {{- end -}} diff --git a/charts/ceph-csi-rbd/templates/provisioner-http-service.yaml b/charts/ceph-csi-rbd/templates/provisioner-http-service.yaml index 7cdd8c445a6..0ab4b40e8a7 100644 --- a/charts/ceph-csi-rbd/templates/provisioner-http-service.yaml +++ b/charts/ceph-csi-rbd/templates/provisioner-http-service.yaml @@ -12,6 +12,9 @@ metadata: app: {{ include "ceph-csi-rbd.fullname" . }} helm.sh/chart: {{ include "ceph-csi-rbd.chart" . }} app.kubernetes.io/component: {{ .Values.provisioner.name }} + app.kubernetes.io/managed-by: {{ .Release.Service }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/version: {{ .Chart.AppVersion }} spec: {{- if .Values.provisioner.httpMetrics.service.clusterIP }} clusterIP: "{{ .Values.provisioner.httpMetrics.service.clusterIP }}" @@ -34,5 +37,8 @@ spec: selector: app.kubernetes.io/name: {{ include "ceph-csi-rbd.name" . }} app.kubernetes.io/component: {{ .Values.provisioner.name }} + app.kubernetes.io/managed-by: {{ .Release.Service }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/version: {{ .Chart.AppVersion }} type: "{{ .Values.provisioner.httpMetrics.service.type }}" {{- end -}} diff --git a/charts/ceph-csi-rbd/templates/provisioner-role.yaml b/charts/ceph-csi-rbd/templates/provisioner-role.yaml index f7e01ad323c..eb28dd35f54 100644 --- a/charts/ceph-csi-rbd/templates/provisioner-role.yaml +++ b/charts/ceph-csi-rbd/templates/provisioner-role.yaml @@ -8,6 +8,9 @@ metadata: app.kubernetes.io/name: {{ include "ceph-csi-rbd.name" . }} helm.sh/chart: {{ include "ceph-csi-rbd.chart" . }} app.kubernetes.io/component: {{ .Values.provisioner.name }} + app.kubernetes.io/managed-by: {{ .Release.Service }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/version: {{ .Chart.AppVersion }} rules: - apiGroups: [""] resources: ["configmaps"] diff --git a/charts/ceph-csi-rbd/templates/provisioner-rolebinding.yaml b/charts/ceph-csi-rbd/templates/provisioner-rolebinding.yaml index 6d1f003b2fb..696fa5a2562 100644 --- a/charts/ceph-csi-rbd/templates/provisioner-rolebinding.yaml +++ b/charts/ceph-csi-rbd/templates/provisioner-rolebinding.yaml @@ -8,6 +8,9 @@ metadata: app.kubernetes.io/name: {{ include "ceph-csi-rbd.name" . }} helm.sh/chart: {{ include "ceph-csi-rbd.chart" . }} app.kubernetes.io/component: {{ .Values.provisioner.name }} + app.kubernetes.io/managed-by: {{ .Release.Service }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/version: {{ .Chart.AppVersion }} subjects: - kind: ServiceAccount name: {{ include "ceph-csi-rbd.serviceAccountName.provisioner" . }} diff --git a/charts/ceph-csi-rbd/templates/provisioner-rules-clusterrole.yaml b/charts/ceph-csi-rbd/templates/provisioner-rules-clusterrole.yaml index 629c1e54294..7e9866f5140 100644 --- a/charts/ceph-csi-rbd/templates/provisioner-rules-clusterrole.yaml +++ b/charts/ceph-csi-rbd/templates/provisioner-rules-clusterrole.yaml @@ -7,6 +7,9 @@ metadata: app.kubernetes.io/name: {{ include "ceph-csi-rbd.name" . }} helm.sh/chart: {{ include "ceph-csi-rbd.chart" . }} app.kubernetes.io/component: {{ .Values.provisioner.name }} + app.kubernetes.io/managed-by: {{ .Release.Service }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/version: {{ .Chart.AppVersion }} rbac.rbd.csi.ceph.com/aggregate-to-{{ include "ceph-csi-rbd.provisioner.fullname" . }}: "true" rules: - apiGroups: [""] diff --git a/charts/ceph-csi-rbd/templates/provisioner-serviceaccount.yaml b/charts/ceph-csi-rbd/templates/provisioner-serviceaccount.yaml index e6779b6240f..404fae1af8d 100644 --- a/charts/ceph-csi-rbd/templates/provisioner-serviceaccount.yaml +++ b/charts/ceph-csi-rbd/templates/provisioner-serviceaccount.yaml @@ -8,4 +8,7 @@ metadata: app.kubernetes.io/name: {{ include "ceph-csi-rbd.name" . }} helm.sh/chart: {{ include "ceph-csi-rbd.chart" . }} app.kubernetes.io/component: {{ .Values.provisioner.name }} + app.kubernetes.io/managed-by: {{ .Release.Service }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/version: {{ .Chart.AppVersion }} {{- end -}} From 4dac8a04d77997bcb02865aea2f8e567655a1068 Mon Sep 17 00:00:00 2001 From: wilmardo Date: Tue, 10 Mar 2020 12:37:01 +0100 Subject: [PATCH 3/3] fix: replaced skipped app labels Signed-off-by: wilmardo --- .../templates/nodeplugin-grpc-service.yaml | 2 +- .../templates/nodeplugin-http-service.yaml | 2 +- charts/ceph-csi-cephfs/templates/nodeplugin-psp.yaml | 11 ++++++----- charts/ceph-csi-cephfs/templates/nodeplugin-role.yaml | 11 ++++++----- .../templates/provisioner-grpc-service.yaml | 2 +- .../templates/provisioner-http-service.yaml | 2 +- charts/ceph-csi-cephfs/templates/provisioner-psp.yaml | 11 ++++++----- .../templates/encryptionkms-configmap.yaml | 11 ++++++----- .../templates/nodeplugin-grpc-service.yaml | 2 +- .../templates/nodeplugin-http-service.yaml | 2 +- charts/ceph-csi-rbd/templates/nodeplugin-psp.yaml | 11 ++++++----- .../templates/provisioner-grpc-service.yaml | 2 +- .../templates/provisioner-http-service.yaml | 2 +- charts/ceph-csi-rbd/templates/provisioner-psp.yaml | 11 ++++++----- 14 files changed, 44 insertions(+), 38 deletions(-) diff --git a/charts/ceph-csi-cephfs/templates/nodeplugin-grpc-service.yaml b/charts/ceph-csi-cephfs/templates/nodeplugin-grpc-service.yaml index 5e306a37d53..333f99d3281 100644 --- a/charts/ceph-csi-cephfs/templates/nodeplugin-grpc-service.yaml +++ b/charts/ceph-csi-cephfs/templates/nodeplugin-grpc-service.yaml @@ -9,7 +9,7 @@ metadata: name: {{ include "ceph-csi-cephfs.nodeplugin.fullname" . }}-grpc-metrics namespace: {{ .Release.Namespace }} labels: - app: {{ include "ceph-csi-cephfs.fullname" . }} + app.kubernetes.io/name: {{ include "ceph-csi-cephfs.fullname" . }} helm.sh/chart: {{ include "ceph-csi-cephfs.chart" . }} app.kubernetes.io/component: {{ .Values.nodeplugin.name }} app.kubernetes.io/managed-by: {{ .Release.Service }} diff --git a/charts/ceph-csi-cephfs/templates/nodeplugin-http-service.yaml b/charts/ceph-csi-cephfs/templates/nodeplugin-http-service.yaml index 629c0f1f9f1..1fb536c0d00 100644 --- a/charts/ceph-csi-cephfs/templates/nodeplugin-http-service.yaml +++ b/charts/ceph-csi-cephfs/templates/nodeplugin-http-service.yaml @@ -9,7 +9,7 @@ metadata: name: {{ include "ceph-csi-cephfs.nodeplugin.fullname" . }}-http-metrics namespace: {{ .Release.Namespace }} labels: - app: {{ include "ceph-csi-cephfs.fullname" . }} + app.kubernetes.io/name: {{ include "ceph-csi-cephfs.fullname" . }} helm.sh/chart: {{ include "ceph-csi-cephfs.chart" . }} app.kubernetes.io/component: {{ .Values.nodeplugin.name }} app.kubernetes.io/managed-by: {{ .Release.Service }} diff --git a/charts/ceph-csi-cephfs/templates/nodeplugin-psp.yaml b/charts/ceph-csi-cephfs/templates/nodeplugin-psp.yaml index 5a03dbecdce..c3f9257a26f 100644 --- a/charts/ceph-csi-cephfs/templates/nodeplugin-psp.yaml +++ b/charts/ceph-csi-cephfs/templates/nodeplugin-psp.yaml @@ -4,11 +4,12 @@ kind: PodSecurityPolicy metadata: name: {{ include "ceph-csi-cephfs.nodeplugin.fullname" . }} labels: - app: {{ include "ceph-csi-cephfs.fullname" . }} - chart: {{ include "ceph-csi-cephfs.chart" . }} - component: {{ .Values.nodeplugin.name }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + app.kubernetes.io/name: {{ include "ceph-csi-cephfs.name" . }} + helm.sh/chart: {{ include "ceph-csi-cephfs.chart" . }} + app.kubernetes.io/component: {{ .Values.nodeplugin.name }} + app.kubernetes.io/managed-by: {{ .Release.Service }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/version: {{ .Chart.AppVersion }} spec: allowPrivilegeEscalation: true allowedCapabilities: diff --git a/charts/ceph-csi-cephfs/templates/nodeplugin-role.yaml b/charts/ceph-csi-cephfs/templates/nodeplugin-role.yaml index 4b211d7fcc0..0a3ae614f19 100644 --- a/charts/ceph-csi-cephfs/templates/nodeplugin-role.yaml +++ b/charts/ceph-csi-cephfs/templates/nodeplugin-role.yaml @@ -5,11 +5,12 @@ metadata: name: {{ include "ceph-csi-cephfs.nodeplugin.fullname" . }} namespace: {{ .Release.Namespace }} labels: - app: {{ include "ceph-csi-cephfs.fullname" . }} - chart: {{ include "ceph-csi-cephfs.chart" . }} - component: {{ .Values.nodeplugin.name }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + app.kubernetes.io/name: {{ include "ceph-csi-cephfs.name" . }} + helm.sh/chart: {{ include "ceph-csi-cephfs.chart" . }} + app.kubernetes.io/component: {{ .Values.nodeplugin.name }} + app.kubernetes.io/managed-by: {{ .Release.Service }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/version: {{ .Chart.AppVersion }} rules: - apiGroups: ['policy'] resources: ['podsecuritypolicies'] diff --git a/charts/ceph-csi-cephfs/templates/provisioner-grpc-service.yaml b/charts/ceph-csi-cephfs/templates/provisioner-grpc-service.yaml index c34e1548789..00cdf6ae62b 100644 --- a/charts/ceph-csi-cephfs/templates/provisioner-grpc-service.yaml +++ b/charts/ceph-csi-cephfs/templates/provisioner-grpc-service.yaml @@ -9,7 +9,7 @@ metadata: name: {{ include "ceph-csi-cephfs.provisioner.fullname" . }}-grpc-metrics namespace: {{ .Release.Namespace }} labels: - app: {{ include "ceph-csi-cephfs.fullname" . }} + app.kubernetes.io/name: {{ include "ceph-csi-cephfs.fullname" . }} helm.sh/chart: {{ include "ceph-csi-cephfs.chart" . }} app.kubernetes.io/component: {{ .Values.provisioner.name }} app.kubernetes.io/managed-by: {{ .Release.Service }} diff --git a/charts/ceph-csi-cephfs/templates/provisioner-http-service.yaml b/charts/ceph-csi-cephfs/templates/provisioner-http-service.yaml index 32939881860..fb4ad4f9ea4 100644 --- a/charts/ceph-csi-cephfs/templates/provisioner-http-service.yaml +++ b/charts/ceph-csi-cephfs/templates/provisioner-http-service.yaml @@ -9,7 +9,7 @@ metadata: name: {{ include "ceph-csi-cephfs.provisioner.fullname" . }}-http-metrics namespace: {{ .Release.Namespace }} labels: - app: {{ include "ceph-csi-cephfs.fullname" . }} + app.kubernetes.io/name: {{ include "ceph-csi-cephfs.fullname" . }} helm.sh/chart: {{ include "ceph-csi-cephfs.chart" . }} app.kubernetes.io/component: {{ .Values.provisioner.name }} app.kubernetes.io/managed-by: {{ .Release.Service }} diff --git a/charts/ceph-csi-cephfs/templates/provisioner-psp.yaml b/charts/ceph-csi-cephfs/templates/provisioner-psp.yaml index 17f7ca03e2b..ae524a5cdbe 100644 --- a/charts/ceph-csi-cephfs/templates/provisioner-psp.yaml +++ b/charts/ceph-csi-cephfs/templates/provisioner-psp.yaml @@ -4,11 +4,12 @@ kind: PodSecurityPolicy metadata: name: {{ include "ceph-csi-cephfs.provisioner.fullname" . }} labels: - app: {{ include "ceph-csi-cephfs.name" . }} - chart: {{ include "ceph-csi-cephfs.chart" . }} - component: {{ .Values.provisioner.name }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + app.kubernetes.io/name: {{ include "ceph-csi-cephfs.name" . }} + helm.sh/chart: {{ include "ceph-csi-cephfs.chart" . }} + app.kubernetes.io/component: {{ .Values.nodeplugin.name }} + app.kubernetes.io/managed-by: {{ .Release.Service }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/version: {{ .Chart.AppVersion }} spec: allowPrivilegeEscalation: true allowedCapabilities: diff --git a/charts/ceph-csi-rbd/templates/encryptionkms-configmap.yaml b/charts/ceph-csi-rbd/templates/encryptionkms-configmap.yaml index 47b7d093d39..0d8d829569c 100644 --- a/charts/ceph-csi-rbd/templates/encryptionkms-configmap.yaml +++ b/charts/ceph-csi-rbd/templates/encryptionkms-configmap.yaml @@ -4,11 +4,12 @@ metadata: name: {{ .Values.kmsConfigMapName | quote }} namespace: {{ .Release.Namespace }} labels: - app: {{ include "ceph-csi-rbd.name" . }} - chart: {{ include "ceph-csi-rbd.chart" . }} - component: {{ .Values.nodeplugin.name }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + app.kubernetes.io/name: {{ include "ceph-csi-rbd.name" . }} + helm.sh/chart: {{ include "ceph-csi-rbd.chart" . }} + app.kubernetes.io/component: {{ .Values.nodeplugin.name }} + app.kubernetes.io/managed-by: {{ .Release.Service }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/version: {{ .Chart.AppVersion }} data: config.json: |- {{ toJson .Values.encryptionKMSConfig | indent 4 -}} diff --git a/charts/ceph-csi-rbd/templates/nodeplugin-grpc-service.yaml b/charts/ceph-csi-rbd/templates/nodeplugin-grpc-service.yaml index 47b20db65cd..5130b254007 100644 --- a/charts/ceph-csi-rbd/templates/nodeplugin-grpc-service.yaml +++ b/charts/ceph-csi-rbd/templates/nodeplugin-grpc-service.yaml @@ -9,7 +9,7 @@ metadata: name: {{ include "ceph-csi-rbd.nodeplugin.fullname" . }}-grpc-metrics namespace: {{ .Release.Namespace }} labels: - app: {{ include "ceph-csi-rbd.fullname" . }} + app.kubernetes.io/name: {{ include "ceph-csi-rbd.fullname" . }} helm.sh/chart: {{ include "ceph-csi-rbd.chart" . }} app.kubernetes.io/component: {{ .Values.nodeplugin.name }} app.kubernetes.io/managed-by: {{ .Release.Service }} diff --git a/charts/ceph-csi-rbd/templates/nodeplugin-http-service.yaml b/charts/ceph-csi-rbd/templates/nodeplugin-http-service.yaml index acdab311475..d34939933a6 100644 --- a/charts/ceph-csi-rbd/templates/nodeplugin-http-service.yaml +++ b/charts/ceph-csi-rbd/templates/nodeplugin-http-service.yaml @@ -9,7 +9,7 @@ metadata: name: {{ include "ceph-csi-rbd.nodeplugin.fullname" . }}-http-metrics namespace: {{ .Release.Namespace }} labels: - app: {{ include "ceph-csi-rbd.fullname" . }} + app.kubernetes.io/name: {{ include "ceph-csi-rbd.fullname" . }} helm.sh/chart: {{ include "ceph-csi-rbd.chart" . }} app.kubernetes.io/component: {{ .Values.nodeplugin.name }} app.kubernetes.io/managed-by: {{ .Release.Service }} diff --git a/charts/ceph-csi-rbd/templates/nodeplugin-psp.yaml b/charts/ceph-csi-rbd/templates/nodeplugin-psp.yaml index 8374a9fac35..0748c69b89f 100644 --- a/charts/ceph-csi-rbd/templates/nodeplugin-psp.yaml +++ b/charts/ceph-csi-rbd/templates/nodeplugin-psp.yaml @@ -4,11 +4,12 @@ kind: PodSecurityPolicy metadata: name: {{ include "ceph-csi-rbd.nodeplugin.fullname" . }} labels: - app: {{ include "ceph-csi-rbd.name" . }} - chart: {{ include "ceph-csi-rbd.chart" . }} - component: {{ .Values.nodeplugin.name }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + app.kubernetes.io/name: {{ include "ceph-csi-rbd.name" . }} + helm.sh/chart: {{ include "ceph-csi-rbd.chart" . }} + app.kubernetes.io/component: {{ .Values.nodeplugin.name }} + app.kubernetes.io/managed-by: {{ .Release.Service }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/version: {{ .Chart.AppVersion }} spec: allowPrivilegeEscalation: true allowedCapabilities: diff --git a/charts/ceph-csi-rbd/templates/provisioner-grpc-service.yaml b/charts/ceph-csi-rbd/templates/provisioner-grpc-service.yaml index db9ae29b9dc..247ec3863c5 100644 --- a/charts/ceph-csi-rbd/templates/provisioner-grpc-service.yaml +++ b/charts/ceph-csi-rbd/templates/provisioner-grpc-service.yaml @@ -9,7 +9,7 @@ metadata: name: {{ include "ceph-csi-rbd.provisioner.fullname" . }}-grpc-metrics namespace: {{ .Release.Namespace }} labels: - app: {{ include "ceph-csi-rbd.fullname" . }} + app.kubernetes.io/name: {{ include "ceph-csi-rbd.fullname" . }} helm.sh/chart: {{ include "ceph-csi-rbd.chart" . }} app.kubernetes.io/component: {{ .Values.provisioner.name }} app.kubernetes.io/managed-by: {{ .Release.Service }} diff --git a/charts/ceph-csi-rbd/templates/provisioner-http-service.yaml b/charts/ceph-csi-rbd/templates/provisioner-http-service.yaml index 0ab4b40e8a7..5b0991325f4 100644 --- a/charts/ceph-csi-rbd/templates/provisioner-http-service.yaml +++ b/charts/ceph-csi-rbd/templates/provisioner-http-service.yaml @@ -9,7 +9,7 @@ metadata: name: {{ include "ceph-csi-rbd.provisioner.fullname" . }}-http-metrics namespace: {{ .Release.Namespace }} labels: - app: {{ include "ceph-csi-rbd.fullname" . }} + app.kubernetes.io/name: {{ include "ceph-csi-rbd.fullname" . }} helm.sh/chart: {{ include "ceph-csi-rbd.chart" . }} app.kubernetes.io/component: {{ .Values.provisioner.name }} app.kubernetes.io/managed-by: {{ .Release.Service }} diff --git a/charts/ceph-csi-rbd/templates/provisioner-psp.yaml b/charts/ceph-csi-rbd/templates/provisioner-psp.yaml index 594e81d81b0..9b5bf463f11 100644 --- a/charts/ceph-csi-rbd/templates/provisioner-psp.yaml +++ b/charts/ceph-csi-rbd/templates/provisioner-psp.yaml @@ -4,11 +4,12 @@ kind: PodSecurityPolicy metadata: name: {{ include "ceph-csi-rbd.provisioner.fullname" . }} labels: - app: {{ include "ceph-csi-rbd.name" . }} - chart: {{ include "ceph-csi-rbd.chart" . }} - component: {{ .Values.provisioner.name }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + app.kubernetes.io/name: {{ include "ceph-csi-rbd.name" . }} + helm.sh/chart: {{ include "ceph-csi-rbd.chart" . }} + app.kubernetes.io/component: {{ .Values.nodeplugin.name }} + app.kubernetes.io/managed-by: {{ .Release.Service }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/version: {{ .Chart.AppVersion }} spec: allowPrivilegeEscalation: true allowedCapabilities: