Skip to content

Commit 4b46a3d

Browse files
Fix airbyte hooks (#921)
Apparently the forked chart still had hooks for the service account (to support adding the bootloader as a hook). This has likely been the root cause of a lot of dumb bugs with service account access tokens, and ditching it is a good idea.
1 parent 0d5dd4b commit 4b46a3d

File tree

3 files changed

+54
-51
lines changed

3 files changed

+54
-51
lines changed

airbyte/helm/airbyte/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v2
22
name: airbyte
33
description: Unified data integration platform
44
type: application
5-
version: 0.4.26
5+
version: 0.4.27
66
appVersion: 0.50.33
77
dependencies:
88
- name: airbyte
-137 KB
Binary file not shown.
Lines changed: 53 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,58 @@
11
apiVersion: v1
2-
kind: Pod
2+
kind: Job
33
metadata:
4-
name: airbyte-bootloader-{{ randAlphaNum 6 | lower }}
4+
name: airbyte-bootloader-{{ .Values.bootloader.image.tag | sha256sum | trunc 8 }}
55
labels:
66
{{ include "airbyte-plural.labels" . | nindent 4 }}
77
spec:
8-
serviceAccountName: airbyte-admin
9-
restartPolicy: Never
10-
initContainers:
11-
- name: wait-for-pg
12-
image: gcr.io/pluralsh/busybox:latest
13-
imagePullPolicy: IfNotPresent
14-
command: [ "/bin/sh", "-c", "until nc -zv $DATABASE_HOST 5432 -w1; do echo 'waiting for db'; sleep 1; done" ]
15-
env:
16-
- name: DATABASE_HOST
17-
valueFrom:
18-
configMapKeyRef:
19-
name: airbyte-airbyte-env
20-
key: DATABASE_HOST
21-
containers:
22-
- name: airbyte-bootloader-container
23-
image: {{ printf "%s:%s" .Values.bootloader.image.repository .Values.bootloader.image.tag }}
24-
imagePullPolicy: IfNotPresent
25-
env:
26-
- name: AIRBYTE_VERSION
27-
valueFrom:
28-
configMapKeyRef:
29-
name: airbyte-airbyte-env
30-
key: AIRBYTE_VERSION
31-
- name: DATABASE_HOST
32-
valueFrom:
33-
configMapKeyRef:
34-
name: airbyte-airbyte-env
35-
key: DATABASE_HOST
36-
- name: DATABASE_PORT
37-
valueFrom:
38-
configMapKeyRef:
39-
name: airbyte-airbyte-env
40-
key: DATABASE_PORT
41-
- name: DATABASE_PASSWORD
42-
valueFrom:
43-
secretKeyRef:
44-
name: {{ .Values.global.database.secretName }}
45-
key: {{ .Values.global.database.secretValue }}
46-
- name: DATABASE_URL
47-
valueFrom:
48-
configMapKeyRef:
49-
name: airbyte-airbyte-env
50-
key: DATABASE_URL
51-
- name: DATABASE_USER
52-
valueFrom:
53-
secretKeyRef:
54-
name: airbyte-airbyte-secrets
55-
key: DATABASE_USER
8+
backoffLimit: 2
9+
template:
10+
spec:
11+
serviceAccountName: airbyte-admin
12+
restartPolicy: Never
13+
initContainers:
14+
- name: wait-for-pg
15+
image: gcr.io/pluralsh/busybox:latest
16+
imagePullPolicy: IfNotPresent
17+
command: [ "/bin/sh", "-c", "until nc -zv $DATABASE_HOST 5432 -w1; do echo 'waiting for db'; sleep 1; done" ]
18+
env:
19+
- name: DATABASE_HOST
20+
valueFrom:
21+
configMapKeyRef:
22+
name: airbyte-airbyte-env
23+
key: DATABASE_HOST
24+
containers:
25+
- name: airbyte-bootloader-container
26+
image: {{ printf "%s:%s" .Values.bootloader.image.repository .Values.bootloader.image.tag }}
27+
imagePullPolicy: IfNotPresent
28+
env:
29+
- name: AIRBYTE_VERSION
30+
valueFrom:
31+
configMapKeyRef:
32+
name: airbyte-airbyte-env
33+
key: AIRBYTE_VERSION
34+
- name: DATABASE_HOST
35+
valueFrom:
36+
configMapKeyRef:
37+
name: airbyte-airbyte-env
38+
key: DATABASE_HOST
39+
- name: DATABASE_PORT
40+
valueFrom:
41+
configMapKeyRef:
42+
name: airbyte-airbyte-env
43+
key: DATABASE_PORT
44+
- name: DATABASE_PASSWORD
45+
valueFrom:
46+
secretKeyRef:
47+
name: {{ .Values.global.database.secretName }}
48+
key: {{ .Values.global.database.secretValue }}
49+
- name: DATABASE_URL
50+
valueFrom:
51+
configMapKeyRef:
52+
name: airbyte-airbyte-env
53+
key: DATABASE_URL
54+
- name: DATABASE_USER
55+
valueFrom:
56+
secretKeyRef:
57+
name: airbyte-airbyte-secrets
58+
key: DATABASE_USER

0 commit comments

Comments
 (0)