Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: helm. Revert imagePullSecrets changes #15967

Merged
merged 8 commits into from
Aug 25, 2022
Merged

fix: helm. Revert imagePullSecrets changes #15967

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e562f57
fix: revert extraEnv. Move updated extraEnv to env_vars
xpuska513 Aug 25, 2022
ffd1a01
fix: Add node pool selector feature for gke deployments
xpuska513 Aug 25, 2022
08754b2
fix: hotfix. Fix webapp values and imagepullsecrets
xpuska513 Aug 25, 2022
0959af9
fix: remove nodeSelector duplicate
xpuska513 Aug 25, 2022
0d57584
merge master with current branch
xpuska513 Aug 25, 2022
f22c201
fix: revert imagePullSecrets changes
xpuska513 Aug 25, 2022
8ec9555
fix merge conflict
xpuska513 Aug 25, 2022
cf42e07
fix nit
xpuska513 Aug 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion charts/airbyte-bootloader/templates/pod.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
5 changes: 3 additions & 2 deletions charts/airbyte-server/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down Expand Up @@ -255,7 +257,6 @@ spec:
{{- if .Values.global.extraContainers }}
{{ toYaml .Values.global.extraContainers | indent 8 }}
{{- end }}

volumes:
{{- if eq .Values.deploymentMode "oss" }}
- name: gcs-log-creds-volume
Expand Down
4 changes: 3 additions & 1 deletion charts/airbyte-webapp/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion charts/airbyte-worker/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down