fix: Update helm charts (#15199)

* fix: Fix postgres secret defenition, add new extraSecrets feature, update gcs-creds volume templating * Update helm docs * Revert db overrides back. Update docs * fix: fix extraContainers typo in worker and server charts
airbytehq · Aug 3, 2022 · 316502c · 316502c
1 parent be6e684
commit 316502c
Show file tree

Hide file tree

Showing 20 changed files with 117 additions and 76 deletions.
diff --git a/charts/airbyte-bootloader/README.md b/charts/airbyte-bootloader/README.md
@@ -16,11 +16,11 @@ Helm chart to deploy airbyte-bootloader
 |-----|------|---------|-------------|
 | affinity | object | `{}` |  |
 | enabled | bool | `true` |  |
-| global.database.secretName | string | `"test-postgresql"` |  |
-| global.database.secretValue | string | `"postgresql-password"` |  |
+| global.database.secretName | string | `""` |  |
+| global.database.secretValue | string | `""` |  |
 | global.deploymentMode | string | `"oss"` |  |
-| global.secretName | string | `"something"` |  |
-| global.serviceAccountName | string | `"placeholderServiceAccounr"` |  |
+| global.secretName | string | `""` |  |
+| global.serviceAccountName | string | `"placeholderServiceAccount"` |  |
 | image.pullPolicy | string | `"IfNotPresent"` |  |
 | image.repository | string | `"airbyte/bootloader"` |  |
 | nodeSelector | object | `{}` |  |

diff --git a/charts/airbyte-bootloader/templates/pod.yaml b/charts/airbyte-bootloader/templates/pod.yaml
@@ -59,7 +59,7 @@ spec:
           valueFrom:
             secretKeyRef:
               name: {{ .Values.global.database.secretName | default (printf "%s-postgresql" .Release.Name ) }}
-              key: {{ .Values.global.database.secretValue | default "DATABASE_PASSWORD" }}
+              key: {{ .Values.global.database.secretValue | default "postgresql-password" }}
         - name: DATABASE_URL
           valueFrom:
             configMapKeyRef:

diff --git a/charts/airbyte-bootloader/values.yaml b/charts/airbyte-bootloader/values.yaml
@@ -1,11 +1,18 @@
 
+## @param global.serviceAccountName Name of service account to be associated with service
+## @param deploymentMode Determines deployment mode of airbyte
+## @param secretName Overrides the secrate name with with credentials to S3 Bucket and logging
+## @param database.secretName Name of database secret
+## @param database.secretValue Value of database password key stored in secret
+## @param database.host Hostname of database
+## @param database.port Database port
 global:
-  serviceAccountName: placeholderServiceAccounr
+  serviceAccountName: placeholderServiceAccount
   deploymentMode: oss
-  secretName: something
+  secretName: ""
   database:
-    secretName: "test-postgresql"
-    secretValue: "postgresql-password"
+    secretName: ""
+    secretValue: ""
 
 
 enabled: true

diff --git a/charts/airbyte-pod-sweeper/README.md b/charts/airbyte-pod-sweeper/README.md
@@ -19,10 +19,10 @@ Helm chart to deploy airbyte-pod-sweeper
 | enabled | bool | `true` |  |
 | extraVolumeMounts | list | `[]` |  |
 | extraVolumes | list | `[]` |  |
-| global.database.host | string | `"test"` |  |
+| global.database.host | string | `"example.com"` |  |
 | global.database.port | string | `"5432"` |  |
-| global.database.secretName | string | `"test-postgresql"` |  |
-| global.database.secretValue | string | `"postgresql-password"` |  |
+| global.database.secretName | string | `""` |  |
+| global.database.secretValue | string | `""` |  |
 | global.imageRegistry | string | `""` |  |
 | global.jobs.kube.annotations | object | `{}` |  |
 | global.jobs.kube.main_container_image_pull_secret | string | `""` |  |
@@ -46,7 +46,7 @@ Helm chart to deploy airbyte-pod-sweeper
 | global.logs.secretKey.existingSecret | string | `""` |  |
 | global.logs.secretKey.existingSecretKey | string | `""` |  |
 | global.logs.secretKey.password | string | `"minio123"` |  |
-| global.secretName | string | `"airbyte-secrets"` |  |
+| global.secretName | string | `""` |  |
 | global.serviceAccountName | string | `"airbyte-admin"` |  |
 | image.pullPolicy | string | `"IfNotPresent"` |  |
 | image.repository | string | `"bitnami/kubectl"` |  |

diff --git a/charts/airbyte-pod-sweeper/values.yaml b/charts/airbyte-pod-sweeper/values.yaml
@@ -1,12 +1,19 @@
+## @param global.serviceAccountName Name of service account to be associated with service
+## @param deploymentMode Determines deployment mode of airbyte
+## @param secretName Overrides the secrate name with with credentials to S3 Bucket and logging
+## @param database.secretName Name of database secret
+## @param database.secretValue Value of database password key stored in secret
+## @param database.host Hostname of database
+## @param database.port Database port
 global:
   imageRegistry: ""
   serviceAccountName: &service-account-name "airbyte-admin"
 
-  secretName: "airbyte-secrets"
+  secretName: ""
   database:
-    secretName: "test-postgresql"
-    secretValue: "postgresql-password"
-    host: "test"
+    secretName: ""
+    secretValue: ""
+    host: "example.com"
     port: "5432"
   logs:
     ## @param logs.accessKey.password Logs Access Key

diff --git a/charts/airbyte-server/Chart.lock b/charts/airbyte-server/Chart.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: common
   repository: https://charts.bitnami.com/bitnami
-  version: 1.16.0
-digest: sha256:f41cb9ff725b7c9fa2725634196a6813566d630342f86a74903ed114b282c8c0
-generated: "2022-07-08T17:33:35.930048+03:00"
+  version: 1.16.1
+digest: sha256:bcc717c6a14262fac51e6434020ee5dd6148b864fe6cff6266c1d481df4a0c91
+generated: "2022-08-02T14:38:27.274486+03:00"
diff --git a/charts/airbyte-server/README.md b/charts/airbyte-server/README.md
@@ -19,13 +19,17 @@ Helm chart to deploy airbyte-server
 | enabled | bool | `true` |  |
 | extraContainers | list | `[]` |  |
 | extraEnv | list | `[]` |  |
+| extraInitContainers | list | `[]` |  |
 | extraVolumeMounts | list | `[]` |  |
 | extraVolumes | list | `[]` |  |
-| global.configMapName | string | `"something"` |  |
-| global.database.host | string | `"something"` |  |
+| global.configMapName | string | `""` |  |
+| global.credVolumeOverride | string | `""` |  |
+| global.database.host | string | `"example.com"` |  |
 | global.database.port | string | `"5432"` |  |
-| global.database.secretValue | string | `"postgresql-password"` |  |
+| global.database.secretName | string | `""` |  |
+| global.database.secretValue | string | `""` |  |
 | global.deploymentMode | string | `"oss"` |  |
+| global.extraContainers | list | `[]` |  |
 | global.logs.accessKey.existingSecret | string | `""` |  |
 | global.logs.accessKey.existingSecretKey | string | `""` |  |
 | global.logs.accessKey.password | string | `"minio"` |  |
@@ -42,8 +46,8 @@ Helm chart to deploy airbyte-server
 | global.logs.secretKey.existingSecret | string | `""` |  |
 | global.logs.secretKey.existingSecretKey | string | `""` |  |
 | global.logs.secretKey.password | string | `"minio123"` |  |
-| global.secretName | string | `"something"` |  |
-| global.serviceAccountName | string | `"placeholderServiceAccounr"` |  |
+| global.secretName | string | `""` |  |
+| global.serviceAccountName | string | `"placeholderServiceAccount"` |  |
 | image.pullPolicy | string | `"IfNotPresent"` |  |
 | image.repository | string | `"airbyte/server"` |  |
 | livenessProbe.enabled | bool | `true` |  |

diff --git a/charts/airbyte-server/templates/deployment.yaml b/charts/airbyte-server/templates/deployment.yaml
@@ -62,7 +62,7 @@ spec:
           valueFrom:
             secretKeyRef:
               name: {{ .Values.global.database.secretName | default (printf "%s-postgresql" .Release.Name ) }}
-              key: {{ .Values.global.database.secretValue | default "DATABASE_PASSWORD" }}
+              key: {{ .Values.global.database.secretValue | default "postgresql-password" }}
         - name: DATABASE_URL
           valueFrom:
             configMapKeyRef:
@@ -230,12 +230,15 @@ spec:
   {{ toYaml .Values.extraVolumeMounts | nindent 8 }}
         {{- end }}
       {{- if .Values.extraContainers }}
-      {{ toyaml .Values.extraInitContainers | indent 8 }}
+      {{ toYaml .Values.extraContainers | indent 8 }}
+      {{- end }}
+      {{- if .Values.global.extraContainers }}
+      {{ toYaml .Values.global.extraContainers | indent 8 }}
       {{- end }}
       volumes:
       - name: gcs-log-creds-volume
         secret:
-          secretName: {{ .Release.Name }}-airbyte-gcs-log-creds
+          secretName: {{ ternary (printf "%s-gcs-log-creds" ( .Release.Name )) (.Values.global.credVolumeOverride) (eq .Values.global.deploymentMode "oss") }}
       {{- if .Values.extraVolumes }}
 {{ toYaml .Values.extraVolumes | nindent 6 }}
       {{- end }}
diff --git a/charts/airbyte-server/values.yaml b/charts/airbyte-server/values.yaml
@@ -1,13 +1,15 @@
 
 global:
-  serviceAccountName: placeholderServiceAccounr
+  serviceAccountName: placeholderServiceAccount
   deploymentMode: oss
-  configMapName: something
-  secretName: something
+  configMapName: ""
+  secretName: ""
+  credVolumeOverride: ""
+  extraContainers: []
   database:
-    # secretName: "test-postgresql"
-    secretValue: "postgresql-password"
-    host: "something"
+    secretName: ""
+    secretValue: ""
+    host: "example.com"
     port: "5432"
   logs:
     ## @param logs.accessKey.password Logs Access Key
@@ -181,4 +183,6 @@ extraVolumeMounts: []
 ##
 extraVolumes: []
 
-extraContainers: []
+extraContainers: []
+
+extraInitContainers: []
diff --git a/charts/airbyte-temporal/README.md b/charts/airbyte-temporal/README.md
@@ -22,13 +22,15 @@ Helm chart to deploy airbyte-temporal
 | extraInitContainers | list | `[]` |  |
 | extraVolumeMounts | list | `[]` |  |
 | extraVolumes | list | `[]` |  |
-| global.configMapName | string | `"something"` |  |
-| global.database.host | string | `"something"` |  |
+| global.configMapName | string | `""` |  |
+| global.database.host | string | `"example.com"` |  |
 | global.database.port | string | `"5432"` |  |
-| global.database.secretValue | string | `"postgresql-password"` |  |
+| global.database.secretName | string | `""` |  |
+| global.database.secretValue | string | `""` |  |
 | global.deploymentMode | string | `"oss"` |  |
-| global.secretName | string | `"something"` |  |
-| global.serviceAccountName | string | `"placeholderServiceAccounr"` |  |
+| global.extraContainers | list | `[]` |  |
+| global.secretName | string | `""` |  |
+| global.serviceAccountName | string | `"placeholderServiceAccount"` |  |
 | image.pullPolicy | string | `"IfNotPresent"` |  |
 | image.repository | string | `"temporalio/auto-setup"` |  |
 | image.tag | string | `"1.7.0"` |  |

diff --git a/charts/airbyte-temporal/templates/deployment.yaml b/charts/airbyte-temporal/templates/deployment.yaml
@@ -59,7 +59,7 @@ spec:
             valueFrom:
               secretKeyRef:
                 name: {{ .Values.global.database.secretName | default (printf "%s-postgresql" .Release.Name ) }}
-                key: {{ .Values.global.database.secretValue | default "DATABASE_PASSWORD" }}
+                key: {{ .Values.global.database.secretValue | default "postgresql-password" }}
           - name: POSTGRES_SEEDS
             value: {{ .Release.Name }}-postgresql
           - name: DYNAMIC_CONFIG_FILE_PATH
@@ -110,7 +110,10 @@ spec:
           failureThreshold: {{ .Values.readinessProbe.failureThreshold }}
         {{- end }}
         {{- if .Values.extraContainers }}
-        {{ toyaml .Values.extraInitContainers | indent 8 }}
+        {{ toYaml .Values.extraContainers | indent 8 }}
+        {{- end }}
+        {{- if .Values.global.extraConrainers }}
+        {{ toYaml .Values.global.extraContainers | indent 8 }}
         {{- end }}
       volumes:
       - name: airbyte-temporal-dynamicconfig

diff --git a/charts/airbyte-temporal/values.yaml b/charts/airbyte-temporal/values.yaml
@@ -1,13 +1,14 @@
 
 global:
-  serviceAccountName: placeholderServiceAccounr
+  serviceAccountName: placeholderServiceAccount
   deploymentMode: oss
-  configMapName: something
-  secretName: something
+  configMapName: ""
+  secretName: ""
+  extraContainers: []
   database:
-    # secretName: "test-postgresql"
-    secretValue: "postgresql-password"
-    host: "something"
+    secretName: ""
+    secretValue: ""
+    host: "example.com"
     port: "5432"
 
 

diff --git a/charts/airbyte-webapp/README.md b/charts/airbyte-webapp/README.md
@@ -23,13 +23,15 @@ Helm chart to deploy airbyte-webapp
 | extraVolumeMounts | list | `[]` |  |
 | extraVolumes | list | `[]` |  |
 | fullstory.enabled | bool | `false` |  |
-| global.configMapName | string | `"something"` |  |
-| global.database.host | string | `"something"` |  |
+| global.configMapName | string | `""` |  |
+| global.database.host | string | `"example.com"` |  |
 | global.database.port | string | `"5432"` |  |
-| global.database.secretValue | string | `"postgresql-password"` |  |
+| global.database.secretName | string | `""` |  |
+| global.database.secretValue | string | `""` |  |
 | global.deploymentMode | string | `"oss"` |  |
-| global.secretName | string | `"something"` |  |
-| global.serviceAccountName | string | `"placeholderServiceAccounr"` |  |
+| global.extraContainers | list | `[]` |  |
+| global.secretName | string | `""` |  |
+| global.serviceAccountName | string | `"placeholderServiceAccount"` |  |
 | image.pullPolicy | string | `"IfNotPresent"` |  |
 | image.repository | string | `"airbyte/webapp"` |  |
 | ingress.annotations | object | `{}` |  |

diff --git a/charts/airbyte-webapp/templates/deployment.yaml b/charts/airbyte-webapp/templates/deployment.yaml
@@ -115,7 +115,10 @@ spec:
   {{ toYaml .Values.extraVolumeMounts | nindent 8 }}
         {{- end }}
       {{- if .Values.extraContainers }}
-      {{ toyaml .Values.extraInitContainers | indent 8 }}
+      {{ toYaml .Values.extraContainers | indent 8 }}
+      {{- end }}
+      {{- if .Values.global.extraConrainers }}
+      {{ toYaml .Values.global.extraContainers | indent 8 }}
       {{- end }}
       volumes:
       {{- if .Values.extraVolumes }}

diff --git a/charts/airbyte-webapp/values.yaml b/charts/airbyte-webapp/values.yaml
@@ -1,13 +1,14 @@
 
 global:
-  serviceAccountName: placeholderServiceAccounr
+  serviceAccountName: placeholderServiceAccount
   deploymentMode: oss
-  configMapName: something
-  secretName: something
+  configMapName: ""
+  secretName: ""
+  extraContainers: []
   database:
-    # secretName: "test-postgresql"
-    secretValue: "postgresql-password"
-    host: "something"
+    secretName: ""
+    secretValue: ""
+    host: "example.com"
     port: "5432"
 
 

diff --git a/charts/airbyte-worker/README.md b/charts/airbyte-worker/README.md
@@ -21,10 +21,12 @@ Helm chart to deploy airbyte-worker
 | extraEnv | list | `[]` |  |
 | extraVolumeMounts | list | `[]` |  |
 | extraVolumes | list | `[]` |  |
-| global.database.host | string | `"test"` |  |
+| global.credVolumeOverride | string | `""` |  |
+| global.database.host | string | `"example.com"` |  |
 | global.database.port | string | `"5432"` |  |
-| global.database.secretName | string | `"test-postgresql"` |  |
-| global.database.secretValue | string | `"postgresql-password"` |  |
+| global.database.secretName | string | `""` |  |
+| global.database.secretValue | string | `""` |  |
+| global.extraContainers | list | `[]` |  |
 | global.imageRegistry | string | `""` |  |
 | global.jobs.kube.annotations | object | `{}` |  |
 | global.jobs.kube.main_container_image_pull_secret | string | `""` |  |
@@ -48,7 +50,7 @@ Helm chart to deploy airbyte-worker
 | global.logs.secretKey.existingSecret | string | `""` |  |
 | global.logs.secretKey.existingSecretKey | string | `""` |  |
 | global.logs.secretKey.password | string | `"minio123"` |  |
-| global.secretName | string | `"airbyte-secrets"` |  |
+| global.secretName | string | `""` |  |
 | global.serviceAccountName | string | `"airbyte-admin"` |  |
 | image.pullPolicy | string | `"IfNotPresent"` |  |
 | image.repository | string | `"airbyte/worker"` |  |

diff --git a/charts/airbyte-worker/templates/deployment.yaml b/charts/airbyte-worker/templates/deployment.yaml
@@ -71,7 +71,7 @@ spec:
           valueFrom:
             secretKeyRef:
                 name: {{ .Values.global.database.secretName | default (printf "%s-postgresql" .Release.Name ) }}
-                key: {{ .Values.global.database.secretValue | default "DATABASE_PASSWORD" }}
+                key: {{ .Values.global.database.secretValue | default "postgresql-password" }}
         - name: DATABASE_URL
           valueFrom:
             configMapKeyRef:
@@ -372,12 +372,15 @@ spec:
 {{ toYaml .Values.extraVolumeMounts | nindent 8 }}
         {{- end }}
       {{- if .Values.extraContainers }}
-      {{ toyaml .Values.extraInitContainers | indent 8 }}
+      {{ toYaml .Values.extraContainers | indent 8 }}
+      {{- end }}
+      {{- if .Values.global.extraContainers }}
+      {{ toYaml .Values.global.extraContainers | indent 8 }}
       {{- end }}
       volumes:
       - name: gcs-log-creds-volume
         secret:
-          secretName: {{ .Release.Name }}-airbyte-gcs-log-creds
+          secretName: {{ ternary (printf "%s-gcs-log-creds" ( .Release.Name )) (.Values.global.credVolumeOverride) (eq .Values.global.deploymentMode "oss") }}
       {{- if .Values.extraVolumes }}
 {{ toYaml .Values.extraVolumes | nindent 6 }}
       {{- end }}
diff --git a/charts/airbyte-worker/values.yaml b/charts/airbyte-worker/values.yaml
@@ -1,12 +1,13 @@
 global:
   imageRegistry: ""
   serviceAccountName: &service-account-name "airbyte-admin"
-
-  secretName: "airbyte-secrets"
+  credVolumeOverride: ""
+  secretName: ""
+  extraContainers: []
   database:
-    secretName: "test-postgresql"
-    secretValue: "postgresql-password"
-    host: "test"
+    secretName: ""
+    secretValue: ""
+    host: "example.com"
     port: "5432"
   logs:
     ## @param logs.accessKey.password Logs Access Key

diff --git a/charts/airbyte/README.md b/charts/airbyte/README.md
@@ -42,8 +42,7 @@ Helm chart to deploy airbyte
 | fullnameOverride | string | `""` |  |
 | global.database.host | string | `"test"` |  |
 | global.database.port | string | `"5432"` |  |
-| global.database.secretName | string | `"test-postgresql"` |  |
-| global.database.secretValue | string | `"postgresql-password"` |  |
+| global.database.secretValue | string | `""` |  |
 | global.deploymentMode | string | `"oss"` |  |
 | global.imageRegistry | string | `""` |  |
 | global.jobs.kube.annotations | object | `{}` |  |