fix: Fix extraEnv, Update OSS charts (#15159)

* fix: Add new labels to all charts + fix indent issue for extraEnv * fix: Update docs, add extraContainers parameter into dependent charts
airbytehq · Aug 1, 2022 · 21b51e3 · 21b51e3
1 parent d44923d
commit 21b51e3
Show file tree

Hide file tree

Showing 18 changed files with 60 additions and 33 deletions.
diff --git a/charts/airbyte-bootloader/README.md b/charts/airbyte-bootloader/README.md
@@ -1,6 +1,6 @@
 # airbyte-bootloader
 
-![Version: 0.39.36](https://img.shields.io/badge/Version-0.39.36-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.39.23-alpha](https://img.shields.io/badge/AppVersion-0.39.23--alpha-informational?style=flat-square)
+![Version: 0.39.36](https://img.shields.io/badge/Version-0.39.36-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.39.41-alpha](https://img.shields.io/badge/AppVersion-0.39.41--alpha-informational?style=flat-square)
 
 Helm chart to deploy airbyte-bootloader
 
@@ -23,7 +23,6 @@ Helm chart to deploy airbyte-bootloader
 | global.serviceAccountName | string | `"placeholderServiceAccounr"` |  |
 | image.pullPolicy | string | `"IfNotPresent"` |  |
 | image.repository | string | `"airbyte/bootloader"` |  |
-| image.tag | string | `"0.39.23-alpha"` |  |
 | nodeSelector | object | `{}` |  |
 | podAnnotations | object | `{}` |  |
 | resources.limits | object | `{}` |  |

diff --git a/charts/airbyte-bootloader/templates/pod.yaml b/charts/airbyte-bootloader/templates/pod.yaml
@@ -9,6 +9,7 @@ metadata:
     helm.sh/chart: {{ include "airbyte.chart" . }}
     app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.airbyte.io/fullname: {{ include "airbyte.fullname" . }}
   annotations:
     helm.sh/hook: pre-install,pre-upgrade
     helm.sh/hook-weight: "0"
@@ -71,7 +72,7 @@ spec:
               key: DATABASE_USER
         {{- end }}
         {{- if .Values.extraEnv }}
-        {{ .Values.extraEnv | toYaml | nindent 8 }}
+        {{ .Values.extraEnv | toYaml | nindent 10 }}
         {{- end }}
 
       resources: {{- toYaml .Values.resources | nindent 8 }}
diff --git a/charts/airbyte-pod-sweeper/README.md b/charts/airbyte-pod-sweeper/README.md
@@ -1,6 +1,6 @@
 # pod-sweeper
 
-![Version: 0.39.36](https://img.shields.io/badge/Version-0.39.36-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.39.23-alpha](https://img.shields.io/badge/AppVersion-0.39.23--alpha-informational?style=flat-square)
+![Version: 0.39.36](https://img.shields.io/badge/Version-0.39.36-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.39.37-alpha](https://img.shields.io/badge/AppVersion-0.39.37--alpha-informational?style=flat-square)
 
 Helm chart to deploy airbyte-pod-sweeper
 

diff --git a/charts/airbyte-pod-sweeper/templates/deployment.yaml b/charts/airbyte-pod-sweeper/templates/deployment.yaml
@@ -9,6 +9,7 @@ metadata:
     helm.sh/chart: {{ include "airbyte.chart" . }}
     app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.airbyte.io/fullname: {{ include "airbyte.fullname" . }}
   annotations:
     checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
 spec:

diff --git a/charts/airbyte-server/README.md b/charts/airbyte-server/README.md
@@ -1,6 +1,6 @@
 # server
 
-![Version: 0.39.36](https://img.shields.io/badge/Version-0.39.36-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.39.23-alpha](https://img.shields.io/badge/AppVersion-0.39.23--alpha-informational?style=flat-square)
+![Version: 0.39.36](https://img.shields.io/badge/Version-0.39.36-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.39.41-alpha](https://img.shields.io/badge/AppVersion-0.39.41--alpha-informational?style=flat-square)
 
 Helm chart to deploy airbyte-server
 
@@ -17,6 +17,7 @@ Helm chart to deploy airbyte-server
 | affinity | object | `{}` |  |
 | containerSecurityContext | object | `{}` |  |
 | enabled | bool | `true` |  |
+| extraContainers | list | `[]` |  |
 | extraEnv | list | `[]` |  |
 | extraVolumeMounts | list | `[]` |  |
 | extraVolumes | list | `[]` |  |
@@ -45,7 +46,6 @@ Helm chart to deploy airbyte-server
 | global.serviceAccountName | string | `"placeholderServiceAccounr"` |  |
 | image.pullPolicy | string | `"IfNotPresent"` |  |
 | image.repository | string | `"airbyte/server"` |  |
-| image.tag | string | `"0.39.23-alpha"` |  |
 | livenessProbe.enabled | bool | `true` |  |
 | livenessProbe.failureThreshold | int | `3` |  |
 | livenessProbe.initialDelaySeconds | int | `30` |  |

diff --git a/charts/airbyte-server/templates/deployment.yaml b/charts/airbyte-server/templates/deployment.yaml
@@ -9,6 +9,7 @@ metadata:
     helm.sh/chart: {{ include "airbyte.chart" . }}
     app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.airbyte.io/fullname: {{ include "airbyte.fullname" . }}
 spec:
   replicas: {{ .Values.replicaCount }}
   selector:
@@ -187,7 +188,7 @@ spec:
               key: JOBS_DATABASE_MINIMUM_FLYWAY_MIGRATION_VERSION
         {{- end }}
         {{- if .Values.extraEnv }}
-        {{ .Values.extraEnv | toYaml | nindent 8 }}
+        {{ .Values.extraEnv | toYaml | nindent 10 }}
         {{- end }}
         {{- if .Values.livenessProbe.enabled }}
         livenessProbe:
@@ -228,6 +229,9 @@ spec:
         {{- if .Values.extraVolumeMounts }}
   {{ toYaml .Values.extraVolumeMounts | nindent 8 }}
         {{- end }}
+      {{- if .Values.extraContainers }}
+      {{ toyaml .Values.extraInitContainers | indent 8 }}
+      {{- end }}
       volumes:
       - name: gcs-log-creds-volume
         secret:

diff --git a/charts/airbyte-server/values.yaml b/charts/airbyte-server/values.yaml
@@ -179,4 +179,6 @@ extraVolumeMounts: []
 ##   - name: tmpdir
 ##     emptyDir: {}
 ##
-extraVolumes: []
+extraVolumes: []
+
+extraContainers: []
diff --git a/charts/airbyte-temporal/Chart.lock b/charts/airbyte-temporal/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-01T13:47:22.787946+03:00"
diff --git a/charts/airbyte-temporal/README.md b/charts/airbyte-temporal/README.md
@@ -1,6 +1,6 @@
 # temporal
 
-![Version: 0.39.36](https://img.shields.io/badge/Version-0.39.36-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.39.23-alpha](https://img.shields.io/badge/AppVersion-0.39.23--alpha-informational?style=flat-square)
+![Version: 0.39.36](https://img.shields.io/badge/Version-0.39.36-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.39.41-alpha](https://img.shields.io/badge/AppVersion-0.39.41--alpha-informational?style=flat-square)
 
 Helm chart to deploy airbyte-temporal
 
@@ -17,6 +17,7 @@ Helm chart to deploy airbyte-temporal
 | affinity | object | `{}` |  |
 | containerSecurityContext | object | `{}` |  |
 | enabled | bool | `true` |  |
+| extraContainers | list | `[]` |  |
 | extraEnv | list | `[]` |  |
 | extraInitContainers | list | `[]` |  |
 | extraVolumeMounts | list | `[]` |  |

diff --git a/charts/airbyte-temporal/templates/deployment.yaml b/charts/airbyte-temporal/templates/deployment.yaml
@@ -9,6 +9,7 @@ metadata:
     helm.sh/chart: {{ include "airbyte.chart" . }}
     app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.airbyte.io/fullname: {{ include "airbyte.fullname" . }}
 spec:
   replicas: {{ .Values.replicaCount }}
   selector:
@@ -108,6 +109,9 @@ spec:
           successThreshold: {{ .Values.readinessProbe.successThreshold }}
           failureThreshold: {{ .Values.readinessProbe.failureThreshold }}
         {{- end }}
+        {{- if .Values.extraContainers }}
+        {{ toyaml .Values.extraInitContainers | indent 8 }}
+        {{- end }}
       volumes:
       - name: airbyte-temporal-dynamicconfig
         configMap:

diff --git a/charts/airbyte-temporal/values.yaml b/charts/airbyte-temporal/values.yaml
@@ -149,4 +149,6 @@ resources:
   ## limits:
   ##    cpu: 200m
   ##    memory: 1Gi
-  limits: {}
+  limits: {}
+
+extraContainers: []
diff --git a/charts/airbyte-webapp/README.md b/charts/airbyte-webapp/README.md
@@ -1,6 +1,6 @@
 # webapp
 
-![Version: 0.39.36](https://img.shields.io/badge/Version-0.39.36-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.39.23-alpha](https://img.shields.io/badge/AppVersion-0.39.23--alpha-informational?style=flat-square)
+![Version: 0.39.36](https://img.shields.io/badge/Version-0.39.36-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.39.41-alpha](https://img.shields.io/badge/AppVersion-0.39.41--alpha-informational?style=flat-square)
 
 Helm chart to deploy airbyte-webapp
 
@@ -18,6 +18,7 @@ Helm chart to deploy airbyte-webapp
 | api.url | string | `"/api/v1/"` |  |
 | containerSecurityContext | object | `{}` |  |
 | enabled | bool | `true` |  |
+| extraContainers | list | `[]` |  |
 | extraEnv | list | `[]` |  |
 | extraVolumeMounts | list | `[]` |  |
 | extraVolumes | list | `[]` |  |
@@ -31,7 +32,6 @@ Helm chart to deploy airbyte-webapp
 | global.serviceAccountName | string | `"placeholderServiceAccounr"` |  |
 | image.pullPolicy | string | `"IfNotPresent"` |  |
 | image.repository | string | `"airbyte/webapp"` |  |
-| image.tag | string | `"0.39.23-alpha"` |  |
 | ingress.annotations | object | `{}` |  |
 | ingress.className | string | `""` |  |
 | ingress.enabled | bool | `false` |  |

diff --git a/charts/airbyte-webapp/templates/deployment.yaml b/charts/airbyte-webapp/templates/deployment.yaml
@@ -9,6 +9,7 @@ metadata:
     helm.sh/chart: {{ include "airbyte.chart" . }}
     app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.airbyte.io/fullname: {{ include "airbyte.fullname" . }}
 spec:
   replicas: {{ .Values.replicaCount }}
   selector:
@@ -76,7 +77,7 @@ spec:
               key: INTERNAL_API_HOST
         {{- end }}
         {{- if .Values.extraEnv }}
-        {{ .Values.extraEnv | toYaml | nindent 8 }}
+        {{ .Values.extraEnv | toYaml | nindent 10 }}
         {{- end }}
         {{- if .Values.livenessProbe.enabled }}
         livenessProbe:
@@ -113,6 +114,9 @@ spec:
         {{- if .Values.extraVolumeMounts }}
   {{ toYaml .Values.extraVolumeMounts | nindent 8 }}
         {{- end }}
+      {{- if .Values.extraContainers }}
+      {{ toyaml .Values.extraInitContainers | indent 8 }}
+      {{- end }}
       volumes:
       {{- if .Values.extraVolumes }}
 {{ toYaml .Values.extraVolumes | nindent 6 }}

diff --git a/charts/airbyte-webapp/values.yaml b/charts/airbyte-webapp/values.yaml
@@ -174,4 +174,6 @@ extraVolumeMounts: []
 ##   - name: nginx-conf-d
 ##     emptyDir: {}
 ##
-extraVolumes: []
+extraVolumes: []
+
+extraContainers: []
diff --git a/charts/airbyte-worker/README.md b/charts/airbyte-worker/README.md
@@ -1,6 +1,6 @@
 # worker
 
-![Version: 0.39.36](https://img.shields.io/badge/Version-0.39.36-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.39.37-alpha](https://img.shields.io/badge/AppVersion-0.39.37--alpha-informational?style=flat-square)
+![Version: 0.39.36](https://img.shields.io/badge/Version-0.39.36-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.39.41-alpha](https://img.shields.io/badge/AppVersion-0.39.41--alpha-informational?style=flat-square)
 
 Helm chart to deploy airbyte-worker
 
@@ -17,6 +17,7 @@ Helm chart to deploy airbyte-worker
 | affinity | object | `{}` |  |
 | containerSecurityContext | object | `{}` |  |
 | enabled | bool | `true` |  |
+| extraContainers | list | `[]` |  |
 | extraEnv | list | `[]` |  |
 | extraVolumeMounts | list | `[]` |  |
 | extraVolumes | list | `[]` |  |
@@ -51,7 +52,6 @@ Helm chart to deploy airbyte-worker
 | global.serviceAccountName | string | `"airbyte-admin"` |  |
 | image.pullPolicy | string | `"IfNotPresent"` |  |
 | image.repository | string | `"airbyte/worker"` |  |
-| image.tag | string | `"0.39.23-alpha"` |  |
 | livenessProbe.enabled | bool | `true` |  |
 | livenessProbe.failureThreshold | int | `3` |  |
 | livenessProbe.initialDelaySeconds | int | `30` |  |

diff --git a/charts/airbyte-worker/templates/deployment.yaml b/charts/airbyte-worker/templates/deployment.yaml
@@ -9,6 +9,7 @@ metadata:
     helm.sh/chart: {{ include "airbyte.chart" . }}
     app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.airbyte.io/fullname: {{ include "airbyte.fullname" . }}
 spec:
   replicas: {{ .Values.replicaCount }}
   selector:
@@ -300,7 +301,7 @@ spec:
               key: USE_STREAM_CAPABLE_STATE
         {{- end }}
         {{- if .Values.extraEnv }}
-        {{ .Values.extraEnv | toYaml | nindent 8 }}
+        {{ .Values.extraEnv | toYaml | nindent 10 }}
         {{- end }}
         {{- if .Values.livenessProbe.enabled }}
         livenessProbe:
@@ -370,6 +371,9 @@ spec:
         {{- if .Values.extraVolumeMounts }}
 {{ toYaml .Values.extraVolumeMounts | nindent 8 }}
         {{- end }}
+      {{- if .Values.extraContainers }}
+      {{ toyaml .Values.extraInitContainers | indent 8 }}
+      {{- end }}
       volumes:
       - name: gcs-log-creds-volume
         secret:

diff --git a/charts/airbyte-worker/values.yaml b/charts/airbyte-worker/values.yaml
@@ -219,4 +219,6 @@ extraVolumeMounts: []
 ##   - name: tmpdir
 ##     emptyDir: {}
 ##
-extraVolumes: []
+extraVolumes: []
+
+extraContainers: []
diff --git a/charts/airbyte/README.md b/charts/airbyte/README.md
@@ -1,19 +1,19 @@
 # airbyte
 
-![Version: 0.39.36](https://img.shields.io/badge/Version-0.39.36-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.39.41-alpha](https://img.shields.io/badge/AppVersion-0.39.37--alpha-informational?style=flat-square)
+![Version: 0.39.36](https://img.shields.io/badge/Version-0.39.36-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.39.41-alpha](https://img.shields.io/badge/AppVersion-0.39.41--alpha-informational?style=flat-square)
 
 Helm chart to deploy airbyte
 
 ## Requirements
 
 | Repository | Name | Version |
 |------------|------|---------|
-| https://airbytehq.github.io/helm-charts/ | airbyte-bootloader | 0.43.3 |
-| https://airbytehq.github.io/helm-charts/ | pod-sweeper | 0.43.3 |
-| https://airbytehq.github.io/helm-charts/ | server | 0.43.3 |
-| https://airbytehq.github.io/helm-charts/ | temporal | 0.43.3 |
-| https://airbytehq.github.io/helm-charts/ | webapp | 0.43.3 |
-| https://airbytehq.github.io/helm-charts/ | worker | 0.43.3 |
+| https://airbytehq.github.io/helm-charts/ | airbyte-bootloader | placeholder |
+| https://airbytehq.github.io/helm-charts/ | pod-sweeper | placeholder |
+| https://airbytehq.github.io/helm-charts/ | server | placeholder |
+| https://airbytehq.github.io/helm-charts/ | temporal | placeholder |
+| https://airbytehq.github.io/helm-charts/ | webapp | placeholder |
+| https://airbytehq.github.io/helm-charts/ | worker | placeholder |
 | https://charts.bitnami.com/bitnami | common | 1.x.x |
 | https://charts.bitnami.com/bitnami | minio | 11.x.x |
 | https://charts.bitnami.com/bitnami | postgresql | 10.x.x |
@@ -26,7 +26,7 @@ Helm chart to deploy airbyte
 | airbyte-bootloader.enabled | bool | `true` |  |
 | airbyte-bootloader.image.pullPolicy | string | `"IfNotPresent"` |  |
 | airbyte-bootloader.image.repository | string | `"airbyte/bootloader"` |  |
-| airbyte-bootloader.image.tag | string | `"0.39.36-alpha"` |  |
+| airbyte-bootloader.image.tag | string | `"0.39.41-alpha"` |  |
 | airbyte-bootloader.nodeSelector | object | `{}` |  |
 | airbyte-bootloader.podAnnotations | object | `{}` |  |
 | airbyte-bootloader.resources.limits | object | `{}` |  |
@@ -44,6 +44,7 @@ Helm chart to deploy airbyte
 | global.database.port | string | `"5432"` |  |
 | global.database.secretName | string | `"test-postgresql"` |  |
 | global.database.secretValue | string | `"postgresql-password"` |  |
+| global.deploymentMode | string | `"oss"` |  |
 | global.imageRegistry | string | `""` |  |
 | global.jobs.kube.annotations | object | `{}` |  |
 | global.jobs.kube.main_container_image_pull_secret | string | `""` |  |
@@ -113,7 +114,7 @@ Helm chart to deploy airbyte
 | server.extraVolumes | list | `[]` |  |
 | server.image.pullPolicy | string | `"IfNotPresent"` |  |
 | server.image.repository | string | `"airbyte/server"` |  |
-| server.image.tag | string | `"0.39.36-alpha"` |  |
+| server.image.tag | string | `"0.39.41-alpha"` |  |
 | server.livenessProbe.enabled | bool | `true` |  |
 | server.livenessProbe.failureThreshold | int | `3` |  |
 | server.livenessProbe.initialDelaySeconds | int | `30` |  |
@@ -147,7 +148,7 @@ Helm chart to deploy airbyte
 | temporal.extraVolumes | list | `[]` |  |
 | temporal.image.pullPolicy | string | `"IfNotPresent"` |  |
 | temporal.image.repository | string | `"temporalio/auto-setup"` |  |
-| temporal.image.tag | string | `"1.7.0"` |  |
+| temporal.image.tag | string | `"1.13.0"` |  |
 | temporal.livenessProbe.enabled | bool | `true` |  |
 | temporal.livenessProbe.failureThreshold | int | `3` |  |
 | temporal.livenessProbe.initialDelaySeconds | int | `5` |  |
@@ -179,7 +180,7 @@ Helm chart to deploy airbyte
 | webapp.fullstory.enabled | bool | `false` |  |
 | webapp.image.pullPolicy | string | `"IfNotPresent"` |  |
 | webapp.image.repository | string | `"airbyte/webapp"` |  |
-| webapp.image.tag | string | `"0.39.36-alpha"` |  |
+| webapp.image.tag | string | `"0.39.41-alpha"` |  |
 | webapp.ingress.annotations | object | `{}` |  |
 | webapp.ingress.className | string | `""` |  |
 | webapp.ingress.enabled | bool | `false` |  |
@@ -215,7 +216,7 @@ Helm chart to deploy airbyte
 | worker.extraVolumes | list | `[]` |  |
 | worker.image.pullPolicy | string | `"IfNotPresent"` |  |
 | worker.image.repository | string | `"airbyte/worker"` |  |
-| worker.image.tag | string | `"0.39.36-alpha"` |  |
+| worker.image.tag | string | `"0.39.41-alpha"` |  |
 | worker.livenessProbe.enabled | bool | `true` |  |
 | worker.livenessProbe.failureThreshold | int | `3` |  |
 | worker.livenessProbe.initialDelaySeconds | int | `30` |  |