From c2c775837e0ed17bafe647591270b7adb1b03698 Mon Sep 17 00:00:00 2001
From: Sandra Hayward <cotton_glow@hotmail.com>
Date: Thu, 6 Feb 2020 17:35:50 +0000
Subject: [PATCH] Add recommended kubernetes labels to helm chart (#21)

---
 keda/templates/01-serviceaccount.yaml         |  6 ++++
 keda/templates/10-keda-clusterrole.yaml       |  6 ++++
 .../templates/11-keda-clusterrolebinding.yaml |  6 ++++
 keda/templates/12-keda-deployment.yaml        |  6 ++++
 keda/templates/20-metrics-clusterrole.yaml    |  6 ++++
 .../21-metrics-clusterrolebinding.yaml        | 18 +++++++++++
 keda/templates/22-metrics-deployment.yaml     |  5 +++
 keda/templates/23-metrics-service.yaml        |  6 ++++
 keda/templates/24-metrics-apiservice.yaml     | 32 +++++++++++--------
 9 files changed, 78 insertions(+), 13 deletions(-)

diff --git a/keda/templates/01-serviceaccount.yaml b/keda/templates/01-serviceaccount.yaml
index f05a8d99..2a411feb 100644
--- a/keda/templates/01-serviceaccount.yaml
+++ b/keda/templates/01-serviceaccount.yaml
@@ -2,6 +2,12 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
+  labels:
+    app.kubernetes.io/name: {{ .Values.serviceAccount.name }}
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
+    app.kubernetes.io/part-of: {{ .Values.operatorName }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
   name: {{ .Values.serviceAccount.name }}
   namespace: {{ .Release.Namespace }}
 {{- end -}}
\ No newline at end of file
diff --git a/keda/templates/10-keda-clusterrole.yaml b/keda/templates/10-keda-clusterrole.yaml
index a759e73a..66848dc4 100644
--- a/keda/templates/10-keda-clusterrole.yaml
+++ b/keda/templates/10-keda-clusterrole.yaml
@@ -2,6 +2,12 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
+  labels:
+    app.kubernetes.io/name: {{ .Values.operatorName }}
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
+    app.kubernetes.io/part-of: {{ .Values.operatorName }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
   creationTimestamp: null
   name: {{ .Values.operatorName }}
 rules:
diff --git a/keda/templates/11-keda-clusterrolebinding.yaml b/keda/templates/11-keda-clusterrolebinding.yaml
index 3f3e562e..568fb0b2 100644
--- a/keda/templates/11-keda-clusterrolebinding.yaml
+++ b/keda/templates/11-keda-clusterrolebinding.yaml
@@ -2,6 +2,12 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
+  labels:
+    app.kubernetes.io/name: {{ .Values.operatorName }}
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
+    app.kubernetes.io/part-of: {{ .Values.operatorName }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
   name: {{ .Values.operatorName }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
diff --git a/keda/templates/12-keda-deployment.yaml b/keda/templates/12-keda-deployment.yaml
index 9234cb7d..3b9aafba 100644
--- a/keda/templates/12-keda-deployment.yaml
+++ b/keda/templates/12-keda-deployment.yaml
@@ -5,6 +5,12 @@ metadata:
   namespace: {{ .Release.Namespace }}
   labels:
     app: {{ .Values.operatorName }}
+    app.kubernetes.io/name: {{ .Values.operatorName }}
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
+    app.kubernetes.io/component: operator
+    app.kubernetes.io/part-of: {{ .Values.operatorName }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
 spec:
   replicas: {{ .Values.replicaCount }}
   selector:
diff --git a/keda/templates/20-metrics-clusterrole.yaml b/keda/templates/20-metrics-clusterrole.yaml
index 14c6e680..d296fbb9 100644
--- a/keda/templates/20-metrics-clusterrole.yaml
+++ b/keda/templates/20-metrics-clusterrole.yaml
@@ -2,6 +2,12 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
+  labels:
+    app.kubernetes.io/name: {{ .Values.operatorName }}-external-metrics-reader
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
+    app.kubernetes.io/part-of: {{ .Values.operatorName }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
   creationTimestamp: null
   name: {{ .Values.operatorName }}-external-metrics-reader
 rules:
diff --git a/keda/templates/21-metrics-clusterrolebinding.yaml b/keda/templates/21-metrics-clusterrolebinding.yaml
index 8b12cb38..a8f6f196 100644
--- a/keda/templates/21-metrics-clusterrolebinding.yaml
+++ b/keda/templates/21-metrics-clusterrolebinding.yaml
@@ -2,6 +2,12 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
+  labels:
+    app.kubernetes.io/name: {{ .Values.operatorName }}-system-auth-delegator
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
+    app.kubernetes.io/part-of: {{ .Values.operatorName }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.kubernetes.io/instance: {{ .Release.Name}}
   name: {{ .Values.operatorName }}:system:auth-delegator
 roleRef:
   apiGroup: rbac.authorization.k8s.io
@@ -15,6 +21,12 @@ subjects:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
+  labels:
+    app.kubernetes.io/name: {{ .Values.operatorName }}-auth-reader
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
+    app.kubernetes.io/part-of: {{ .Values.operatorName }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.kubernetes.io/instance: {{ .Release.Name}}
   name: {{ .Values.operatorName }}-auth-reader
   namespace: kube-system
 roleRef:
@@ -29,6 +41,12 @@ subjects:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
+  labels:
+    app.kubernetes.io/name: {{ .Values.operatorName }}-hpa-controller-external-metrics
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
+    app.kubernetes.io/part-of: {{ .Values.operatorName }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
   name: {{ .Values.operatorName }}-hpa-controller-external-metrics
 roleRef:
   apiGroup: rbac.authorization.k8s.io
diff --git a/keda/templates/22-metrics-deployment.yaml b/keda/templates/22-metrics-deployment.yaml
index 8c3fd68b..a21f4f85 100644
--- a/keda/templates/22-metrics-deployment.yaml
+++ b/keda/templates/22-metrics-deployment.yaml
@@ -5,6 +5,11 @@ metadata:
   namespace: {{ .Release.Namespace }}
   labels:
     app: {{ .Values.operatorName }}-metrics-apiserver
+    app.kubernetes.io/name: {{ .Values.operatorName }}-metrics-apiserver
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
+    app.kubernetes.io/part-of: {{ .Values.operatorName }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
 spec:
   replicas: {{ .Values.replicaCount }}
   selector:
diff --git a/keda/templates/23-metrics-service.yaml b/keda/templates/23-metrics-service.yaml
index af332865..fa8a0c0d 100644
--- a/keda/templates/23-metrics-service.yaml
+++ b/keda/templates/23-metrics-service.yaml
@@ -1,6 +1,12 @@
 apiVersion: v1
 kind: Service
 metadata:
+  labels:
+    app.kubernetes.io/name: {{ .Values.operatorName }}-metrics-apiserver
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
+    app.kubernetes.io/part-of: {{ .Values.operatorName }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
   name: {{ .Values.operatorName }}-metrics-apiserver
   namespace: {{ .Release.Namespace }}
 spec:
diff --git a/keda/templates/24-metrics-apiservice.yaml b/keda/templates/24-metrics-apiservice.yaml
index 6dc29255..0882f566 100644
--- a/keda/templates/24-metrics-apiservice.yaml
+++ b/keda/templates/24-metrics-apiservice.yaml
@@ -1,13 +1,19 @@
-apiVersion: apiregistration.k8s.io/v1beta1
-kind: APIService
-metadata:
-  name: v1beta1.external.metrics.k8s.io
-spec:
-  service:
-    name: {{ .Values.operatorName }}-metrics-apiserver
-    namespace: {{ .Release.Namespace }}
-  group: external.metrics.k8s.io
-  version: v1beta1
-  insecureSkipTLSVerify: true
-  groupPriorityMinimum: 100
-  versionPriority: 100
\ No newline at end of file
+apiVersion: apiregistration.k8s.io/v1beta1
+kind: APIService
+metadata:
+  labels:
+    app.kubernetes.io/name: v1beta1.external.metrics.k8s.io
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
+    app.kubernetes.io/part-of: {{ .Values.operatorName }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
+  name: v1beta1.external.metrics.k8s.io
+spec:
+  service:
+    name: {{ .Values.operatorName }}-metrics-apiserver
+    namespace: {{ .Release.Namespace }}
+  group: external.metrics.k8s.io
+  version: v1beta1
+  insecureSkipTLSVerify: true
+  groupPriorityMinimum: 100
+  versionPriority: 100