Skip to content

Commit ace139f

Browse files
committed
Add bearer token secret for Workload API (#9707)
1 parent ae44fe9 commit ace139f

File tree

5 files changed

+21
-1
lines changed

5 files changed

+21
-1
lines changed

charts/airbyte-workload-api-server/templates/deployment.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,11 @@ spec:
9090
secretKeyRef:
9191
name: {{ .Release.Name }}-airbyte-secrets
9292
key: DATABASE_USER
93+
- name: WORKLOAD_API_BEARER_TOKEN
94+
valueFrom:
95+
secretKeyRef:
96+
name: {{ .Values.global.database.secretName | default (printf "%s-airbyte-secrets" .Release.Name ) }}
97+
key: {{ .Values.global.database.secretValue | default "WORKLOAD_API_BEARER_TOKEN" }}
9398
{{- end }}
9499

95100
# Values from secret

charts/airbyte-workload-launcher/templates/deployment.yaml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,11 @@ spec:
138138
fieldPath: metadata.namespace
139139
- name: JOB_KUBE_SERVICEACCOUNT
140140
value: {{ .Values.global.serviceAccountName }}
141+
- name: WORKLOAD_API_BEARER_TOKEN
142+
valueFrom:
143+
secretKeyRef:
144+
name: {{ .Values.global.database.secretName | default (printf "%s-airbyte-secrets" .Release.Name ) }}
145+
key: {{ .Values.global.database.secretValue | default "WORKLOAD_API_BEARER_TOKEN" }}
141146
{{- if $.Values.global.jobs.kube.annotations }}
142147
- name: JOB_KUBE_ANNOTATIONS
143148
valueFrom:
@@ -360,14 +365,19 @@ spec:
360365
configMapKeyRef:
361366
name: {{ .Release.Name }}-airbyte-env
362367
key: WORKER_STATE_STORAGE_TYPE
363-
{{- if eq .Values.global.edition "pro" }}
368+
{{- if eq .Values.global.edition "pro" }}
364369
- name: AIRBYTE_API_AUTH_HEADER_NAME
365370
value: "X-Airbyte-Auth"
366371
- name: AIRBYTE_API_AUTH_HEADER_VALUE
367372
value: "Internal worker"
368373
{{- end }}
369374

370375
{{- end }}
376+
- name: WORKLOAD_API_HOST
377+
valueFrom:
378+
configMapKeyRef:
379+
name: {{ .Release.Name }}-airbyte-env
380+
key: WORKLOAD_API_HOST
371381
# Values from secret
372382
{{- if .Values.secrets }}
373383
{{- range $k, $v := .Values.secrets }}

charts/airbyte/templates/env-configmap.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ data:
2525
GCS_LOG_BUCKET: {{ .Values.global.logs.gcs.bucket | quote }}
2626
GOOGLE_APPLICATION_CREDENTIALS: {{ include "airbyte.gcpLogCredentialsPath" . | quote }}
2727
INTERNAL_API_HOST: {{ .Release.Name }}-airbyte-server-svc:{{ .Values.server.service.port }}
28+
WORKLOAD_API_HOST: {{ .Release.Name }}-airbyte-workload-api-svc:{{ index .Values "workload-api" "service" "port" }}
2829
{{- if eq .Values.global.edition "pro" }}
2930
KEYCLOAK_INTERNAL_HOST: {{ .Release.Name }}-airbyte-keycloak-svc:{{ .Values.keycloak.service.port }}
3031
KEYCLOAK_PORT: {{ .Values.keycloak.service.port | quote }}

charts/airbyte/templates/secret.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,5 @@ stringData:
2222
KEYCLOAK_ADMIN_USER: {{ .Values.keycloak.auth.adminUsername | quote }}
2323
KEYCLOAK_ADMIN_PASSWORD: {{ .Values.keycloak.auth.adminPassword | quote }}
2424
{{- end }}
25+
WORKLOAD_API_BEARER_TOKEN: {{ index ".Values.workload-api.bearerToken" | quote }}
2526
{{- end }}

charts/airbyte/values.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1823,6 +1823,9 @@ keycloak-setup:
18231823

18241824
workload-api:
18251825
enabled: false
1826+
1827+
bearerToken: token
1828+
18261829
## workload-api.replicaCount Number of airbyte-api-server replicas
18271830
replicaCount: 1
18281831

0 commit comments

Comments
 (0)