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 -}}