fix: replaced skipped app labels

Signed-off-by: wilmardo <info@wilmardenouden.nl>
ceph · Mar 12, 2020 · 4dac8a0 · 4dac8a0
1 parent 90b18c3
commit 4dac8a0
Show file tree

Hide file tree

Showing 14 changed files with 44 additions and 38 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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: