Fix airbyte hooks

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.
pluralsh · Oct 10, 2024 · 8b5365e · 8b5365e
1 parent 0d5dd4b
commit 8b5365e
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 51 deletions.
diff --git a/airbyte/helm/airbyte/Chart.yaml b/airbyte/helm/airbyte/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: airbyte
 description: Unified data integration platform
 type: application
-version: 0.4.26
+version: 0.4.27
 appVersion: 0.50.33
 dependencies:
 - name: airbyte

diff --git a/airbyte/helm/airbyte/charts/airbyte-0.43.22.tgz b/airbyte/helm/airbyte/charts/airbyte-0.43.22.tgz
diff --git a/airbyte/helm/airbyte/templates/bootloader.yaml b/airbyte/helm/airbyte/templates/bootloader.yaml
@@ -1,55 +1,58 @@
 apiVersion: v1
-kind: Pod
+kind: Job
 metadata:
-  name: airbyte-bootloader-{{ randAlphaNum 6 | lower }}
+  name: airbyte-bootloader-{{ .Values.bootloader.image.tag | sha256sum | trunc 8 }}
   labels:
   {{ include "airbyte-plural.labels" . | nindent 4 }}
 spec:
-  serviceAccountName: airbyte-admin
-  restartPolicy: Never
-  initContainers:
-  - name: wait-for-pg
-    image: gcr.io/pluralsh/busybox:latest
-    imagePullPolicy: IfNotPresent
-    command: [ "/bin/sh", "-c", "until nc -zv $DATABASE_HOST 5432 -w1; do echo 'waiting for db'; sleep 1; done" ]
-    env:
-    - name: DATABASE_HOST
-      valueFrom:
-        configMapKeyRef:
-          name: airbyte-airbyte-env
-          key: DATABASE_HOST
-  containers:
-  - name: airbyte-bootloader-container
-    image: {{ printf "%s:%s" .Values.bootloader.image.repository .Values.bootloader.image.tag }}
-    imagePullPolicy: IfNotPresent
-    env:
-    - name: AIRBYTE_VERSION
-      valueFrom:
-        configMapKeyRef:
-          name: airbyte-airbyte-env
-          key: AIRBYTE_VERSION
-    - name: DATABASE_HOST
-      valueFrom:
-        configMapKeyRef:
-          name: airbyte-airbyte-env
-          key: DATABASE_HOST
-    - name: DATABASE_PORT
-      valueFrom:
-        configMapKeyRef:
-          name: airbyte-airbyte-env
-          key: DATABASE_PORT
-    - name: DATABASE_PASSWORD
-      valueFrom:
-        secretKeyRef:
-          name: {{ .Values.global.database.secretName }}
-          key: {{ .Values.global.database.secretValue }}
-    - name: DATABASE_URL
-      valueFrom:
-        configMapKeyRef:
-          name: airbyte-airbyte-env
-          key: DATABASE_URL
-    - name: DATABASE_USER
-      valueFrom:
-        secretKeyRef:
-          name: airbyte-airbyte-secrets
-          key: DATABASE_USER
+  backoffLimit: 2
+  template:
+    spec:
+      serviceAccountName: airbyte-admin
+      restartPolicy: Never
+      initContainers:
+      - name: wait-for-pg
+        image: gcr.io/pluralsh/busybox:latest
+        imagePullPolicy: IfNotPresent
+        command: [ "/bin/sh", "-c", "until nc -zv $DATABASE_HOST 5432 -w1; do echo 'waiting for db'; sleep 1; done" ]
+        env:
+        - name: DATABASE_HOST
+          valueFrom:
+            configMapKeyRef:
+              name: airbyte-airbyte-env
+              key: DATABASE_HOST
+      containers:
+      - name: airbyte-bootloader-container
+        image: {{ printf "%s:%s" .Values.bootloader.image.repository .Values.bootloader.image.tag }}
+        imagePullPolicy: IfNotPresent
+        env:
+        - name: AIRBYTE_VERSION
+          valueFrom:
+            configMapKeyRef:
+              name: airbyte-airbyte-env
+              key: AIRBYTE_VERSION
+        - name: DATABASE_HOST
+          valueFrom:
+            configMapKeyRef:
+              name: airbyte-airbyte-env
+              key: DATABASE_HOST
+        - name: DATABASE_PORT
+          valueFrom:
+            configMapKeyRef:
+              name: airbyte-airbyte-env
+              key: DATABASE_PORT
+        - name: DATABASE_PASSWORD
+          valueFrom:
+            secretKeyRef:
+              name: {{ .Values.global.database.secretName }}
+              key: {{ .Values.global.database.secretValue }}
+        - name: DATABASE_URL
+          valueFrom:
+            configMapKeyRef:
+              name: airbyte-airbyte-env
+              key: DATABASE_URL
+        - name: DATABASE_USER
+          valueFrom:
+            secretKeyRef:
+              name: airbyte-airbyte-secrets
+              key: DATABASE_USER