Merge pull request #42 from stakater/fix-chart-labels

Fix chart labels
stakater · Apr 9, 2018 · 6a3a314 · 6a3a314
2 parents 92c8355 + 5f4631b
commit 6a3a314
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 11 deletions.
diff --git a/kubernetes/chart/IngressMonitorController/templates/configmap.yaml b/kubernetes/chart/IngressMonitorController/templates/configmap.yaml
@@ -5,10 +5,12 @@ metadata:
     fabric8.io/target-platform: kubernetes
   labels:
     app: {{ template "name" . }}
-    chart: "{{ .Chart.Name }}"
+    version: {{ .Chart.Version }}
+    group: {{ .Values.ingressMonitorController.group }}
+    provider: {{ .Values.ingressMonitorController.provider }}
+    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     release: {{ .Release.Name | quote }}
     heritage: {{ .Release.Service | quote }}
-    project: {{ template "name" . }}
   name: {{ template "name" . }}
 data:
   config.yaml: |-

diff --git a/kubernetes/chart/IngressMonitorController/templates/deployment.yaml b/kubernetes/chart/IngressMonitorController/templates/deployment.yaml
@@ -5,24 +5,31 @@ metadata:
     configmap.fabric8.io/update-on-change: {{ template "name" . }}
   labels:
     app: {{ template "name" . }}
-    chart: "{{ .Chart.Name }}"
+    version: {{ .Chart.Version }}
+    group: {{ .Values.ingressMonitorController.group }}
+    provider: {{ .Values.ingressMonitorController.provider }}
+    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     release: {{ .Release.Name | quote }}
     heritage: {{ .Release.Service | quote }}
-    project: {{ template "name" . }}
   name: {{ template "name" . }}
 spec:
   replicas: 1
   revisionHistoryLimit: 2
+  selector:
+    matchLabels:
+      app: {{ template "name" . }}
+      version: {{ .Chart.Version }}
+      group: {{ .Values.ingressMonitorController.group }}
+      provider: {{ .Values.ingressMonitorController.provider }}
   template:
     metadata:
       annotations:
         configmap.fabric8.io/update-on-change: {{ template "name" . }}
       labels:
         app: {{ template "name" . }}
-        chart: "{{ .Chart.Name }}"
-        release: {{ .Release.Name | quote }}
-        heritage: {{ .Release.Service | quote }}
-        project: {{ template "name" . }}
+        version: {{ .Chart.Version }}
+        group: {{ .Values.ingressMonitorController.group }}
+        provider: {{ .Values.ingressMonitorController.provider }}
     spec:
       containers:
       - env:

diff --git a/kubernetes/chart/IngressMonitorController/templates/rbac.yaml b/kubernetes/chart/IngressMonitorController/templates/rbac.yaml
@@ -3,11 +3,12 @@ kind: ServiceAccount
 metadata:
   labels:
     app: {{ template "name" . }}
-    chart: "{{ .Chart.Name }}"
+    version: {{ .Chart.Version }}
+    group: {{ .Values.ingressMonitorController.group }}
+    provider: {{ .Values.ingressMonitorController.provider }}
+    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     release: {{ .Release.Name | quote }}
     heritage: {{ .Release.Service | quote }}
-    project: {{ template "name" . }}
-    group: com.stakater
   name: {{ template "name" . }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1beta1

diff --git a/kubernetes/chart/IngressMonitorController/values.yaml b/kubernetes/chart/IngressMonitorController/values.yaml
@@ -4,6 +4,8 @@ kubernetes:
   host: https://kubernetes.default
 
 ingressMonitorController:
+  group: com.stakater.platform
+  provider: stakater
   namespace: default
   image:
     name: stakater/ingressmonitorcontroller