helm: add podLabels option (#130)

* helm: add podLabels Signed-off-by: t3mi <[email protected]> * Packaged new Helm chart version Signed-off-by: t3mi <[email protected]>
kedacore · Mar 15, 2021 · 56d5409 · 56d5409
1 parent d5e7ec2
commit 56d5409
Show file tree

Hide file tree

Showing 7 changed files with 60 additions and 29 deletions.
diff --git a/docs/index.yaml b/docs/index.yaml
@@ -3,7 +3,27 @@ entries:
   keda:
   - apiVersion: v2
     appVersion: 2.1.0
-    created: "2021-02-26T18:18:14.192478+01:00"
+    created: "2021-03-15T11:00:18.8585368+02:00"
+    description: Event-based autoscaler for workloads on Kubernetes
+    digest: 65e2fb98c55740251d7ffa1680ef0edeb42954576deac3856dd468473e321747
+    home: https://github.com/kedacore/keda
+    icon: https://raw.githubusercontent.com/kedacore/keda/master/images/keda-logo-500x500-white.png
+    maintainers:
+    - email: [email protected]
+      name: Ahmed ElSayed
+    - email: [email protected]
+      name: Tom Kerkhove
+    - email: [email protected]
+      name: Zbynek Roubalik
+    name: keda
+    sources:
+    - https://github.com/kedacore/keda
+    urls:
+    - https://kedacore.github.io/charts/keda-2.1.3.tgz
+    version: 2.1.3
+  - apiVersion: v2
+    appVersion: 2.1.0
+    created: "2021-03-15T11:00:18.8457984+02:00"
     description: Event-based autoscaler for workloads on Kubernetes
     digest: f336ab24d5ebf96d28da95a03931f2701bb44ce6bb7c30991e3ad14959e2e7e4
     home: https://github.com/kedacore/keda
@@ -23,7 +43,7 @@ entries:
     version: 2.1.2
   - apiVersion: v2
     appVersion: 2.1.0
-    created: "2021-02-26T18:18:14.190175+01:00"
+    created: "2021-03-15T11:00:18.8306027+02:00"
     description: Event-based autoscaler for workloads on Kubernetes
     digest: b6e752d05797cd50ce95a96ae1b6cf8b2b87fc10c27391172beb1acd9fcb18a2
     home: https://github.com/kedacore/keda
@@ -43,7 +63,7 @@ entries:
     version: 2.1.1
   - apiVersion: v2
     appVersion: 2.1.0
-    created: "2021-02-26T18:18:14.187873+01:00"
+    created: "2021-03-15T11:00:18.8177202+02:00"
     description: Event-based autoscaler for workloads on Kubernetes
     digest: 91998f9165176f972b954ef9d4077942979cb5e863bb7d76ed29c48f63533531
     home: https://github.com/kedacore/keda
@@ -63,7 +83,7 @@ entries:
     version: 2.1.0
   - apiVersion: v2
     appVersion: 2.0.0
-    created: "2021-02-26T18:18:14.185066+01:00"
+    created: "2021-03-15T11:00:18.803499+02:00"
     description: Event-based autoscaler for workloads on Kubernetes
     digest: ce2e848f5d7a067d74feb3745da5a834cccdfaa665b5b59d43ad06baa4cdfd04
     home: https://github.com/kedacore/keda
@@ -83,7 +103,7 @@ entries:
     version: 2.0.1
   - apiVersion: v1
     appVersion: 2.0.0
-    created: "2021-02-26T18:18:14.182891+01:00"
+    created: "2021-03-15T11:00:18.7917095+02:00"
     description: Event-based autoscaler for workloads on Kubernetes
     digest: dba8b0e793085165c7d155f9393c5ff112d4714dbce0201404ceb0e67d1b2deb
     home: https://github.com/kedacore/keda
@@ -103,7 +123,7 @@ entries:
     version: 2.0.0
   - apiVersion: v1
     appVersion: 2.0.0-rc2
-    created: "2021-02-26T18:18:14.18066+01:00"
+    created: "2021-03-15T11:00:18.7758776+02:00"
     description: Event-based autoscaler for workloads on Kubernetes
     digest: bad82c28c5ca1d5e69fac4bfcc7a999d5d2b2afd9b19ff6deb9a48811110eb0d
     home: https://github.com/kedacore/keda
@@ -123,7 +143,7 @@ entries:
     version: 2.0.0-rc3
   - apiVersion: v2
     appVersion: 2.0.0-rc2
-    created: "2021-02-26T18:18:14.178051+01:00"
+    created: "2021-03-15T11:00:18.7631328+02:00"
     description: Event-based autoscaler for workloads on Kubernetes
     digest: a4042ba14e595a8e82c9a39d8987625b89292aa86029686a3603b724fda36ca0
     home: https://github.com/kedacore/keda
@@ -144,7 +164,7 @@ entries:
     version: 2.0.0-rc2
   - apiVersion: v1
     appVersion: 2.0.0-rc
-    created: "2021-02-26T18:18:14.175877+01:00"
+    created: "2021-03-15T11:00:18.7515314+02:00"
     description: Event-based autoscaler for workloads on Kubernetes
     digest: 3a952f2aaa0ea35ee4335f0b168f44fcf37c5c5ab7e9b9bba7e731c42f04ad61
     home: https://github.com/kedacore/keda
@@ -164,7 +184,7 @@ entries:
     version: 2.0.0-rc
   - apiVersion: v1
     appVersion: 2.0.0-beta
-    created: "2021-02-26T18:18:14.173692+01:00"
+    created: "2021-03-15T11:00:18.7383321+02:00"
     description: Event-based autoscaler for workloads on Kubernetes
     digest: fbafc7ae564c13a0eab7062667759f6e93595c97125731a27e8290574e1d570c
     home: https://github.com/kedacore/keda
@@ -184,7 +204,7 @@ entries:
     version: 2.0.0-beta1.2
   - apiVersion: v1
     appVersion: 2.0.0-beta
-    created: "2021-02-26T18:18:14.169796+01:00"
+    created: "2021-03-15T11:00:18.7214951+02:00"
     description: Event-based autoscaler for workloads on Kubernetes
     digest: db9e7d2423423463285f2e9d5b940a63b41d6555ba9fcab8fda0e6a757ccefa9
     home: https://github.com/kedacore/keda
@@ -204,7 +224,7 @@ entries:
     version: 2.0.0-beta1.1
   - apiVersion: v1
     appVersion: 2.0.0-beta
-    created: "2021-02-26T18:18:14.166384+01:00"
+    created: "2021-03-15T11:00:18.7044486+02:00"
     description: Event-based autoscaler for workloads on Kubernetes
     digest: f0a8f0b854246ee2258ec8f10528f2811681ad2e41946dc455586f1ba9818e01
     home: https://github.com/kedacore/keda
@@ -224,7 +244,7 @@ entries:
     version: 2.0.0-beta
   - apiVersion: v1
     appVersion: 1.5.0
-    created: "2021-02-26T18:18:14.163273+01:00"
+    created: "2021-03-15T11:00:18.6928857+02:00"
     description: Event-based autoscaler for workloads on Kubernetes
     digest: 07b15ddae4f1c40747de063100a668ac15d504cd0548eac0e1a04381fcaa3b37
     home: https://github.com/kedacore/keda
@@ -244,7 +264,7 @@ entries:
     version: 1.5.0
   - apiVersion: v1
     appVersion: 1.4.1
-    created: "2021-02-26T18:18:14.160734+01:00"
+    created: "2021-03-15T11:00:18.6790014+02:00"
     description: Event-based autoscaler for workloads on Kubernetes
     digest: f8bf80186ac3343998021a1721d06a67fdacd1dab92e4a4992620903b52004a4
     home: https://github.com/kedacore/keda
@@ -264,7 +284,7 @@ entries:
     version: 1.4.2
   - apiVersion: v1
     appVersion: 1.4.1
-    created: "2021-02-26T18:18:14.157788+01:00"
+    created: "2021-03-15T11:00:18.6678083+02:00"
     description: Event-based autoscaler for workloads on Kubernetes
     digest: 97a2e5c0beff93bb71ff861da0f29d09dcf988e724784f8b7c56ac9872c37a81
     home: https://github.com/kedacore/keda
@@ -280,7 +300,7 @@ entries:
     version: 1.4.1
   - apiVersion: v1
     appVersion: 1.4.0
-    created: "2021-02-26T18:18:14.155203+01:00"
+    created: "2021-03-15T11:00:18.6526423+02:00"
     description: Event-based autoscaler for workloads on Kubernetes
     digest: 7b2b4e29f867361af87a60411b0a196416b04b2e20f4091d166263ea5195c355
     home: https://github.com/kedacore/keda
@@ -296,7 +316,7 @@ entries:
     version: 1.4.0
   - apiVersion: v1
     appVersion: 1.4.0
-    created: "2021-02-26T18:18:14.152305+01:00"
+    created: "2021-03-15T11:00:18.6414874+02:00"
     description: Event-based autoscaler for workloads on Kubernetes
     digest: a9e78b6cb2257702296d7cc28ca7acdd0b11603aef7e95dbdc7d4ddfa3f3a49c
     home: https://github.com/kedacore/keda
@@ -312,7 +332,7 @@ entries:
     version: 1.3.2
   - apiVersion: v1
     appVersion: 1.3.0
-    created: "2021-02-26T18:18:14.149858+01:00"
+    created: "2021-03-15T11:00:18.626402+02:00"
     description: Event-based autoscaler for workloads on Kubernetes
     digest: e13bcb65816ed59b10b32fa6db8f61668635459d56c2d599bb3c0bcc5dcc1368
     home: https://github.com/kedacore/keda
@@ -328,7 +348,7 @@ entries:
     version: 1.3.1
   - apiVersion: v1
     appVersion: 1.3.0
-    created: "2021-02-26T18:18:14.146604+01:00"
+    created: "2021-03-15T11:00:18.6156923+02:00"
     description: Event based autoscaler for Azure Functions deployments on Kubernetes
     digest: c0772458ab70bf3f019dc0b899ff444b9d7e6dcc466afd62e3f62e90eb8a24ed
     home: https://github.com/kedacore/keda
@@ -344,7 +364,7 @@ entries:
     version: 1.3.0
   - apiVersion: v1
     appVersion: 1.2.0
-    created: "2021-02-26T18:18:14.144091+01:00"
+    created: "2021-03-15T11:00:18.6001229+02:00"
     description: Event based autoscaler for Azure Functions deployments on Kubernetes
     digest: e041dbed2455fef34f2908594a42fc8a7f163a1f48be46c2f93dea46e36fc733
     home: https://github.com/kedacore/keda
@@ -360,7 +380,7 @@ entries:
     version: 1.2.0
   - apiVersion: v1
     appVersion: 1.1.0
-    created: "2021-02-26T18:18:14.140988+01:00"
+    created: "2021-03-15T11:00:18.5889125+02:00"
     description: Event based autoscaler for Azure Functions deployments on Kubernetes
     digest: c624e6620a9a6f265f51a82ee0d8267dcb2637dd3777306afbb271746234ff2d
     home: https://github.com/kedacore/keda
@@ -376,7 +396,7 @@ entries:
     version: 1.1.0
   - apiVersion: v1
     appVersion: 1.0.0
-    created: "2021-02-26T18:18:14.138038+01:00"
+    created: "2021-03-15T11:00:18.5771233+02:00"
     description: Event based autoscaler for Azure Functions deployments on Kubernetes
     digest: ef934588dce70d874ea69692e082b8a70ad19095090b8d4fa7b5cb69b2cecaf6
     home: https://github.com/kedacore/keda
@@ -390,4 +410,4 @@ entries:
     urls:
     - https://kedacore.github.io/charts/keda-1.0.0.tgz
     version: 1.0.0
-generated: "2021-02-26T18:18:14.134629+01:00"
+generated: "2021-03-15T11:00:18.5660062+02:00"
diff --git a/docs/keda-2.1.3.tgz b/docs/keda-2.1.3.tgz
diff --git a/keda/Chart.yaml b/keda/Chart.yaml
@@ -4,7 +4,7 @@ description: Event-based autoscaler for workloads on Kubernetes
 
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
-version: 2.1.2
+version: 2.1.3
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application.

diff --git a/keda/README.md b/keda/README.md
@@ -64,8 +64,10 @@ their default values.
 | `operator.name`                                            | Name of the KEDA operator | `keda-operator` |
 | `imagePullSecrets`                                         | Name of secret to use to pull images to use to pull Docker images | `[]` |
 | `additionalLabels`                                         | Additional labels to apply to KEDA workloads | `` |
-| `podAnnotations.keda`                                      | Pod annotations for KEDA operator | `` |
-| `podAnnotations.metricsAdapter`                            | Pod annotations for KEDA Metrics Adapter | `` |
+| `podAnnotations.keda`                                      | Pod annotations for KEDA operator | `{}` |
+| `podAnnotations.metricsAdapter`                            | Pod annotations for KEDA Metrics Adapter | `{}` |
+| `podLabels.keda`                                           | Pod labels for KEDA operator | `{}` |
+| `podLabels.metricsAdapter`                                 | Pod labels for KEDA Metrics Adapter | `{}` |
 | `podDisruptionBudget`                                      | Capability to configure [Pod Disruption Budget](https://kubernetes.io/docs/tasks/run-application/configure-pdb/)       | `{}` |
 | `rbac.create`                                              | Specifies whether RBAC should be used | `true`                                        |
 | `serviceAccount.create`                                    | Specifies whether a service account should be created       | `true`                                        |

diff --git a/keda/templates/12-keda-deployment.yaml b/keda/templates/12-keda-deployment.yaml
@@ -25,6 +25,9 @@ spec:
         {{- if .Values.podIdentity.activeDirectory.identity }}
         aadpodidbinding: {{ .Values.podIdentity.activeDirectory.identity }}
         {{- end }}
+        {{- if .Values.podLabels.keda }}
+        {{- toYaml .Values.podLabels.keda | nindent 8}}
+        {{- end }}
       {{- if .Values.podAnnotations.keda }}
       annotations:
       {{- toYaml .Values.podAnnotations.keda | nindent 8}}

diff --git a/keda/templates/22-metrics-deployment.yaml b/keda/templates/22-metrics-deployment.yaml
@@ -22,6 +22,9 @@ spec:
         {{- if .Values.podIdentity.activeDirectory.identity }}
         aadpodidbinding: {{ .Values.podIdentity.activeDirectory.identity }}
         {{- end }}
+        {{- if .Values.podLabels.metricsAdapter }}
+        {{- toYaml .Values.podLabels.metricsAdapter | nindent 8}}
+        {{- end }}
       annotations:
       {{- if .Values.prometheus.metricServer.enabled }}
         prometheus.io/scrape: "true"
@@ -70,10 +73,10 @@ spec:
           - /usr/local/bin/keda-adapter
           - --secure-port={{ .Values.service.portHttpsTarget }}
           - --logtostderr=true
-          {{ if .Values.prometheus.metricServer.enabled }}
+          {{- if .Values.prometheus.metricServer.enabled }}
           - --metrics-port={{ .Values.prometheus.metricServer.port }}
           - --metrics-path={{ .Values.prometheus.metricServer.path }}
-          {{ end }}
+          {{- end }}
           - --v={{ .Values.logging.metricServer.level }}
           ports:
             - containerPort: {{ .Values.service.portHttpsTarget }}
@@ -82,11 +85,11 @@ spec:
             - containerPort: {{ .Values.service.portHttpTarget }}
               name: http
               protocol: TCP
-            {{ if .Values.prometheus.metricServer.enabled }}
+            {{- if .Values.prometheus.metricServer.enabled }}
             - containerPort: {{ .Values.prometheus.metricServer.port }}
               name: metrics
               protocol: TCP
-            {{ end }}
+            {{- end }}
           volumeMounts:
           {{- if .Values.grpcTLSCertsSecret }}
           - name: grpc-certs

diff --git a/keda/values.yaml b/keda/values.yaml
@@ -23,6 +23,9 @@ additionalLabels: ""
 podAnnotations:
   keda: {}
   metricsAdapter: {}
+podLabels:
+  keda: {}
+  metricsAdapter: {}
 
 ## See `kubectl explain poddisruptionbudget.spec` for more
 ## ref: https://kubernetes.io/docs/tasks/run-application/configure-pdb/