Add recommended kubernetes labels to helm chart (#21)

kedacore · Feb 6, 2020 · c2c7758 · c2c7758
1 parent 1e44265
commit c2c7758
Show file tree

Hide file tree

Showing 9 changed files with 78 additions and 13 deletions.
diff --git 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 -}}
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
+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