From 1860f2672868627796719ab1bf9368aba5fb9140 Mon Sep 17 00:00:00 2001
From: Waseem Hassan <waseemhassanshahid@gmail.com>
Date: Mon, 9 Apr 2018 14:44:21 +0500
Subject: [PATCH 1/2] Fix chart labels

---
 .../templates/configmap.yaml                  |  6 ++++--
 .../templates/deployment.yaml                 | 21 +++++++++++++++----
 .../templates/rbac.yaml                       |  7 ++++---
 .../IngressMonitorController/values.yaml      |  2 ++
 4 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/kubernetes/chart/IngressMonitorController/templates/configmap.yaml b/kubernetes/chart/IngressMonitorController/templates/configmap.yaml
index 785c2157..d154727c 100644
--- 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
index c487100d..8d5ec0fb 100644
--- a/kubernetes/chart/IngressMonitorController/templates/deployment.yaml
+++ b/kubernetes/chart/IngressMonitorController/templates/deployment.yaml
@@ -5,24 +5,37 @@ 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 }}
+      chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+      release: {{ .Release.Name | quote }}
+      heritage: {{ .Release.Service | quote }}
   template:
     metadata:
       annotations:
         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" . }}
     spec:
       containers:
       - env:
diff --git a/kubernetes/chart/IngressMonitorController/templates/rbac.yaml b/kubernetes/chart/IngressMonitorController/templates/rbac.yaml
index 1ede5c68..711042a6 100644
--- 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
index 355f05a8..0e11fa02 100644
--- 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

From 5f4631be7bf1ca96477882c2fc1f305e730fa61c Mon Sep 17 00:00:00 2001
From: Waseem Hassan <waseemhassanshahid@gmail.com>
Date: Mon, 9 Apr 2018 15:01:08 +0500
Subject: [PATCH 2/2] Update selector labels

---
 .../IngressMonitorController/templates/deployment.yaml      | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/kubernetes/chart/IngressMonitorController/templates/deployment.yaml b/kubernetes/chart/IngressMonitorController/templates/deployment.yaml
index 8d5ec0fb..5d142880 100644
--- a/kubernetes/chart/IngressMonitorController/templates/deployment.yaml
+++ b/kubernetes/chart/IngressMonitorController/templates/deployment.yaml
@@ -21,9 +21,6 @@ spec:
       version: {{ .Chart.Version }}
       group: {{ .Values.ingressMonitorController.group }}
       provider: {{ .Values.ingressMonitorController.provider }}
-      chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-      release: {{ .Release.Name | quote }}
-      heritage: {{ .Release.Service | quote }}
   template:
     metadata:
       annotations:
@@ -33,9 +30,6 @@ spec:
         version: {{ .Chart.Version }}
         group: {{ .Values.ingressMonitorController.group }}
         provider: {{ .Values.ingressMonitorController.provider }}
-        chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-        release: {{ .Release.Name | quote }}
-        heritage: {{ .Release.Service | quote }}
     spec:
       containers:
       - env: