diff --git a/charts/ceph-csi-cephfs/templates/csiplugin-configmap.yaml b/charts/ceph-csi-cephfs/templates/csiplugin-configmap.yaml index de007232136..56b79b87243 100644 --- a/charts/ceph-csi-cephfs/templates/csiplugin-configmap.yaml +++ b/charts/ceph-csi-cephfs/templates/csiplugin-configmap.yaml @@ -4,11 +4,12 @@ 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 }} + 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 9c14132d8fc..d622c06f2d2 100644 --- a/charts/ceph-csi-cephfs/templates/nodeplugin-daemonset.yaml +++ b/charts/ceph-csi-cephfs/templates/nodeplugin-daemonset.yaml @@ -4,27 +4,31 @@ 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 }} + app.kubernetes.io/managed-by: {{ .Release.Service }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/version: {{ .Chart.AppVersion }} 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 }} + 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: 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 }} + 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 6a2b8b34471..333f99d3281 100644 --- a/charts/ceph-csi-cephfs/templates/nodeplugin-grpc-service.yaml +++ b/charts/ceph-csi-cephfs/templates/nodeplugin-grpc-service.yaml @@ -9,11 +9,12 @@ metadata: name: {{ include "ceph-csi-cephfs.nodeplugin.fullname" . }}-grpc-metrics 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.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,8 +35,10 @@ 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 }} + 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 95fee84f2e3..1fb536c0d00 100644 --- a/charts/ceph-csi-cephfs/templates/nodeplugin-http-service.yaml +++ b/charts/ceph-csi-cephfs/templates/nodeplugin-http-service.yaml @@ -9,11 +9,12 @@ metadata: name: {{ include "ceph-csi-cephfs.nodeplugin.fullname" . }}-http-metrics 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.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,8 +35,10 @@ 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 }} + 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-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/nodeplugin-rolebinding.yaml b/charts/ceph-csi-cephfs/templates/nodeplugin-rolebinding.yaml index 19b3b6d8b23..3ccbaad8bf9 100644 --- a/charts/ceph-csi-cephfs/templates/nodeplugin-rolebinding.yaml +++ b/charts/ceph-csi-cephfs/templates/nodeplugin-rolebinding.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 }} 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..29f1f4ae893 100644 --- a/charts/ceph-csi-cephfs/templates/nodeplugin-serviceaccount.yaml +++ b/charts/ceph-csi-cephfs/templates/nodeplugin-serviceaccount.yaml @@ -5,9 +5,10 @@ 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 }} + 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 c656b139a08..14f72e6ef12 100644 --- a/charts/ceph-csi-cephfs/templates/provisioner-clusterrole.yaml +++ b/charts/ceph-csi-cephfs/templates/provisioner-clusterrole.yaml @@ -4,11 +4,12 @@ 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 }} + 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 82d5d13169e..a3ea422c518 100644 --- a/charts/ceph-csi-cephfs/templates/provisioner-clusterrolebinding.yaml +++ b/charts/ceph-csi-cephfs/templates/provisioner-clusterrolebinding.yaml @@ -4,11 +4,12 @@ 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 }} + 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 19086a693b6..1dd55b01345 100644 --- a/charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml +++ b/charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml @@ -4,26 +4,30 @@ 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 }} + 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: {{ 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 }} + app.kubernetes.io/managed-by: {{ .Release.Service }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/version: {{ .Chart.AppVersion }} 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 }} + 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 eacb8887526..00cdf6ae62b 100644 --- a/charts/ceph-csi-cephfs/templates/provisioner-grpc-service.yaml +++ b/charts/ceph-csi-cephfs/templates/provisioner-grpc-service.yaml @@ -9,11 +9,12 @@ metadata: name: {{ include "ceph-csi-cephfs.provisioner.fullname" . }}-grpc-metrics 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 }} + 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 }} + 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,8 +35,10 @@ 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 }} + 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 5483242421f..fb4ad4f9ea4 100644 --- a/charts/ceph-csi-cephfs/templates/provisioner-http-service.yaml +++ b/charts/ceph-csi-cephfs/templates/provisioner-http-service.yaml @@ -9,11 +9,12 @@ metadata: name: {{ include "ceph-csi-cephfs.provisioner.fullname" . }}-http-metrics 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 }} + 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 }} + 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,8 +35,10 @@ 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 }} + 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-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-cephfs/templates/provisioner-role.yaml b/charts/ceph-csi-cephfs/templates/provisioner-role.yaml index 983bc60eed6..fdf5bb8c42a 100644 --- a/charts/ceph-csi-cephfs/templates/provisioner-role.yaml +++ b/charts/ceph-csi-cephfs/templates/provisioner-role.yaml @@ -5,11 +5,12 @@ 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 }} + 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 66fb7258068..0d0de288a39 100644 --- a/charts/ceph-csi-cephfs/templates/provisioner-rolebinding.yaml +++ b/charts/ceph-csi-cephfs/templates/provisioner-rolebinding.yaml @@ -5,11 +5,12 @@ 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 }} + 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 629631fa84c..eb6becf7b13 100644 --- a/charts/ceph-csi-cephfs/templates/provisioner-rules-clusterrole.yaml +++ b/charts/ceph-csi-cephfs/templates/provisioner-rules-clusterrole.yaml @@ -4,11 +4,12 @@ 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 }} + 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 c4ba5c1887b..b4464f956de 100644 --- a/charts/ceph-csi-cephfs/templates/provisioner-serviceaccount.yaml +++ b/charts/ceph-csi-cephfs/templates/provisioner-serviceaccount.yaml @@ -5,9 +5,10 @@ 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 }} + 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 bfc366b3e0c..df745c64146 100644 --- a/charts/ceph-csi-rbd/templates/csiplugin-configmap.yaml +++ b/charts/ceph-csi-rbd/templates/csiplugin-configmap.yaml @@ -4,11 +4,12 @@ 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 }} + 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/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-daemonset.yaml b/charts/ceph-csi-rbd/templates/nodeplugin-daemonset.yaml index f19292642f6..1dc83e11240 100644 --- a/charts/ceph-csi-rbd/templates/nodeplugin-daemonset.yaml +++ b/charts/ceph-csi-rbd/templates/nodeplugin-daemonset.yaml @@ -4,27 +4,31 @@ 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 }} + app.kubernetes.io/managed-by: {{ .Release.Service }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/version: {{ .Chart.AppVersion }} 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 }} + 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: 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 }} + 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 39e9cf98492..5130b254007 100644 --- a/charts/ceph-csi-rbd/templates/nodeplugin-grpc-service.yaml +++ b/charts/ceph-csi-rbd/templates/nodeplugin-grpc-service.yaml @@ -9,11 +9,12 @@ metadata: name: {{ include "ceph-csi-rbd.nodeplugin.fullname" . }}-grpc-metrics 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 }} + 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 }} + 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,8 +35,10 @@ 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 }} + 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 68a3942e833..d34939933a6 100644 --- a/charts/ceph-csi-rbd/templates/nodeplugin-http-service.yaml +++ b/charts/ceph-csi-rbd/templates/nodeplugin-http-service.yaml @@ -9,11 +9,12 @@ metadata: name: {{ include "ceph-csi-rbd.nodeplugin.fullname" . }}-http-metrics 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 }} + 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 }} + 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,8 +35,10 @@ 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 }} + 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-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/nodeplugin-role.yaml b/charts/ceph-csi-rbd/templates/nodeplugin-role.yaml index d9d5a0e7bc6..a3707500d55 100644 --- a/charts/ceph-csi-rbd/templates/nodeplugin-role.yaml +++ b/charts/ceph-csi-rbd/templates/nodeplugin-role.yaml @@ -5,11 +5,12 @@ 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 }} + 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 f4cce98afda..9d4ac6bec70 100644 --- a/charts/ceph-csi-rbd/templates/nodeplugin-rolebinding.yaml +++ b/charts/ceph-csi-rbd/templates/nodeplugin-rolebinding.yaml @@ -5,11 +5,12 @@ 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 }} + 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 36e1ee74594..f9592e60de9 100644 --- a/charts/ceph-csi-rbd/templates/nodeplugin-serviceaccount.yaml +++ b/charts/ceph-csi-rbd/templates/nodeplugin-serviceaccount.yaml @@ -5,9 +5,10 @@ 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 }} + 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 21745ed4950..f237c8d0b50 100644 --- a/charts/ceph-csi-rbd/templates/provisioner-clusterrole.yaml +++ b/charts/ceph-csi-rbd/templates/provisioner-clusterrole.yaml @@ -4,11 +4,12 @@ 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 }} + 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 5a086103ab0..12418403a21 100644 --- a/charts/ceph-csi-rbd/templates/provisioner-clusterrolebinding.yaml +++ b/charts/ceph-csi-rbd/templates/provisioner-clusterrolebinding.yaml @@ -4,11 +4,12 @@ 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 }} + 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 04026fc372b..038ece324be 100644 --- a/charts/ceph-csi-rbd/templates/provisioner-deployment.yaml +++ b/charts/ceph-csi-rbd/templates/provisioner-deployment.yaml @@ -4,26 +4,30 @@ 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 }} + 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: {{ 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 }} + app.kubernetes.io/managed-by: {{ .Release.Service }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/version: {{ .Chart.AppVersion }} 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 }} + 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 cb0c2aaff6b..247ec3863c5 100644 --- a/charts/ceph-csi-rbd/templates/provisioner-grpc-service.yaml +++ b/charts/ceph-csi-rbd/templates/provisioner-grpc-service.yaml @@ -9,11 +9,12 @@ metadata: name: {{ include "ceph-csi-rbd.provisioner.fullname" . }}-grpc-metrics 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 }} + 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 }} + 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,8 +35,10 @@ 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 }} + 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 0d4c925ecff..5b0991325f4 100644 --- a/charts/ceph-csi-rbd/templates/provisioner-http-service.yaml +++ b/charts/ceph-csi-rbd/templates/provisioner-http-service.yaml @@ -9,11 +9,12 @@ metadata: name: {{ include "ceph-csi-rbd.provisioner.fullname" . }}-http-metrics 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 }} + 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 }} + 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,8 +35,10 @@ 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 }} + 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-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: diff --git a/charts/ceph-csi-rbd/templates/provisioner-role.yaml b/charts/ceph-csi-rbd/templates/provisioner-role.yaml index 332104fd0a9..eb28dd35f54 100644 --- a/charts/ceph-csi-rbd/templates/provisioner-role.yaml +++ b/charts/ceph-csi-rbd/templates/provisioner-role.yaml @@ -5,11 +5,12 @@ 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 }} + 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 23fa39fed39..696fa5a2562 100644 --- a/charts/ceph-csi-rbd/templates/provisioner-rolebinding.yaml +++ b/charts/ceph-csi-rbd/templates/provisioner-rolebinding.yaml @@ -5,11 +5,12 @@ 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 }} + 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 025db945a60..7e9866f5140 100644 --- a/charts/ceph-csi-rbd/templates/provisioner-rules-clusterrole.yaml +++ b/charts/ceph-csi-rbd/templates/provisioner-rules-clusterrole.yaml @@ -4,11 +4,12 @@ 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 }} + 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 893b43a9c82..404fae1af8d 100644 --- a/charts/ceph-csi-rbd/templates/provisioner-serviceaccount.yaml +++ b/charts/ceph-csi-rbd/templates/provisioner-serviceaccount.yaml @@ -5,9 +5,10 @@ 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 }} + app.kubernetes.io/managed-by: {{ .Release.Service }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/version: {{ .Chart.AppVersion }} {{- end -}}