Add feature to specify own selector and regular labels in deployment (#…

…20883) * Add feature to specify own selector and regular labels in deployment * Add extraSelector and extraLabels to global values
airbytehq · Dec 27, 2022 · c3c5a41 · c3c5a41
1 parent 2da903c
commit c3c5a41
Show file tree

Hide file tree

Showing 12 changed files with 114 additions and 0 deletions.
diff --git a/charts/airbyte-bootloader/templates/_helpers.tpl b/charts/airbyte-bootloader/templates/_helpers.tpl
@@ -40,6 +40,11 @@ helm.sh/chart: {{ include "airbyte.chart" . }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- if .Values.extraLabels}}
+{{- with mergeOverwrite .Values.extraLabels .Values.global.extraLabels }}
+{{ toYaml .}}
+{{- end }}
+{{- end }}
 {{- end }}
 
 {{/*
@@ -48,6 +53,11 @@ Selector labels
 {{- define "airbyte.selectorLabels" -}}
 app.kubernetes.io/name: {{ include "airbyte.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
+{{- if .Values.extraSelectorLabels}}
+{{- with mergeOverwrite .Values.extraSelectorLabels .Values.global.extraSelectorLabels }}
+{{ toYaml .}}
+{{- end }}
+{{- end }}
 {{- end }}
 
 {{/*

diff --git a/charts/airbyte-bootloader/values.yaml b/charts/airbyte-bootloader/values.yaml
@@ -17,6 +17,10 @@ global:
   secrets: {}
   env_vars: {}
   extraContainers: []
+  ## extraSelectorLables [object] - use to specify own additional selector labels for deployment
+  extraSelectorLabels: {}
+  ## extraLabels [object] - use to specify own additional labels for deployment
+  extraLabels: {}
 
 
 enabled: true
@@ -174,3 +178,8 @@ extraVolumes: []
 #   DATABASE_PASSWORD: 12345
 #   DATABASE_USER: airbyte
 env_vars: {}
+
+## extraSelectorLables [object] - use to specify own additional selector labels for deployment
+extraSelectorLabels: {}
+## extraLabels [object] - use to specify own additional labels for deployment
+extraLabels: {}
diff --git a/charts/airbyte-cron/templates/_helpers.tpl b/charts/airbyte-cron/templates/_helpers.tpl
@@ -40,6 +40,11 @@ helm.sh/chart: {{ include "airbyte.chart" . }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- if .Values.extraLabels}}
+{{- with mergeOverwrite .Values.extraLabels .Values.global.extraLabels }}
+{{ toYaml .}}
+{{- end }}
+{{- end }}
 {{- end }}
 
 {{/*
@@ -48,6 +53,11 @@ Selector labels
 {{- define "airbyte.selectorLabels" -}}
 app.kubernetes.io/name: {{ include "airbyte.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
+{{- if .Values.extraSelectorLabels}}
+{{- with mergeOverwrite .Values.extraSelectorLabels .Values.global.extraSelectorLabels }}
+{{ toYaml .}}
+{{- end }}
+{{- end }}
 {{- end }}
 
 {{/*

diff --git a/charts/airbyte-cron/values.yaml b/charts/airbyte-cron/values.yaml
@@ -4,6 +4,10 @@ global:
   configMapName: ""
   secretName: ""
   extraContainers: []
+  ## extraSelectorLables [object] - use to specify own additional selector labels for deployment
+  extraSelectorLabels: {}
+  ## extraLabels [object] - use to specify own additional labels for deployment
+  extraLabels: {}
   database:
     secretName: ""
     secretValue: ""
@@ -212,3 +216,8 @@ env_vars: {}
 
 
 
+
+## extraSelectorLables [object] - use to specify own additional selector labels for deployment
+extraSelectorLabels: {}
+## extraLabels [object] - use to specify own additional labels for deployment
+extraLabels: {}
diff --git a/charts/airbyte-server/templates/_helpers.tpl b/charts/airbyte-server/templates/_helpers.tpl
@@ -40,6 +40,11 @@ helm.sh/chart: {{ include "airbyte.chart" . }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- if .Values.extraLabels}}
+{{- with mergeOverwrite .Values.extraLabels .Values.global.extraLabels }}
+{{ toYaml .}}
+{{- end }}
+{{- end }}
 {{- end }}
 
 {{/*
@@ -48,6 +53,11 @@ Selector labels
 {{- define "airbyte.selectorLabels" -}}
 app.kubernetes.io/name: {{ include "airbyte.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
+{{- if .Values.extraSelectorLabels}}
+{{- with mergeOverwrite .Values.extraSelectorLabels .Values.global.extraSelectorLabels }}
+{{ toYaml .}}
+{{- end }}
+{{- end }}
 {{- end }}
 
 {{/*

diff --git a/charts/airbyte-server/values.yaml b/charts/airbyte-server/values.yaml
@@ -6,6 +6,10 @@ global:
   secretName: ""
   credVolumeOverride: ""
   extraContainers: []
+  ## extraSelectorLables [object] - use to specify own additional selector labels for deployment
+  extraSelectorLabels: {}
+  ## extraLabels [object] - use to specify own additional labels for deployment
+  extraLabels: {}
   database:
     secretName: ""
     secretValue: ""
@@ -404,3 +408,8 @@ secrets: {}
 #   USE_STREAM_CAPABLE_STATE: true
 env_vars: {}
 
+
+## extraSelectorLables [object] - use to specify own additional selector labels for deployment
+extraSelectorLabels: {}
+## extraLabels [object] - use to specify own additional labels for deployment
+extraLabels: {}
diff --git a/charts/airbyte-temporal/templates/_helpers.tpl b/charts/airbyte-temporal/templates/_helpers.tpl
@@ -40,6 +40,11 @@ helm.sh/chart: {{ include "airbyte.chart" . }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- if .Values.extraLabels}}
+{{- with mergeOverwrite .Values.extraLabels .Values.global.extraLabels }}
+{{ toYaml .}}
+{{- end }}
+{{- end }}
 {{- end }}
 
 {{/*
@@ -48,6 +53,11 @@ Selector labels
 {{- define "airbyte.selectorLabels" -}}
 app.kubernetes.io/name: {{ include "airbyte.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
+{{- if .Values.extraSelectorLabels}}
+{{- with mergeOverwrite .Values.extraSelectorLabels .Values.global.extraSelectorLabels }}
+{{ toYaml .}}
+{{- end }}
+{{- end }}
 {{- end }}
 
 {{/*

diff --git a/charts/airbyte-temporal/values.yaml b/charts/airbyte-temporal/values.yaml
@@ -4,6 +4,10 @@ global:
   configMapName: ""
   secretName: ""
   extraContainers: []
+  ## extraSelectorLables [object] - use to specify own additional selector labels for deployment
+  extraSelectorLabels: {}
+  ## extraLabels [object] - use to specify own additional labels for deployment
+  extraLabels: {}
   database:
     secretName: ""
     secretValue: ""
@@ -175,3 +179,8 @@ secrets: {}
 #   POSTGRES_PWD: 12345
 
 env_vars: {}
+
+## extraSelectorLables [object] - use to specify own additional selector labels for deployment
+extraSelectorLabels: {}
+## extraLabels [object] - use to specify own additional labels for deployment
+extraLabels: {}
diff --git a/charts/airbyte-webapp/templates/_helpers.tpl b/charts/airbyte-webapp/templates/_helpers.tpl
@@ -40,6 +40,11 @@ helm.sh/chart: {{ include "airbyte.chart" . }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- if .Values.extraLabels}}
+{{- with mergeOverwrite .Values.extraLabels .Values.global.extraLabels }}
+{{ toYaml .}}
+{{- end }}
+{{- end }}
 {{- end }}
 
 {{/*
@@ -48,6 +53,11 @@ Selector labels
 {{- define "airbyte.selectorLabels" -}}
 app.kubernetes.io/name: {{ include "airbyte.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
+{{- if .Values.extraSelectorLabels}}
+{{- with mergeOverwrite .Values.extraSelectorLabels .Values.global.extraSelectorLabels }}
+{{ toYaml .}}
+{{- end }}
+{{- end }}
 {{- end }}
 
 

diff --git a/charts/airbyte-webapp/values.yaml b/charts/airbyte-webapp/values.yaml
@@ -4,6 +4,10 @@ global:
   configMapName: ""
   secretName: ""
   extraContainers: []
+  ## extraSelectorLables [object] - use to specify own additional selector labels for deployment
+  extraSelectorLabels: {}
+  ## extraLabels [object] - use to specify own additional labels for deployment
+  extraLabels: {}
   database:
     secretName: ""
     secretValue: ""
@@ -244,3 +248,8 @@ env_vars: {}
 
 
 
+
+## extraSelectorLables [object] - use to specify own additional selector labels for deployment
+extraSelectorLabels: {}
+## extraLabels [object] - use to specify own additional labels for deployment
+extraLabels: {}
diff --git a/charts/airbyte-worker/templates/_helpers.tpl b/charts/airbyte-worker/templates/_helpers.tpl
@@ -40,6 +40,11 @@ helm.sh/chart: {{ include "airbyte.chart" . }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- if .Values.extraLabels}}
+{{- with mergeOverwrite .Values.extraLabels .Values.global.extraLabels }}
+{{ toYaml .}}
+{{- end }}
+{{- end }}
 {{- end }}
 
 {{/*
@@ -48,6 +53,11 @@ Selector labels
 {{- define "airbyte.selectorLabels" -}}
 app.kubernetes.io/name: {{ include "airbyte.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
+{{- if .Values.extraSelectorLabels}}
+{{- with mergeOverwrite .Values.extraSelectorLabels .Values.global.extraSelectorLabels }}
+{{ toYaml .}}
+{{- end }}
+{{- end }}
 {{- end }}
 
 {{/*

diff --git a/charts/airbyte-worker/values.yaml b/charts/airbyte-worker/values.yaml
@@ -4,6 +4,10 @@ global:
   credVolumeOverride: ""
   secretName: ""
   extraContainers: []
+  ## extraSelectorLables [object] - use to specify own additional selector labels for deployment
+  extraSelectorLabels: {}
+  ## extraLabels [object] - use to specify own additional labels for deployment
+  extraLabels: {}
   database:
     secretName: ""
     secretValue: ""
@@ -367,3 +371,8 @@ secrets: {}
 #   USE_STREAM_CAPABLE_STATE: true
 
 env_vars: {}
+
+## extraSelectorLables [object] - use to specify own additional selector labels for deployment
+extraSelectorLabels: {}
+## extraLabels [object] - use to specify own additional labels for deployment
+extraLabels: {}