From 86fd0ed010bdc2baadf807ff6b50ada73ae5289c Mon Sep 17 00:00:00 2001 From: Sandra Hayward Date: Tue, 4 Feb 2020 16:12:12 +0000 Subject: [PATCH] Add recommended kubernetes labels to helm chart --- keda/templates/01-service-account.yaml | 6 ++++++ keda/templates/10-role.yaml | 6 ++++++ keda/templates/11-role_binding.yaml | 6 ++++++ keda/templates/12-operator.yaml | 6 ++++++ keda/templates/20-metrics-cluster_role.yaml | 6 ++++++ keda/templates/21-metrics-role_binding.yaml | 18 ++++++++++++++++++ keda/templates/22-metrics-deployment.yaml | 5 +++++ keda/templates/23-metrics-service.yaml | 6 ++++++ keda/templates/24-metrics-api_service.yaml | 6 ++++++ 9 files changed, 65 insertions(+) diff --git a/keda/templates/01-service-account.yaml b/keda/templates/01-service-account.yaml index f05a8d99..2a411feb 100644 --- a/keda/templates/01-service-account.yaml +++ b/keda/templates/01-service-account.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-role.yaml b/keda/templates/10-role.yaml index a759e73a..66848dc4 100644 --- a/keda/templates/10-role.yaml +++ b/keda/templates/10-role.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-role_binding.yaml b/keda/templates/11-role_binding.yaml index 3f3e562e..568fb0b2 100644 --- a/keda/templates/11-role_binding.yaml +++ b/keda/templates/11-role_binding.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-operator.yaml b/keda/templates/12-operator.yaml index 412c947f..326be046 100644 --- a/keda/templates/12-operator.yaml +++ b/keda/templates/12-operator.yaml @@ -3,6 +3,12 @@ kind: Deployment metadata: 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 }} name: {{ .Values.operatorName }} namespace: {{ .Release.Namespace }} spec: diff --git a/keda/templates/20-metrics-cluster_role.yaml b/keda/templates/20-metrics-cluster_role.yaml index 14c6e680..d296fbb9 100644 --- a/keda/templates/20-metrics-cluster_role.yaml +++ b/keda/templates/20-metrics-cluster_role.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-role_binding.yaml b/keda/templates/21-metrics-role_binding.yaml index 8b12cb38..a8f6f196 100644 --- a/keda/templates/21-metrics-role_binding.yaml +++ b/keda/templates/21-metrics-role_binding.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 4da6998e..2134c680 100644 --- a/keda/templates/22-metrics-deployment.yaml +++ b/keda/templates/22-metrics-deployment.yaml @@ -3,6 +3,11 @@ kind: Deployment metadata: 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 }} name: {{ .Values.operatorName }}-metrics-apiserver namespace: {{ .Release.Namespace }} spec: diff --git a/keda/templates/23-metrics-service.yaml b/keda/templates/23-metrics-service.yaml index 1bab91e0..4a9ba4f5 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-api_service.yaml b/keda/templates/24-metrics-api_service.yaml index d243adaf..0882f566 100644 --- a/keda/templates/24-metrics-api_service.yaml +++ b/keda/templates/24-metrics-api_service.yaml @@ -1,6 +1,12 @@ 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: