Skip to content

Commit 626f51f

Browse files
xpuska513xpuska513
authored
feat: Update oss charts (#15719)
* fix: revert extraEnv delition in values.yaml for bootloader * add newline * feat: Update bootloader,webapp,server. Add way of defining secrets, update extraEnv usage. Add PodDistributionBudget into all deployments * feat: Update oss charts, make them able to be ingested in cloud deployment * fix: include #15685 changes * fix: Update Chart.yaml. fix minio deployment conditional operator * fix: fix EOF in worker, update worker HPA conditional * fix: remove cloud related stuff * fix: add conditional for hooks * fix: remove hooks for worker * fix: update nit, remove gsm * fix: fix nits * fix: remove gsm and hpa from values.yaml
1 parent afbe584 commit 626f51f

File tree

17 files changed

+214
-34
lines changed

17 files changed

+214
-34
lines changed

‎charts/airbyte-bootloader/templates/bootloader-secrets.yaml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# Create secrets only for the local deployment
2+
{{- if .Values.secrets }}
3+
apiVersion: v1
4+
kind: Secret
5+
metadata:
6+
name: bootloader-secrets
7+
labels:
8+
app.kubernetes.io/name: {{ include "airbyte.name" . }}
9+
app.kubernetes.io/instance: {{ .Release.Name }}
10+
helm.sh/chart: {{ include "airbyte.chart" . }}
11+
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
12+
app.kubernetes.io/managed-by: {{ .Release.Service }}
13+
app.airbyte.io/fullname: {{ include "airbyte.fullname" . }}
14+
annotations:
15+
helm.sh/hook: pre-install,pre-upgrade
16+
helm.sh/hook-weight: "-1"
17+
18+
type: Opaque
19+
data:
20+
{{- range $k, $v := mergeOverwrite .Values.secrets .Values.global.secrets }}
21+
{{ $k }}: {{ if $v }}{{ $v | b64enc }} {{else}}""{{end}}
22+
{{- end }}
23+
{{- end }}

‎charts/airbyte-bootloader/templates/pod.yaml

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,22 @@ spec:
7171
name: {{ .Values.global.configMapName | default (printf "%s-airbyte-secrets" .Release.Name) }}
7272
key: DATABASE_USER
7373
{{- end }}
74-
{{- if .Values.extraEnv }}
75-
{{ .Values.extraEnv | toYaml | nindent 10 }}
74+
# Values from secret
75+
{{- if .Values.secrets }}
76+
{{- range $k, $v := .Values.secrets }}
77+
- name: {{ $k }}
78+
valueFrom:
79+
secretKeyRef:
80+
name: bootloader-secrets
81+
key: {{ $k }}
82+
{{- end }}
7683
{{- end }}
7784

78-
resources: {{- toYaml .Values.resources | nindent 8 }}
85+
# Values from env
86+
{{- if .Values.extraEnv }}
87+
{{- range $k, $v := mergeOverwrite .Values.extraEnv .Values.global.env_vars }}
88+
- name: {{ $k }}
89+
value: {{ $v | quote }}
90+
{{- end }}
91+
{{- end }}
92+
resources: {{- toYaml .Values.resources | nindent 8 }}

‎charts/airbyte-bootloader/values.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ global:
1313
database:
1414
secretName: ""
1515
secretValue: ""
16+
secrets: {}
17+
env_vars: {}
1618

1719

1820
enabled: true
@@ -61,4 +63,7 @@ resources:
6163
## ref: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity
6264
##
6365
affinity: {}
64-
extraEnv: []
66+
extraEnv: {}
67+
secrets: {}
68+
69+

‎charts/airbyte-server/templates/deployment.yaml

Lines changed: 30 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -130,26 +130,24 @@ spec:
130130
configMapKeyRef:
131131
name: {{ .Release.Name }}-airbyte-env
132132
key: S3_LOG_BUCKET_REGION
133-
{{- if and .Values.global.logs.accessKey.existingSecret .Values.global.logs.accessKey.existingSecretKey }}
133+
{{- if and .Values.global.logs.accessKey.existingSecret .Values.global.logs.secretKey.existingSecretKey }}
134134
- name: AWS_ACCESS_KEY_ID
135135
valueFrom:
136136
secretKeyRef:
137137
name: {{ .Values.global.logs.accessKey.existingSecret }}
138138
key: {{ .Values.global.logs.accessKey.existingSecretKey }}
139-
{{- else }}
140-
- name: AWS_ACCESS_KEY_ID
141-
valueFrom:
142-
secretKeyRef:
143-
name: {{ .Release.Name }}-minio
144-
key: root-user
145-
{{- end }}
146-
{{- if and .Values.global.logs.secretKey.existingSecret .Values.global.logs.secretKey.existingSecretKey }}
147139
- name: AWS_SECRET_ACCESS_KEY
148140
valueFrom:
149141
secretKeyRef:
150142
name: {{ .Values.global.logs.secretKey.existingSecret }}
151143
key: {{ .Values.global.logs.secretKey.existingSecretKey }}
152-
{{- else }}
144+
{{- end }}
145+
{{- if or .Values.global.logs.minio.enabled .Values.global.logs.externalMinio.enabled }}
146+
- name: AWS_ACCESS_KEY_ID
147+
valueFrom:
148+
secretKeyRef:
149+
name: {{ .Release.Name }}-minio
150+
key: root-user
153151
- name: AWS_SECRET_ACCESS_KEY
154152
valueFrom:
155153
secretKeyRef:
@@ -187,9 +185,25 @@ spec:
187185
name: {{ .Release.Name }}-airbyte-env
188186
key: JOBS_DATABASE_MINIMUM_FLYWAY_MIGRATION_VERSION
189187
{{- end }}
188+
# Values from secret
189+
{{- if .Values.secrets }}
190+
{{- range $k, $v := .Values.secrets }}
191+
- name: {{ $k }}
192+
valueFrom:
193+
secretKeyRef:
194+
name: server-secrets
195+
key: {{ $k }}
196+
{{- end }}
197+
{{- end }}
198+
199+
# Values from env
190200
{{- if .Values.extraEnv }}
191-
{{ .Values.extraEnv | toYaml | nindent 10 }}
201+
{{- range $k, $v := mergeOverwrite .Values.extraEnv .Values.global.env_vars }}
202+
- name: {{ $k }}
203+
value: {{ $v | quote }}
204+
{{- end }}
192205
{{- end }}
206+
193207
{{- if .Values.livenessProbe.enabled }}
194208
livenessProbe:
195209
httpGet:
@@ -223,9 +237,12 @@ spec:
223237
securityContext: {{- toYaml .Values.containerSecurityContext | nindent 10 }}
224238
{{- end }}
225239
volumeMounts:
240+
{{- if eq .Values.deploymentMode "oss" }}
226241
- name: gcs-log-creds-volume
227242
mountPath: /secrets/gcs-log-creds
228243
readOnly: true
244+
{{- end }}
245+
229246
{{- if .Values.extraVolumeMounts }}
230247
{{ toYaml .Values.extraVolumeMounts | nindent 8 }}
231248
{{- end }}
@@ -236,9 +253,11 @@ spec:
236253
{{ toYaml .Values.global.extraContainers | indent 8 }}
237254
{{- end }}
238255
volumes:
256+
{{- if eq .Values.deploymentMode "oss" }}
239257
- name: gcs-log-creds-volume
240258
secret:
241259
secretName: {{ ternary (printf "%s-gcs-log-creds" ( .Release.Name )) (.Values.global.credVolumeOverride) (eq .Values.global.deploymentMode "oss") }}
260+
{{- end }}
242261
{{- if .Values.extraVolumes }}
243262
{{ toYaml .Values.extraVolumes | nindent 6 }}
244263
{{- end }}

‎charts/airbyte-server/templates/secrets.yaml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# Create secrets only for the local deployment
2+
{{- if .Values.secrets }}
3+
apiVersion: v1
4+
kind: Secret
5+
metadata:
6+
name: server-secrets
7+
labels:
8+
app.kubernetes.io/name: {{ include "airbyte.name" . }}
9+
app.kubernetes.io/instance: {{ .Release.Name }}
10+
helm.sh/chart: {{ include "airbyte.chart" . }}
11+
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
12+
app.kubernetes.io/managed-by: {{ .Release.Service }}
13+
app.airbyte.io/fullname: {{ include "airbyte.fullname" . }}
14+
annotations:
15+
type: Opaque
16+
data:
17+
{{- range $k, $v := mergeOverwrite .Values.secrets .Values.global.secrets }}
18+
{{ $k }}: {{ if $v }}{{ $v | b64enc }} {{else}}""{{end}}
19+
{{- end }}
20+
{{- end }}

‎charts/airbyte-server/templates/service.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
apiVersion: v1
33
kind: Service
44
metadata:
5-
name: {{ include "common.names.fullname" . }}
5+
name: airbyte-server-svc
66
spec:
77
type: {{ .Values.service.type }}
88
ports:

‎charts/airbyte-server/values.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ log:
165165
## extraEnv:
166166
## - name: SAMPLE_ENV_VAR
167167
## value: "key=sample-value"
168-
extraEnv: []
168+
extraEnv: {}
169169

170170
## @param server.extraVolumeMounts [array] Additional volumeMounts for server container(s).
171171
## Examples (when using `server.containerSecurityContext.readOnlyRootFilesystem=true`):
@@ -185,4 +185,6 @@ extraVolumes: []
185185

186186
extraContainers: []
187187

188-
extraInitContainers: []
188+
extraInitContainers: []
189+
190+
secrets: {}

‎charts/airbyte-webapp/templates/deployment.yaml

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,23 @@ spec:
7676
name: {{ .Release.Name }}-airbyte-env
7777
key: INTERNAL_API_HOST
7878
{{- end }}
79+
# Values from secret
80+
{{- if .Values.secrets }}
81+
{{- range $k, $v := .Values.secrets }}
82+
- name: {{ $k }}
83+
valueFrom:
84+
secretKeyRef:
85+
name: webapp-secrets
86+
key: {{ $k }}
87+
{{- end }}
88+
{{- end }}
89+
90+
# Values from env
7991
{{- if .Values.extraEnv }}
80-
{{ .Values.extraEnv | toYaml | nindent 10 }}
92+
{{- range $k, $v := mergeOverwrite .Values.extraEnv .Values.global.env_vars }}
93+
- name: {{ $k }}
94+
value: {{ $v | quote }}
95+
{{- end }}
8196
{{- end }}
8297
{{- if .Values.livenessProbe.enabled }}
8398
livenessProbe:
@@ -114,6 +129,9 @@ spec:
114129
{{- if .Values.extraVolumeMounts }}
115130
{{ toYaml .Values.extraVolumeMounts | nindent 8 }}
116131
{{- end }}
132+
{{- if .Values.global.extraVolumeMounts }}
133+
{{ toYaml .Values.global.extraVolumeMounts | nindent 8 }}
134+
{{- end }}
117135
{{- if .Values.extraContainers }}
118136
{{ toYaml .Values.extraContainers | indent 8 }}
119137
{{- end }}
@@ -123,4 +141,7 @@ spec:
123141
volumes:
124142
{{- if .Values.extraVolumes }}
125143
{{ toYaml .Values.extraVolumes | nindent 6 }}
144+
{{- end }}
145+
{{- if .Values.global.extraVolumes }}
146+
{{ toYaml .Values.global.extraVolumes | nindent 6 }}
126147
{{- end }}

‎charts/airbyte-webapp/templates/secrets.yaml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# Create secrets only for the local deployment
2+
{{- if .Values.secrets }}
3+
apiVersion: v1
4+
kind: Secret
5+
metadata:
6+
name: webapp-secrets
7+
labels:
8+
app.kubernetes.io/name: {{ include "airbyte.name" . }}
9+
app.kubernetes.io/instance: {{ .Release.Name }}
10+
helm.sh/chart: {{ include "airbyte.chart" . }}
11+
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
12+
app.kubernetes.io/managed-by: {{ .Release.Service }}
13+
app.airbyte.io/fullname: {{ include "airbyte.fullname" . }}
14+
annotations:
15+
type: Opaque
16+
data:
17+
{{- range $k, $v := mergeOverwrite .Values.secrets .Values.global.secrets }}
18+
{{ $k }}: {{ if $v }}{{ $v | b64enc }} {{else}}""{{end}}
19+
{{- end }}
20+
{{- end }}

‎charts/airbyte-webapp/templates/service.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
apiVersion: v1
33
kind: Service
44
metadata:
5-
name: {{ include "common.names.fullname" . }}
5+
name: airbyte-webapp-svc
66
{{- with .Values.service.annotations }}
77
annotations:
88
{{- toYaml . | nindent 4 }}

‎charts/airbyte-webapp/values.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ fullstory:
151151
## extraEnv:
152152
## - name: SAMPLE_ENV_VAR
153153
## value: "key=sample-value"
154-
extraEnv: []
154+
extraEnv: {}
155155

156156
## @param webapp.extraVolumeMounts [array] Additional volumeMounts for webapp container(s).
157157
## Examples (when using `webapp.containerSecurityContext.readOnlyRootFilesystem=true`):
@@ -177,4 +177,6 @@ extraVolumeMounts: []
177177
##
178178
extraVolumes: []
179179

180-
extraContainers: []
180+
extraContainers: []
181+
182+
secrets: {}

‎charts/airbyte-worker/templates/deployment.yaml

Lines changed: 34 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -189,20 +189,20 @@ spec:
189189
secretKeyRef:
190190
name: {{ .Values.global.logs.accessKey.existingSecret }}
191191
key: {{ .Values.global.logs.accessKey.existingSecretKey }}
192-
{{- else }}
193-
- name: AWS_ACCESS_KEY_ID
194-
valueFrom:
195-
secretKeyRef:
196-
name: {{ .Release.Name }}-minio
197-
key: root-user
198192
{{- end }}
199193
{{- if and .Values.global.logs.secretKey.existingSecret .Values.global.logs.secretKey.existingSecretKey }}
200194
- name: AWS_SECRET_ACCESS_KEY
201195
valueFrom:
202196
secretKeyRef:
203197
name: {{ .Values.global.logs.secretKey.existingSecret }}
204198
key: {{ .Values.global.logs.secretKey.existingSecretKey }}
205-
{{- else }}
199+
{{- end }}
200+
{{- if or .Values.global.logs.minio.enabled .Values.global.logs.externalMinio.enabled }}
201+
- name: AWS_ACCESS_KEY_ID
202+
valueFrom:
203+
secretKeyRef:
204+
name: {{ .Release.Name }}-minio
205+
key: root-user
206206
- name: AWS_SECRET_ACCESS_KEY
207207
valueFrom:
208208
secretKeyRef:
@@ -300,9 +300,25 @@ spec:
300300
name: {{ .Release.Name }}-airbyte-env
301301
key: USE_STREAM_CAPABLE_STATE
302302
{{- end }}
303+
# Values from secret
304+
{{- if .Values.secrets }}
305+
{{- range $k, $v := .Values.secrets }}
306+
- name: {{ $k }}
307+
valueFrom:
308+
secretKeyRef:
309+
name: worker-secrets
310+
key: {{ $k }}
311+
{{- end }}
312+
{{- end }}
313+
314+
# Values from env
303315
{{- if .Values.extraEnv }}
304-
{{ .Values.extraEnv | toYaml | nindent 10 }}
316+
{{- range $k, $v := mergeOverwrite .Values.extraEnv .Values.global.env_vars }}
317+
- name: {{ $k }}
318+
value: {{ $v | quote }}
319+
{{- end }}
305320
{{- end }}
321+
306322
{{- if .Values.livenessProbe.enabled }}
307323
livenessProbe:
308324
httpGet:
@@ -364,23 +380,33 @@ spec:
364380
{{- if .Values.containerSecurityContext }}
365381
securityContext: {{- toYaml .Values.containerSecurityContext | nindent 10 }}
366382
{{- end }}
383+
{{- if eq .Values.global.deploymentMode "oss" }}
367384
volumeMounts:
368385
- name: gcs-log-creds-volume
369386
mountPath: /secrets/gcs-log-creds
370387
readOnly: true
388+
{{- end }}
371389
{{- if .Values.extraVolumeMounts }}
372390
{{ toYaml .Values.extraVolumeMounts | nindent 8 }}
373391
{{- end }}
392+
{{- if .Values.global.extraVolumeMounts }}
393+
{{ toYaml .Values.global.extraVolumeMounts | nindent 8 }}
394+
{{- end }}
374395
{{- if .Values.extraContainers }}
375396
{{ toYaml .Values.extraContainers | indent 8 }}
376397
{{- end }}
377398
{{- if .Values.global.extraContainers }}
378399
{{ toYaml .Values.global.extraContainers | indent 8 }}
379400
{{- end }}
380401
volumes:
402+
{{- if eq .Values.global.deploymentMode "oss" }}
381403
- name: gcs-log-creds-volume
382404
secret:
383405
secretName: {{ ternary (printf "%s-gcs-log-creds" ( .Release.Name )) (.Values.global.credVolumeOverride) (eq .Values.global.deploymentMode "oss") }}
406+
{{- end }}
384407
{{- if .Values.extraVolumes }}
385408
{{ toYaml .Values.extraVolumes | nindent 6 }}
409+
{{- end }}
410+
{{- if .Values.global.extraVolumes }}
411+
{{ toYaml .Values.global.extraVolumes | nindent 6 }}
386412
{{- end }}

0 commit comments

Comments
 (0)