Merge pull request #3110 from cloudfoundry-incubator/add-chart-labels

Add helm chart labels
cloudfoundry · Oct 5, 2018 · 0ea6b61 · 0ea6b61
2 parents 184ef90 + 0378f0b
commit 0ea6b61
Show file tree

Hide file tree

Showing 4 changed files with 57 additions and 14 deletions.
diff --git a/deploy/kubernetes/console/templates/deployment.yaml b/deploy/kubernetes/console/templates/deployment.yaml
@@ -9,8 +9,11 @@ spec:
   template:
     metadata:
       labels:
-        app: "{{ .Release.Name }}"
-        component: "console"
+        app.kubernetes.io/name: "stratos"
+        app.kubernetes.io/instance: "{{ .Release.Name }}"
+        app.kubernetes.io/version: "{{ .Chart.AppVersion }}"
+        app.kubernetes.io/component: "console"
+        helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
     spec:
       containers:
       - image: {{.Values.kube.registry.hostname}}/{{.Values.kube.organization}}/{{.Values.images.console}}:{{.Values.consoleVersion}}
@@ -243,12 +246,20 @@ kind: Deployment
 metadata:
   name: console-mariadb
   labels:
-    app: "{{ .Release.Name }}"
+    app.kubernetes.io/name: "stratos"
+    app.kubernetes.io/instance: "{{ .Release.Name }}"
+    app.kubernetes.io/version: "{{ .Chart.AppVersion }}"
+    app.kubernetes.io/component: "console-mariadb"
+    helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
 spec:
   template:
     metadata:
       labels:
-        app: "{{ .Release.Name }}"
+        app.kubernetes.io/name: "stratos"
+        app.kubernetes.io/instance: "{{ .Release.Name }}"
+        app.kubernetes.io/version: "{{ .Chart.AppVersion }}"
+        app.kubernetes.io/component: "console-mariadb"
+        helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
     spec:
       containers:
       - name: mariadb

diff --git a/deploy/kubernetes/console/templates/pre-install.yaml b/deploy/kubernetes/console/templates/pre-install.yaml
@@ -4,7 +4,11 @@ kind: PersistentVolumeClaim
 metadata:
   name: "{{ .Release.Name }}-encryption-key-volume"
   labels:
-    app:  "{{ .Release.Name }}"
+    app.kubernetes.io/name: "stratos"
+    app.kubernetes.io/instance: "{{ .Release.Name }}"
+    app.kubernetes.io/version: "{{ .Chart.AppVersion }}"
+    app.kubernetes.io/component: "console-encryption-volume"
+    helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
   annotations:
   {{- if .Values.storageClass }}
     volume.beta.kubernetes.io/storage-class: {{ .Values.storageClass | quote }}
@@ -26,7 +30,11 @@ apiVersion: v1
 metadata:
   name: console-mariadb
   labels:
-    app:  "{{ .Release.Name }}"
+    app.kubernetes.io/name: "stratos"
+    app.kubernetes.io/instance: "{{ .Release.Name }}"
+    app.kubernetes.io/version: "{{ .Chart.AppVersion }}"
+    app.kubernetes.io/component: "console-mariadb-volume"
+    helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
   annotations:
   {{- if .Values.mariadb.persistence.storageClass }}
     volume.beta.kubernetes.io/storage-class: {{ .Values.mariadb.persistence.storageClass | quote }}
@@ -50,7 +58,11 @@ kind: PersistentVolumeClaim
 metadata:
   name: "{{ .Release.Name }}-upgrade-volume"
   labels:
-    app:  "{{ .Release.Name }}"
+    app.kubernetes.io/name: "stratos"
+    app.kubernetes.io/instance: "{{ .Release.Name }}"
+    app.kubernetes.io/version: "{{ .Chart.AppVersion }}"
+    app.kubernetes.io/component: "console-upgrade-volume"
+    helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
   annotations:
   {{- if .Values.storageClass }}
     volume.beta.kubernetes.io/storage-class: {{ .Values.storageClass | quote }}

diff --git a/deploy/kubernetes/console/templates/secrets.yaml b/deploy/kubernetes/console/templates/secrets.yaml
@@ -5,7 +5,11 @@ type: Opaque
 metadata:
   name: "{{ .Release.Name }}-secret"
   labels:
-    app: "{{ .Release.Name }}"
+    app.kubernetes.io/name: "stratos"
+    app.kubernetes.io/instance: "{{ .Release.Name }}"
+    app.kubernetes.io/version: "{{ .Chart.AppVersion }}"
+    app.kubernetes.io/component: "console-secret"
+    helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
 data:
   stolon: {{ .Values.dbPassword | b64enc }}
   db-password: {{  .Values.mariadb.mariadbPassword | b64enc }}
@@ -16,7 +20,11 @@ kind: Secret
 metadata:
   name: "{{ .Release.Name }}-mariadb-secret"
   labels:
-    app: "{{ .Release.Name }}"
+    app.kubernetes.io/name: "stratos"
+    app.kubernetes.io/instance: "{{ .Release.Name }}"
+    app.kubernetes.io/version: "{{ .Chart.AppVersion }}"
+    app.kubernetes.io/component: "console-mariadb-secret"
+    helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
 type: Opaque
 data:
   {{- if .Values.mariadb.mariadbRootPassword }}
@@ -38,7 +46,11 @@ type: kubernetes.io/dockercfg
 metadata:
   name: {{ .Values.dockerRegistrySecret }}
   labels:
-    app: "{{ .Release.Name }}"
+    app.kubernetes.io/name: "stratos"
+    app.kubernetes.io/instance: "{{ .Release.Name }}"
+    app.kubernetes.io/version: "{{ .Chart.AppVersion }}"
+    app.kubernetes.io/component: "console-dockerreg-secret"
+    helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
 data:
   .dockercfg: {{ template "imagePullSecret" . }}
 {{- end}}
diff --git a/deploy/kubernetes/console/templates/service.yaml b/deploy/kubernetes/console/templates/service.yaml
@@ -2,7 +2,11 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
-    app: "{{ .Release.Name }}"
+    app.kubernetes.io/name: "stratos"
+    app.kubernetes.io/instance: "{{ .Release.Name }}"
+    app.kubernetes.io/version: "{{ .Chart.AppVersion }}"
+    app.kubernetes.io/component: "console-ext-service"
+    helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
   name: "{{ .Release.Name }}-ui-ext"
 spec:
   ports:
@@ -25,7 +29,7 @@ spec:
     protocol: TCP
     targetPort: 443
   selector:
-    app: "{{ .Release.Name }}"
+    app.kubernetes.io/instance: "{{ .Release.Name }}"
     component: console
 {{- if or .Values.useLb .Values.services.loadbalanced }}
   type: LoadBalancer
@@ -41,12 +45,16 @@ kind: Service
 metadata:
   name: "{{ .Release.Name }}-mariadb"
   labels:
-    app: "{{ .Release.Name }}"
+    app.kubernetes.io/name: "stratos"
+    app.kubernetes.io/instance: "{{ .Release.Name }}"
+    app.kubernetes.io/version: "{{ .Chart.AppVersion }}"
+    app.kubernetes.io/component: "console-mariadb-service"
+    helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
 spec:
   type: ClusterIP
   ports:
   - name: mysql
     port: 3306
     targetPort: mysql
   selector:
-    app: "{{ .Release.Name }}"
+    app.kubernetes.io/instance: "{{ .Release.Name }}"