From e562f57330647ed53bf3deb4b91bbfc0d33d49e9 Mon Sep 17 00:00:00 2001 From: Kyryl Skobylko Date: Thu, 25 Aug 2022 12:14:28 +0300 Subject: [PATCH 1/7] fix: revert extraEnv. Move updated extraEnv to env_vars --- charts/airbyte-bootloader/templates/pod.yaml | 11 +++++++++-- charts/airbyte-bootloader/values.yaml | 3 ++- charts/airbyte-server/templates/deployment.yaml | 9 +++++++-- charts/airbyte-server/values.yaml | 3 ++- charts/airbyte-webapp/templates/deployment.yaml | 11 +++++++++-- charts/airbyte-webapp/values.yaml | 4 +++- charts/airbyte-worker/templates/deployment.yaml | 9 +++++++-- charts/airbyte-worker/values.yaml | 4 ++-- 8 files changed, 41 insertions(+), 13 deletions(-) diff --git a/charts/airbyte-bootloader/templates/pod.yaml b/charts/airbyte-bootloader/templates/pod.yaml index 3242a4fed634..aefd147e0e3f 100644 --- a/charts/airbyte-bootloader/templates/pod.yaml +++ b/charts/airbyte-bootloader/templates/pod.yaml @@ -83,10 +83,17 @@ spec: {{- end }} # Values from env - {{- if .Values.extraEnv }} - {{- range $k, $v := mergeOverwrite .Values.extraEnv .Values.global.env_vars }} + {{- if .Values.env_vars }} + {{- range $k, $v := mergeOverwrite .Values.env_vars .Values.global.env_vars }} - name: {{ $k }} value: {{ $v | quote }} {{- end }} {{- end }} + + # Values from extraEnv for more compability(if you want to use external secret source or other stuff) + {{- if .Values.extraEnv }} + {{- toYaml .Values.extraEnv | nindent 8 }} + {{- end }} + + resources: {{- toYaml .Values.resources | nindent 8 }} diff --git a/charts/airbyte-bootloader/values.yaml b/charts/airbyte-bootloader/values.yaml index 432691409acc..7c49f73c7037 100644 --- a/charts/airbyte-bootloader/values.yaml +++ b/charts/airbyte-bootloader/values.yaml @@ -63,7 +63,8 @@ resources: ## ref: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity ## affinity: {} -extraEnv: {} +extraEnv: [] secrets: {} +env_vars: {} diff --git a/charts/airbyte-server/templates/deployment.yaml b/charts/airbyte-server/templates/deployment.yaml index a8a292957fe2..c91cdf0bd0bd 100644 --- a/charts/airbyte-server/templates/deployment.yaml +++ b/charts/airbyte-server/templates/deployment.yaml @@ -197,12 +197,17 @@ spec: {{- end }} # Values from env - {{- if .Values.extraEnv }} - {{- range $k, $v := mergeOverwrite .Values.extraEnv .Values.global.env_vars }} + {{- if .Values.env_vars }} + {{- range $k, $v := mergeOverwrite .Values.env_vars .Values.global.env_vars }} - name: {{ $k }} value: {{ $v | quote }} {{- end }} {{- end }} + + # Values from extraEnv for more compability(if you want to use external secret source or other stuff) + {{- if .Values.extraEnv }} + {{- toYaml .Values.extraEnv | nindent 8 }} + {{- end }} {{- if .Values.livenessProbe.enabled }} livenessProbe: diff --git a/charts/airbyte-server/values.yaml b/charts/airbyte-server/values.yaml index d51974fd2461..e16b59c3efa5 100644 --- a/charts/airbyte-server/values.yaml +++ b/charts/airbyte-server/values.yaml @@ -165,7 +165,7 @@ log: ## extraEnv: ## - name: SAMPLE_ENV_VAR ## value: "key=sample-value" -extraEnv: {} +extraEnv: [] ## @param server.extraVolumeMounts [array] Additional volumeMounts for server container(s). ## Examples (when using `server.containerSecurityContext.readOnlyRootFilesystem=true`): @@ -188,3 +188,4 @@ extraContainers: [] extraInitContainers: [] secrets: {} +env_vars: {} \ No newline at end of file diff --git a/charts/airbyte-webapp/templates/deployment.yaml b/charts/airbyte-webapp/templates/deployment.yaml index 76d5f00e83c9..6e73338c9481 100644 --- a/charts/airbyte-webapp/templates/deployment.yaml +++ b/charts/airbyte-webapp/templates/deployment.yaml @@ -83,12 +83,19 @@ spec: {{- end }} # Values from env - {{- if .Values.extraEnv }} - {{- range $k, $v := mergeOverwrite .Values.extraEnv .Values.global.env_vars }} + {{- if .Values.env_vars }} + {{- range $k, $v := mergeOverwrite .Values.env_vars .Values.global.env_vars }} - name: {{ $k }} value: {{ $v | quote }} {{- end }} {{- end }} + + # Values from extraEnv for more compability(if you want to use external secret source or other stuff) + {{- if .Values.extraEnv }} + {{- toYaml .Values.extraEnv | nindent 8 }} + {{- end }} + + {{- if .Values.livenessProbe.enabled }} livenessProbe: tcpSocket: diff --git a/charts/airbyte-webapp/values.yaml b/charts/airbyte-webapp/values.yaml index d6302097fd3b..91154ad4d0e2 100644 --- a/charts/airbyte-webapp/values.yaml +++ b/charts/airbyte-webapp/values.yaml @@ -146,7 +146,7 @@ fullstory: ## extraEnv: ## - name: SAMPLE_ENV_VAR ## value: "key=sample-value" -extraEnv: {} +extraEnv: [] ## @param webapp.extraVolumeMounts [array] Additional volumeMounts for webapp container(s). ## Examples (when using `webapp.containerSecurityContext.readOnlyRootFilesystem=true`): @@ -175,3 +175,5 @@ extraVolumes: [] extraContainers: [] secrets: {} + +env_vars: [] \ No newline at end of file diff --git a/charts/airbyte-worker/templates/deployment.yaml b/charts/airbyte-worker/templates/deployment.yaml index 80f00b1918b9..2dad41888c04 100644 --- a/charts/airbyte-worker/templates/deployment.yaml +++ b/charts/airbyte-worker/templates/deployment.yaml @@ -312,13 +312,18 @@ spec: {{- end }} # Values from env - {{- if .Values.extraEnv }} - {{- range $k, $v := mergeOverwrite .Values.extraEnv .Values.global.env_vars }} + {{- if .Values.env_vars }} + {{- range $k, $v := mergeOverwrite .Values.env_vars .Values.global.env_vars }} - name: {{ $k }} value: {{ $v | quote }} {{- end }} {{- end }} + # Values from extraEnv for more compability(if you want to use external secret source or other stuff) + {{- if .Values.extraEnv }} + {{- toYaml .Values.extraEnv | nindent 8 }} + {{- end }} + {{- if .Values.livenessProbe.enabled }} livenessProbe: httpGet: diff --git a/charts/airbyte-worker/values.yaml b/charts/airbyte-worker/values.yaml index 352bc2869253..655a23058e64 100644 --- a/charts/airbyte-worker/values.yaml +++ b/charts/airbyte-worker/values.yaml @@ -204,7 +204,7 @@ log: ## extraEnv: ## - name: JOB_KUBE_TOLERATIONS ## value: "key=airbyte-server,operator=Equals,value=true,effect=NoSchedule" -extraEnv: {} +extraEnv: [] secrets: {} @@ -226,4 +226,4 @@ extraVolumes: [] extraContainers: [] - +env_vars: {} From ffd1a01b06b38a85db580c7542fe327b36eb1fac Mon Sep 17 00:00:00 2001 From: Kyryl Skobylko Date: Thu, 25 Aug 2022 14:44:57 +0300 Subject: [PATCH 2/7] fix: Add node pool selector feature for gke deployments --- charts/airbyte-bootloader/templates/pod.yaml | 5 ++++- charts/airbyte-bootloader/values.yaml | 1 + charts/airbyte-server/templates/deployment.yaml | 7 +++++++ charts/airbyte-server/values.yaml | 4 +++- charts/airbyte-webapp/templates/deployment.yaml | 4 ++++ charts/airbyte-webapp/values.yaml | 4 +++- charts/airbyte-worker/templates/deployment.yaml | 4 ++++ charts/airbyte-worker/values.yaml | 2 ++ 8 files changed, 28 insertions(+), 3 deletions(-) diff --git a/charts/airbyte-bootloader/templates/pod.yaml b/charts/airbyte-bootloader/templates/pod.yaml index aefd147e0e3f..49f58c2f360e 100644 --- a/charts/airbyte-bootloader/templates/pod.yaml +++ b/charts/airbyte-bootloader/templates/pod.yaml @@ -94,6 +94,9 @@ spec: {{- if .Values.extraEnv }} {{- toYaml .Values.extraEnv | nindent 8 }} {{- end }} - + {{- if .Values.gke_node_pool_selector }} + nodeSelector: + cloud.google.com/gke-nodepool: {{ .Values.gke_node_pool_selector }} + {{- end }} resources: {{- toYaml .Values.resources | nindent 8 }} diff --git a/charts/airbyte-bootloader/values.yaml b/charts/airbyte-bootloader/values.yaml index 7c49f73c7037..13aa1c159cbe 100644 --- a/charts/airbyte-bootloader/values.yaml +++ b/charts/airbyte-bootloader/values.yaml @@ -68,3 +68,4 @@ secrets: {} env_vars: {} +gke_node_pool_selector: "" \ No newline at end of file diff --git a/charts/airbyte-server/templates/deployment.yaml b/charts/airbyte-server/templates/deployment.yaml index c91cdf0bd0bd..29afcd377865 100644 --- a/charts/airbyte-server/templates/deployment.yaml +++ b/charts/airbyte-server/templates/deployment.yaml @@ -257,6 +257,13 @@ spec: {{- if .Values.global.extraContainers }} {{ toYaml .Values.global.extraContainers | indent 8 }} {{- end }} + + {{- if .Values.gke_node_pool_selector }} + nodeSelector: + cloud.google.com/gke-nodepool: {{ .Values.gke_node_pool_selector }} + {{- end }} + + volumes: {{- if eq .Values.deploymentMode "oss" }} - name: gcs-log-creds-volume diff --git a/charts/airbyte-server/values.yaml b/charts/airbyte-server/values.yaml index e16b59c3efa5..fe5ea733b288 100644 --- a/charts/airbyte-server/values.yaml +++ b/charts/airbyte-server/values.yaml @@ -188,4 +188,6 @@ extraContainers: [] extraInitContainers: [] secrets: {} -env_vars: {} \ No newline at end of file +env_vars: {} + +gke_node_pool_selector: "" \ No newline at end of file diff --git a/charts/airbyte-webapp/templates/deployment.yaml b/charts/airbyte-webapp/templates/deployment.yaml index 6e73338c9481..6f51596f1f8c 100644 --- a/charts/airbyte-webapp/templates/deployment.yaml +++ b/charts/airbyte-webapp/templates/deployment.yaml @@ -140,6 +140,10 @@ spec: {{- if .Values.global.extraConrainers }} {{ toYaml .Values.global.extraContainers | indent 8 }} {{- end }} + {{- if .Values.gke_node_pool_selector }} + nodeSelector: + cloud.google.com/gke-nodepool: {{ .Values.gke_node_pool_selector }} + {{- end }} volumes: {{- if .Values.extraVolumes }} {{ toYaml .Values.extraVolumes | nindent 6 }} diff --git a/charts/airbyte-webapp/values.yaml b/charts/airbyte-webapp/values.yaml index 91154ad4d0e2..87e8af001fbf 100644 --- a/charts/airbyte-webapp/values.yaml +++ b/charts/airbyte-webapp/values.yaml @@ -176,4 +176,6 @@ extraContainers: [] secrets: {} -env_vars: [] \ No newline at end of file +env_vars: [] + +gke_node_pool_selector: "" \ No newline at end of file diff --git a/charts/airbyte-worker/templates/deployment.yaml b/charts/airbyte-worker/templates/deployment.yaml index 2dad41888c04..5c2a02327bff 100644 --- a/charts/airbyte-worker/templates/deployment.yaml +++ b/charts/airbyte-worker/templates/deployment.yaml @@ -403,6 +403,10 @@ spec: {{- if .Values.global.extraContainers }} {{ toYaml .Values.global.extraContainers | indent 8 }} {{- end }} + {{- if .Values.gke_node_pool_selector }} + nodeSelector: + cloud.google.com/gke-nodepool: {{ .Values.gke_node_pool_selector }} + {{- end }} volumes: {{- if eq .Values.global.deploymentMode "oss" }} - name: gcs-log-creds-volume diff --git a/charts/airbyte-worker/values.yaml b/charts/airbyte-worker/values.yaml index 655a23058e64..5980b352598a 100644 --- a/charts/airbyte-worker/values.yaml +++ b/charts/airbyte-worker/values.yaml @@ -227,3 +227,5 @@ extraVolumes: [] extraContainers: [] env_vars: {} + +gke_node_pool_selector: "" \ No newline at end of file From 08754b2834c3cf89f36f98d398c7e3c9b707a525 Mon Sep 17 00:00:00 2001 From: Kyryl Skobylko Date: Thu, 25 Aug 2022 17:04:51 +0300 Subject: [PATCH 3/7] fix: hotfix. Fix webapp values and imagepullsecrets --- charts/airbyte-bootloader/templates/pod.yaml | 2 -- charts/airbyte-server/templates/deployment.yaml | 2 -- charts/airbyte-webapp/templates/deployment.yaml | 2 -- charts/airbyte-webapp/values.yaml | 2 +- charts/airbyte-worker/templates/deployment.yaml | 2 -- 5 files changed, 1 insertion(+), 9 deletions(-) diff --git a/charts/airbyte-bootloader/templates/pod.yaml b/charts/airbyte-bootloader/templates/pod.yaml index 49f58c2f360e..8555602e2c2f 100644 --- a/charts/airbyte-bootloader/templates/pod.yaml +++ b/charts/airbyte-bootloader/templates/pod.yaml @@ -20,9 +20,7 @@ spec: serviceAccountName: {{ .Values.global.serviceAccountName }} {{- if .Values.global.imagePullSecrets }} imagePullSecrets: - {{- range .Values.global.imagePullSecrets }} {{- printf "- name: %s" . | nindent 2 }} - {{- end }} {{- end }} restartPolicy: Never {{- if .Values.nodeSelector }} diff --git a/charts/airbyte-server/templates/deployment.yaml b/charts/airbyte-server/templates/deployment.yaml index 29afcd377865..59739b8682e6 100644 --- a/charts/airbyte-server/templates/deployment.yaml +++ b/charts/airbyte-server/templates/deployment.yaml @@ -29,9 +29,7 @@ spec: serviceAccountName: {{ .Values.global.serviceAccountName }} {{- if .Values.global.imagePullSecrets }} imagePullSecrets: - {{- range .Values.global.imagePullSecrets }} {{- printf "- name: %s" . | nindent 2 }} - {{- end }} {{- end }} {{- if .Values.nodeSelector }} nodeSelector: {{- include "common.tplvalues.render" (dict "value" .Values.nodeSelector "context" $) | nindent 8 }} diff --git a/charts/airbyte-webapp/templates/deployment.yaml b/charts/airbyte-webapp/templates/deployment.yaml index 6f51596f1f8c..eef6489f82ea 100644 --- a/charts/airbyte-webapp/templates/deployment.yaml +++ b/charts/airbyte-webapp/templates/deployment.yaml @@ -35,9 +35,7 @@ spec: {{- end }} {{- if .Values.global.imagePullSecrets }} imagePullSecrets: - {{- range .Values.global.imagePullSecrets }} {{- printf "- name: %s" . | nindent 2 }} - {{- end }} {{- end }} containers: - name: airbyte-webapp-container diff --git a/charts/airbyte-webapp/values.yaml b/charts/airbyte-webapp/values.yaml index 87e8af001fbf..99fa5082e20e 100644 --- a/charts/airbyte-webapp/values.yaml +++ b/charts/airbyte-webapp/values.yaml @@ -176,6 +176,6 @@ extraContainers: [] secrets: {} -env_vars: [] +env_vars: {} gke_node_pool_selector: "" \ No newline at end of file diff --git a/charts/airbyte-worker/templates/deployment.yaml b/charts/airbyte-worker/templates/deployment.yaml index 5c2a02327bff..0d903f805a2d 100644 --- a/charts/airbyte-worker/templates/deployment.yaml +++ b/charts/airbyte-worker/templates/deployment.yaml @@ -28,9 +28,7 @@ spec: automountServiceAccountToken: true {{- if .Values.global.imagePullSecrets }} imagePullSecrets: - {{- range .Values.global.imagePullSecrets }} {{- printf "- name: %s" . | nindent 2 }} - {{- end }} {{- end }} {{- if .Values.nodeSelector }} nodeSelector: {{- include "common.tplvalues.render" (dict "value" .Values.nodeSelector "context" $) | nindent 8 }} From 0959af9ba699d175de824210fa650de298f5d4a5 Mon Sep 17 00:00:00 2001 From: Kyryl Skobylko Date: Thu, 25 Aug 2022 17:08:09 +0300 Subject: [PATCH 4/7] fix: remove nodeSelector duplicate --- charts/airbyte-bootloader/templates/pod.yaml | 4 ---- charts/airbyte-bootloader/values.yaml | 2 -- charts/airbyte-server/templates/deployment.yaml | 6 ------ charts/airbyte-server/values.yaml | 2 -- charts/airbyte-webapp/templates/deployment.yaml | 4 ---- charts/airbyte-webapp/values.yaml | 2 -- charts/airbyte-worker/templates/deployment.yaml | 4 ---- charts/airbyte-worker/values.yaml | 2 -- 8 files changed, 26 deletions(-) diff --git a/charts/airbyte-bootloader/templates/pod.yaml b/charts/airbyte-bootloader/templates/pod.yaml index 8555602e2c2f..17cd565e8d14 100644 --- a/charts/airbyte-bootloader/templates/pod.yaml +++ b/charts/airbyte-bootloader/templates/pod.yaml @@ -92,9 +92,5 @@ spec: {{- if .Values.extraEnv }} {{- toYaml .Values.extraEnv | nindent 8 }} {{- end }} - {{- if .Values.gke_node_pool_selector }} - nodeSelector: - cloud.google.com/gke-nodepool: {{ .Values.gke_node_pool_selector }} - {{- end }} resources: {{- toYaml .Values.resources | nindent 8 }} diff --git a/charts/airbyte-bootloader/values.yaml b/charts/airbyte-bootloader/values.yaml index 13aa1c159cbe..98a25f5456bc 100644 --- a/charts/airbyte-bootloader/values.yaml +++ b/charts/airbyte-bootloader/values.yaml @@ -67,5 +67,3 @@ extraEnv: [] secrets: {} env_vars: {} - -gke_node_pool_selector: "" \ No newline at end of file diff --git a/charts/airbyte-server/templates/deployment.yaml b/charts/airbyte-server/templates/deployment.yaml index 59739b8682e6..b8f0e343a26b 100644 --- a/charts/airbyte-server/templates/deployment.yaml +++ b/charts/airbyte-server/templates/deployment.yaml @@ -256,12 +256,6 @@ spec: {{ toYaml .Values.global.extraContainers | indent 8 }} {{- end }} - {{- if .Values.gke_node_pool_selector }} - nodeSelector: - cloud.google.com/gke-nodepool: {{ .Values.gke_node_pool_selector }} - {{- end }} - - volumes: {{- if eq .Values.deploymentMode "oss" }} - name: gcs-log-creds-volume diff --git a/charts/airbyte-server/values.yaml b/charts/airbyte-server/values.yaml index fe5ea733b288..357d2bcc4126 100644 --- a/charts/airbyte-server/values.yaml +++ b/charts/airbyte-server/values.yaml @@ -189,5 +189,3 @@ extraInitContainers: [] secrets: {} env_vars: {} - -gke_node_pool_selector: "" \ No newline at end of file diff --git a/charts/airbyte-webapp/templates/deployment.yaml b/charts/airbyte-webapp/templates/deployment.yaml index eef6489f82ea..b3d745f36e57 100644 --- a/charts/airbyte-webapp/templates/deployment.yaml +++ b/charts/airbyte-webapp/templates/deployment.yaml @@ -138,10 +138,6 @@ spec: {{- if .Values.global.extraConrainers }} {{ toYaml .Values.global.extraContainers | indent 8 }} {{- end }} - {{- if .Values.gke_node_pool_selector }} - nodeSelector: - cloud.google.com/gke-nodepool: {{ .Values.gke_node_pool_selector }} - {{- end }} volumes: {{- if .Values.extraVolumes }} {{ toYaml .Values.extraVolumes | nindent 6 }} diff --git a/charts/airbyte-webapp/values.yaml b/charts/airbyte-webapp/values.yaml index 99fa5082e20e..b86a9ea1aa3a 100644 --- a/charts/airbyte-webapp/values.yaml +++ b/charts/airbyte-webapp/values.yaml @@ -177,5 +177,3 @@ extraContainers: [] secrets: {} env_vars: {} - -gke_node_pool_selector: "" \ No newline at end of file diff --git a/charts/airbyte-worker/templates/deployment.yaml b/charts/airbyte-worker/templates/deployment.yaml index 0d903f805a2d..83e37e8d9600 100644 --- a/charts/airbyte-worker/templates/deployment.yaml +++ b/charts/airbyte-worker/templates/deployment.yaml @@ -401,10 +401,6 @@ spec: {{- if .Values.global.extraContainers }} {{ toYaml .Values.global.extraContainers | indent 8 }} {{- end }} - {{- if .Values.gke_node_pool_selector }} - nodeSelector: - cloud.google.com/gke-nodepool: {{ .Values.gke_node_pool_selector }} - {{- end }} volumes: {{- if eq .Values.global.deploymentMode "oss" }} - name: gcs-log-creds-volume diff --git a/charts/airbyte-worker/values.yaml b/charts/airbyte-worker/values.yaml index 5980b352598a..655a23058e64 100644 --- a/charts/airbyte-worker/values.yaml +++ b/charts/airbyte-worker/values.yaml @@ -227,5 +227,3 @@ extraVolumes: [] extraContainers: [] env_vars: {} - -gke_node_pool_selector: "" \ No newline at end of file From f22c201023736037fbbe5b66a3c482e40b9f9cfc Mon Sep 17 00:00:00 2001 From: Kyryl Skobylko Date: Thu, 25 Aug 2022 17:28:25 +0300 Subject: [PATCH 5/7] fix: revert imagePullSecrets changes --- charts/airbyte-bootloader/templates/pod.yaml | 4 +++- charts/airbyte-server/templates/deployment.yaml | 5 ++++- charts/airbyte-webapp/templates/deployment.yaml | 4 +++- charts/airbyte-worker/templates/deployment.yaml | 4 +++- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/charts/airbyte-bootloader/templates/pod.yaml b/charts/airbyte-bootloader/templates/pod.yaml index 17cd565e8d14..fcc6da0307f8 100644 --- a/charts/airbyte-bootloader/templates/pod.yaml +++ b/charts/airbyte-bootloader/templates/pod.yaml @@ -20,7 +20,9 @@ spec: serviceAccountName: {{ .Values.global.serviceAccountName }} {{- if .Values.global.imagePullSecrets }} imagePullSecrets: - {{- printf "- name: %s" . | nindent 2 }} + {{- range .Values.global.imagePullSecrets }} + {{- printf "- name: %s" .name | nindent 2 }} + {{- end }} {{- end }} restartPolicy: Never {{- if .Values.nodeSelector }} diff --git a/charts/airbyte-server/templates/deployment.yaml b/charts/airbyte-server/templates/deployment.yaml index b8f0e343a26b..39993b83dcb1 100644 --- a/charts/airbyte-server/templates/deployment.yaml +++ b/charts/airbyte-server/templates/deployment.yaml @@ -29,7 +29,9 @@ spec: serviceAccountName: {{ .Values.global.serviceAccountName }} {{- if .Values.global.imagePullSecrets }} imagePullSecrets: - {{- printf "- name: %s" . | nindent 2 }} + {{- range .Values.global.imagePullSecrets }} + {{- printf "- name: %s" .name | nindent 2 }} + {{- end }} {{- end }} {{- if .Values.nodeSelector }} nodeSelector: {{- include "common.tplvalues.render" (dict "value" .Values.nodeSelector "context" $) | nindent 8 }} @@ -256,6 +258,7 @@ spec: {{ toYaml .Values.global.extraContainers | indent 8 }} {{- end }} + volumes: {{- if eq .Values.deploymentMode "oss" }} - name: gcs-log-creds-volume diff --git a/charts/airbyte-webapp/templates/deployment.yaml b/charts/airbyte-webapp/templates/deployment.yaml index b3d745f36e57..6cf26d525653 100644 --- a/charts/airbyte-webapp/templates/deployment.yaml +++ b/charts/airbyte-webapp/templates/deployment.yaml @@ -35,7 +35,9 @@ spec: {{- end }} {{- if .Values.global.imagePullSecrets }} imagePullSecrets: - {{- printf "- name: %s" . | nindent 2 }} + {{- range .Values.global.imagePullSecrets }} + {{- printf "- name: %s" .name | nindent 2 }} + {{- end }} {{- end }} containers: - name: airbyte-webapp-container diff --git a/charts/airbyte-worker/templates/deployment.yaml b/charts/airbyte-worker/templates/deployment.yaml index 83e37e8d9600..dcfec36ad6e8 100644 --- a/charts/airbyte-worker/templates/deployment.yaml +++ b/charts/airbyte-worker/templates/deployment.yaml @@ -28,7 +28,9 @@ spec: automountServiceAccountToken: true {{- if .Values.global.imagePullSecrets }} imagePullSecrets: - {{- printf "- name: %s" . | nindent 2 }} + {{- range .Values.global.imagePullSecrets }} + {{- printf "- name: %s" .name | nindent 2 }} + {{- end }} {{- end }} {{- if .Values.nodeSelector }} nodeSelector: {{- include "common.tplvalues.render" (dict "value" .Values.nodeSelector "context" $) | nindent 8 }} From cf42e0729436de4135cf19cdf3d86542826f9dbb Mon Sep 17 00:00:00 2001 From: Kyryl Skobylko Date: Thu, 25 Aug 2022 17:46:57 +0300 Subject: [PATCH 6/7] fix nit --- charts/airbyte-server/templates/deployment.yaml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/charts/airbyte-server/templates/deployment.yaml b/charts/airbyte-server/templates/deployment.yaml index 68888096c97e..2961c8a0d463 100644 --- a/charts/airbyte-server/templates/deployment.yaml +++ b/charts/airbyte-server/templates/deployment.yaml @@ -257,11 +257,6 @@ spec: {{- if .Values.global.extraContainers }} {{ toYaml .Values.global.extraContainers | indent 8 }} {{- end }} - -<<<<<<< HEAD - -======= ->>>>>>> edc689191700e0f70fd4dc51dfa93992d1ce472c volumes: {{- if eq .Values.deploymentMode "oss" }} - name: gcs-log-creds-volume From c95821cdb0ce8bc5855af7004ec36bf6860b0330 Mon Sep 17 00:00:00 2001 From: Kyryl Skobylko Date: Thu, 25 Aug 2022 18:24:29 +0300 Subject: [PATCH 7/7] fix: fix bootloader imagepullsecrets --- charts/airbyte-bootloader/Chart.lock | 6 ------ charts/airbyte-bootloader/templates/pod.yaml | 8 ++++---- 2 files changed, 4 insertions(+), 10 deletions(-) delete mode 100644 charts/airbyte-bootloader/Chart.lock diff --git a/charts/airbyte-bootloader/Chart.lock b/charts/airbyte-bootloader/Chart.lock deleted file mode 100644 index 841dbab71660..000000000000 --- a/charts/airbyte-bootloader/Chart.lock +++ /dev/null @@ -1,6 +0,0 @@ -dependencies: -- name: common - repository: https://charts.bitnami.com/bitnami - version: 1.16.1 -digest: sha256:bcc717c6a14262fac51e6434020ee5dd6148b864fe6cff6266c1d481df4a0c91 -generated: "2022-07-20T15:18:13.571567+03:00" diff --git a/charts/airbyte-bootloader/templates/pod.yaml b/charts/airbyte-bootloader/templates/pod.yaml index fcc6da0307f8..6be3fdcb3434 100644 --- a/charts/airbyte-bootloader/templates/pod.yaml +++ b/charts/airbyte-bootloader/templates/pod.yaml @@ -19,10 +19,10 @@ metadata: spec: serviceAccountName: {{ .Values.global.serviceAccountName }} {{- if .Values.global.imagePullSecrets }} - imagePullSecrets: - {{- range .Values.global.imagePullSecrets }} - {{- printf "- name: %s" .name | nindent 2 }} - {{- end }} + imagePullSecrets: + {{- range .Values.global.imagePullSecrets }} + {{- printf "- name: %s" .name | nindent 2 }} + {{- end }} {{- end }} restartPolicy: Never {{- if .Values.nodeSelector }}