feat(helm): allow for adding extra labels to pods (#19474)

* feat(helm): allow for adding extra labels to pods Signed-off-by: David van der Spek <vanderspek.david@gmail.com> * update main chart Signed-off-by: David van der Spek <vanderspek.david@gmail.com> Signed-off-by: David van der Spek <vanderspek.david@gmail.com>
airbytehq · Dec 15, 2022 · 9cc3005 · 9cc3005
1 parent 69bc4a3
commit 9cc3005
Show file tree

Hide file tree

Showing 19 changed files with 117 additions and 2 deletions.
diff --git a/charts/airbyte-bootloader/templates/pod.yaml b/charts/airbyte-bootloader/templates/pod.yaml
@@ -5,6 +5,9 @@ metadata:
   name: {{ include "common.names.fullname" . }}
   labels:
     {{- include "airbyte.labels" . | nindent 4 }}
+    {{- if .Values.podLabels }}
+      {{- include "common.tplvalues.render" (dict "value" .Values.podLabels "context" $) | nindent 4 }}
+    {{- end }}
   annotations:
     helm.sh/hook: pre-install,pre-upgrade
     helm.sh/hook-weight: "0"

diff --git a/charts/airbyte-bootloader/values.yaml b/charts/airbyte-bootloader/values.yaml
@@ -31,6 +31,10 @@ image:
 ##
 podAnnotations: {}
 
+##  podLabels [object] Add extra labels to the bootloader pod
+##
+podLabels: {}
+
 ##  containerSecurityContext Security context for the container
 ## Examples:
 ## containerSecurityContext:

diff --git a/charts/airbyte-cron/Chart.yaml b/charts/airbyte-cron/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # 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.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.0
+version: 0.1.1
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
@@ -29,4 +29,3 @@ dependencies:
     tags:
       - bitnami-common
     version: 1.x.x
-
diff --git a/charts/airbyte-cron/templates/deployment.yaml b/charts/airbyte-cron/templates/deployment.yaml
@@ -13,6 +13,9 @@ spec:
     metadata:
       labels:
         {{- include "airbyte.selectorLabels" . | nindent 8 }}
+        {{- if .Values.podLabels }}
+          {{- include "common.tplvalues.render" (dict "value" .Values.podLabels "context" $) | nindent 8 }}
+        {{- end }}
       {{- if .Values.podAnnotations }}
       annotations:
         {{- include "common.tplvalues.render" (dict "value" .Values.podAnnotations "context" $) | nindent 8 }}

diff --git a/charts/airbyte-cron/values.yaml b/charts/airbyte-cron/values.yaml
@@ -26,6 +26,10 @@ image:
 ##
 podAnnotations: {}
 
+##  cron.podLabels [object] Add extra labels to the cron pod(s)
+##
+podLabels: {}
+
 ## cron.containerSecurityContext Security context for the container
 ## Examples:
 ## containerSecurityContext:

diff --git a/charts/airbyte-metrics/templates/deployment.yaml b/charts/airbyte-metrics/templates/deployment.yaml
@@ -21,6 +21,9 @@ spec:
     metadata:
       labels:
         airbyte: metrics
+        {{- if .Values.podLabels }}
+          {{- include "common.tplvalues.render" (dict "value" .Values.podLabels "context" $) | nindent 8 }}
+        {{- end }}
       {{- if .Values.podAnnotations }}
       annotations:
         {{- include "common.tplvalues.render" (dict "value" .Values.podAnnotations "context" $) | nindent 8 }}

diff --git a/charts/airbyte-metrics/values.yaml b/charts/airbyte-metrics/values.yaml
@@ -24,6 +24,10 @@ image:
 ##
 podAnnotations: {}
 
+##  metrics.podLabels [object] Add extra labels to the metrics-reporter pod
+##
+podLabels: {}
+
 ##  metrics.containerSecurityContext Security context for the container
 ## Examples:
 ## containerSecurityContext:

diff --git a/charts/airbyte-pod-sweeper/templates/deployment.yaml b/charts/airbyte-pod-sweeper/templates/deployment.yaml
@@ -14,6 +14,9 @@ spec:
     metadata:
       labels:
         {{- include "airbyte.selectorLabels" . | nindent 8 }}
+        {{- if .Values.podLabels }}
+          {{- include "common.tplvalues.render" (dict "value" .Values.podLabels "context" $) | nindent 8 }}
+        {{- end }}
       annotations:
         checksum/sweep-pod-script: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
       {{- if .Values.podAnnotations }}

diff --git a/charts/airbyte-pod-sweeper/values.yaml b/charts/airbyte-pod-sweeper/values.yaml
@@ -123,6 +123,10 @@ image:
 ##
 podAnnotations: {}
 
+##  podSweeper.podLabels [object] Add extra labels to the podSweeper pod
+##
+podLabels: {}
+
 ##  podSweeper.containerSecurityContext Security context for the container
 ## Examples:
 ## containerSecurityContext:

diff --git a/charts/airbyte-server/templates/deployment.yaml b/charts/airbyte-server/templates/deployment.yaml
@@ -16,6 +16,9 @@ spec:
     metadata:
       labels:
         {{- include "airbyte.selectorLabels" . | nindent 8 }}
+        {{- if .Values.podLabels }}
+          {{- include "common.tplvalues.render" (dict "value" .Values.podLabels "context" $) | nindent 8 }}
+        {{- end }}
       {{- if .Values.podAnnotations }}
       annotations:
         {{- include "common.tplvalues.render" (dict "value" .Values.podAnnotations "context" $) | nindent 8 }}

diff --git a/charts/airbyte-server/values.yaml b/charts/airbyte-server/values.yaml
@@ -74,6 +74,10 @@ image:
 ##
 podAnnotations: {}
 
+##  podLabels [object] Add extra labels to the server pod
+##
+podLabels: {}
+
 ##  containerSecurityContext Security context for the container
 ## Examples:
 ## containerSecurityContext:

diff --git a/charts/airbyte-temporal/templates/deployment.yaml b/charts/airbyte-temporal/templates/deployment.yaml
@@ -14,6 +14,9 @@ spec:
     metadata:
       labels:
         {{- include "airbyte.selectorLabels" . | nindent 8 }}
+        {{- if .Values.podLabels }}
+          {{- include "common.tplvalues.render" (dict "value" .Values.podLabels "context" $) | nindent 8 }}
+        {{- end }}
       {{- if .Values.podAnnotations }}
       annotations:
         {{- include "common.tplvalues.render" (dict "value" .Values.podAnnotations "context" $) | nindent 8 }}

diff --git a/charts/airbyte-temporal/values.yaml b/charts/airbyte-temporal/values.yaml
@@ -32,6 +32,10 @@ service:
 ##
 podAnnotations: {}
 
+##  temporal.podLabels [object] Add extra labels to the temporal pod
+##
+podLabels: {}
+
 ##  temporal.containerSecurityContext Security context for the container
 ## Examples:
 ## containerSecurityContext:

diff --git a/charts/airbyte-webapp/templates/deployment.yaml b/charts/airbyte-webapp/templates/deployment.yaml
@@ -14,6 +14,9 @@ spec:
     metadata:
       labels:
         {{- include "airbyte.selectorLabels" . | nindent 8 }}
+        {{- if .Values.podLabels }}
+          {{- include "common.tplvalues.render" (dict "value" .Values.podLabels "context" $) | nindent 8 }}
+        {{- end }}
       {{- if .Values.podAnnotations }}
       annotations:
         {{- include "common.tplvalues.render" (dict "value" .Values.podAnnotations "context" $) | nindent 8 }}

diff --git a/charts/airbyte-webapp/values.yaml b/charts/airbyte-webapp/values.yaml
@@ -25,6 +25,10 @@ image:
 ##
 podAnnotations: {}
 
+##  webapp.podLabels [object] Add extra labels to the webapp pod(s)
+##
+podLabels: {}
+
 ##  webapp.containerSecurityContext Security context for the container
 ## Examples:
 ## containerSecurityContext:

diff --git a/charts/airbyte-worker/templates/deployment.yaml b/charts/airbyte-worker/templates/deployment.yaml
@@ -14,6 +14,9 @@ spec:
     metadata:
       labels:
         {{- include "airbyte.selectorLabels" . | nindent 8 }}
+        {{- if .Values.podLabels }}
+          {{- include "common.tplvalues.render" (dict "value" .Values.podLabels "context" $) | nindent 8 }}
+        {{- end }}
       {{- if .Values.podAnnotations }}
       annotations:
         {{- include "common.tplvalues.render" (dict "value" .Values.podAnnotations "context" $) | nindent 8 }}

diff --git a/charts/airbyte-worker/values.yaml b/charts/airbyte-worker/values.yaml
@@ -119,6 +119,10 @@ image:
 ##
 podAnnotations: {}
 
+##  worker.podLabels [object] Add extra labels to the worker pod(s)
+##
+podLabels: {}
+
 ##  worker.containerSecurityContext Security context for the container
 ## Examples:
 ## containerSecurityContext:

diff --git a/charts/airbyte/values.yaml b/charts/airbyte/values.yaml
@@ -172,6 +172,10 @@ webapp:
   ##
   podAnnotations: {}
 
+  ##  webapp.podLabels [object] Add extra labels to the webapp pod(s)
+  ##
+  podLabels: {}
+
   ##  webapp.containerSecurityContext Security context for the container
   ## Examples:
   ## containerSecurityContext:
@@ -397,6 +401,10 @@ pod-sweeper:
   ##
   podAnnotations: {}
 
+  ##  podSweeper.podLabels [object] Add extra labels to the podSweeper pod
+  ##
+  podLabels: {}
+
   ##  podSweeper.containerSecurityContext Security context for the container
   ## Examples:
   ## containerSecurityContext:
@@ -506,6 +514,10 @@ server:
   ##
   podAnnotations: {}
 
+  ##  server.podLabels [object] Add extra labels to the server pod(s)
+  ##
+  podLabels: {}
+
   ##  server.containerSecurityContext Security context for the container
   ## Examples:
   ## containerSecurityContext:
@@ -688,6 +700,10 @@ worker:
   ##
   podAnnotations: {}
 
+  ##  worker.podLabels [object] Add extra labels to the worker pod(s)
+  ##
+  podLabels: {}
+
   ##  worker.containerSecurityContext Security context for the container
   ## Examples:
   ## containerSecurityContext:
@@ -821,6 +837,10 @@ metrics:
   ##
   podAnnotations: {}
 
+  ##  metrics.podLabels [object] Add extra labels to the metrics-reporter pod
+  ##
+  podLabels: {}
+
   ##  metrics.containerSecurityContext Security context for the container
   ## Examples:
   ## containerSecurityContext:
@@ -909,6 +929,10 @@ airbyte-bootloader:
   ##
   podAnnotations: {}
 
+  ##  podLabels [object] Add extra labels to the bootloader pod
+  ##
+  podLabels: {}
+
   ##  nodeSelector [object] Node labels for pod assignment
   ## Ref: https://kubernetes.io/docs/user-guide/node-selection/
   ##
@@ -1059,6 +1083,10 @@ temporal:
   ##
   podAnnotations: {}
 
+  ##  temporal.podLabels [object] Add extra labels to the temporal pod
+  ##
+  podLabels: {}
+
   ##  temporal.containerSecurityContext Security context for the container
   ## Examples:
   ## containerSecurityContext:
@@ -1244,6 +1272,10 @@ cron:
   ##
   podAnnotations: {}
 
+  ##  cron.podLabels [object] Add extra labels to the cron pod(s)
+  ##
+  podLabels: {}
+
   ##  cron.containerSecurityContext Security context for the container
   ## Examples:
   ## containerSecurityContext:

diff --git a/charts/airbyte/values.yaml.test b/charts/airbyte/values.yaml.test
@@ -174,6 +174,10 @@ webapp:
   ##
   podAnnotations: {}
 
+  ##  webapp.podLabels [object] Add extra labels to the webapp pod(s)
+  ##
+  podLabels: {}
+
   ##  webapp.containerSecurityContext Security context for the container
   ## Examples:
   ## containerSecurityContext:
@@ -394,6 +398,10 @@ pod-sweeper:
   ##
   podAnnotations: {}
 
+  ##  podSweeper.podLabels [object] Add extra labels to the podSweeper pod
+  ##
+  podLabels: {}
+
   ##  podSweeper.containerSecurityContext Security context for the container
   ## Examples:
   ## containerSecurityContext:
@@ -503,6 +511,10 @@ server:
   ##
   podAnnotations: {}
 
+  ##  server.podLabels [object] Add extra labels to the server pod(s)
+  ##
+  podLabels: {}
+
   ##  server.containerSecurityContext Security context for the container
   ## Examples:
   ## containerSecurityContext:
@@ -676,6 +688,10 @@ worker:
   ##
   podAnnotations: {}
 
+  ##  worker.podLabels [object] Add extra labels to the worker pod(s)
+  ##
+  podLabels: {}
+
   ##  worker.containerSecurityContext Security context for the container
   ## Examples:
   ## containerSecurityContext:
@@ -809,6 +825,10 @@ metrics:
   ##
   podAnnotations: {}
 
+  ##  metrics.podLabels [object] Add extra labels to the metrics-reporter pod
+  ##
+  podLabels: {}
+
   ##  metrics.containerSecurityContext Security context for the container
   ## Examples:
   ## containerSecurityContext:
@@ -897,6 +917,10 @@ airbyte-bootloader:
   ##
   podAnnotations: {}
 
+  ##  podLabels [object] Add extra labels to the bootloader pod
+  ##
+  podLabels: {}
+
   ##  nodeSelector [object] Node labels for pod assignment
   ## Ref: https://kubernetes.io/docs/user-guide/node-selection/
   ##
@@ -1047,6 +1071,10 @@ temporal:
   ##
   podAnnotations: {}
 
+  ##  temporal.podLabels [object] Add extra labels to the temporal pod
+  ##
+  podLabels: {}
+
   ##  temporal.containerSecurityContext Security context for the container
   ## Examples:
   ## containerSecurityContext: