From 2fe82f0bc2bc2738affea51f1d0565331cc9e607 Mon Sep 17 00:00:00 2001 From: Rose Hooper Date: Mon, 31 Oct 2022 15:10:46 -0400 Subject: [PATCH 1/5] switch temporal to 1.13.4 in chart values - works with amd64/arm64 --- charts/airbyte-temporal/README.md | 4 ++-- charts/airbyte-temporal/values.yaml | 7 ++----- charts/airbyte/values.yaml | 17 ++--------------- charts/airbyte/values.yaml.test | 2 +- docs/troubleshooting/on-deploying.md | 2 +- .../dev-integration-test/kustomization.yaml | 2 +- kube/overlays/dev/kustomization.yaml | 2 +- .../kustomization.yaml | 2 +- kube/overlays/stable/kustomization.yaml | 2 +- 9 files changed, 12 insertions(+), 28 deletions(-) diff --git a/charts/airbyte-temporal/README.md b/charts/airbyte-temporal/README.md index caaafbc5dcf253..2b72d7a743ea40 100644 --- 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.40.4](https://img.shields.io/badge/AppVersion-0.40.4-informational?style=flat-square) +![Version: 0.40.33](https://img.shields.io/badge/Version-0.40.33-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.40.17](https://img.shields.io/badge/AppVersion-0.40.17-informational?style=flat-square) Helm chart to deploy airbyte-temporal @@ -34,7 +34,7 @@ Helm chart to deploy airbyte-temporal | global.serviceAccountName | string | `"placeholderServiceAccount"` | | | image.pullPolicy | string | `"IfNotPresent"` | | | image.repository | string | `"temporalio/auto-setup"` | | -| image.tag | string | `"1.7.0"` | | +| image.tag | string | `"1.13.4"` | | | livenessProbe.enabled | bool | `true` | | | livenessProbe.failureThreshold | int | `3` | | | livenessProbe.initialDelaySeconds | int | `5` | | diff --git a/charts/airbyte-temporal/values.yaml b/charts/airbyte-temporal/values.yaml index 215818f4e7ea68..3a0faf4fe2addc 100644 --- a/charts/airbyte-temporal/values.yaml +++ b/charts/airbyte-temporal/values.yaml @@ -1,4 +1,3 @@ - global: serviceAccountName: placeholderServiceAccount deploymentMode: oss @@ -11,7 +10,6 @@ global: host: "example.com" port: "5432" - enabled: true ## temporal.replicaCount The number of temporal replicas to deploy replicaCount: 1 @@ -22,7 +20,7 @@ replicaCount: 1 image: repository: temporalio/auto-setup pullPolicy: IfNotPresent - tag: "1.7.0" + tag: "1.13.4" ## temporal.service.type The Kubernetes Service Type ## temporal.service.port The temporal port and exposed kubernetes port @@ -46,7 +44,7 @@ containerSecurityContext: {} ## Examples (when using `temporal.containerSecurityContext.readOnlyRootFilesystem=true`): ## extraInitContainers: ## - name: config-loader -## image: temporalio/auto-setup:1.7.0 +## image: temporalio/auto-setup:1.13.4 ## command: ## - /bin/sh ## - -c @@ -154,7 +152,6 @@ resources: extraContainers: [] - ## secrets [object] Supply additional secrets to container ## Example: ## secrets: diff --git a/charts/airbyte/values.yaml b/charts/airbyte/values.yaml index 1c5ec6ccbff04b..a5dcbf419b89de 100644 --- a/charts/airbyte/values.yaml +++ b/charts/airbyte/values.yaml @@ -4,14 +4,11 @@ ## global -- Global params that are overwritten with umbrella chart global: - - ## serviceAccountName -- Service Account name override serviceAccountName: &service-account-name "airbyte-admin" ## deploymentMode -- Deployment mode, whether or not render the default env vars and volumes in deployment spec deploymentMode: "oss" - ## database [object] -- Object used to overrite database configuration(to use external DB) ## database.secretName -- secret name where DB creds are stored ## database.secretValue -- secret value for database password @@ -290,7 +287,6 @@ webapp: fullstory: enabled: false - ## webapp.extraVolumeMounts [array] Additional volumeMounts for webapp container(s). ## Examples (when using `webapp.containerSecurityContext.readOnlyRootFilesystem=true`): ## extraVolumeMounts: @@ -383,10 +379,6 @@ webapp: ## DATABASE_PORT: 5432 env_vars: {} - - - - ## @section Pod Sweeper parameters pod-sweeper: @@ -591,8 +583,6 @@ server: log: level: "INFO" - - ## server.extraVolumeMounts [array] Additional volumeMounts for server container(s). ## Examples (when using `server.containerSecurityContext.readOnlyRootFilesystem=true`): ## extraVolumeMounts: @@ -1079,7 +1069,7 @@ temporal: ## Examples (when using `temporal.containerSecurityContext.readOnlyRootFilesystem=true`): ## extraInitContainers: ## - name: config-loader - ## image: temporalio/auto-setup:1.7.0 + ## image: temporalio/auto-setup:1.13.4 ## command: ## - /bin/sh ## - -c @@ -1234,7 +1224,6 @@ minio: rootUser: minio rootPassword: minio123 - ## @section cron parameters cron: @@ -1332,8 +1321,6 @@ cron: log: level: "INFO" - - ## cron.extraVolumeMounts [array] Additional volumeMounts for cron container(s). ## Examples (when using `cron.containerSecurityContext.readOnlyRootFilesystem=true`): ## extraVolumeMounts: @@ -1417,4 +1404,4 @@ cron: ## env_vars: ## DATABASE_HOST: airbyte-db ## DATABASE_PORT: 5432 - env_vars: {} \ No newline at end of file + env_vars: {} diff --git a/charts/airbyte/values.yaml.test b/charts/airbyte/values.yaml.test index 0c707d4719a612..341d68a12e6cf4 100644 --- a/charts/airbyte/values.yaml.test +++ b/charts/airbyte/values.yaml.test @@ -1058,7 +1058,7 @@ temporal: ## Examples (when using `temporal.containerSecurityContext.readOnlyRootFilesystem=true`): ## extraInitContainers: ## - name: config-loader - ## image: temporalio/auto-setup:1.7.0 + ## image: temporalio/auto-setup:1.13.4 ## command: ## - /bin/sh ## - -c diff --git a/docs/troubleshooting/on-deploying.md b/docs/troubleshooting/on-deploying.md index e449752d447024..ff0c1023432eab 100644 --- a/docs/troubleshooting/on-deploying.md +++ b/docs/troubleshooting/on-deploying.md @@ -44,7 +44,7 @@ CONTAINER ID IMAGE COMMAND CREATED f02fc709b130 airbyte/server:1.11.1-alpha "/bin/bash -c './wai…" 2 hours ago Up 2 hours 8000/tcp, [...] :::8001->8001/tcp airbyte-server 153b2b322870 airbyte/webapp:1.11.1-alpha "/docker-entrypoint.…" 2 hours ago Up 2 hours :::8000->80/tcp airbyte-webapp b88d94652268 airbyte/db:1.11.1-alpha "docker-entrypoint.s…" 2 hours ago Up 2 hours 5432/tcp airbyte-db -0573681a10e0 temporalio/auto-setup:1.7.0 "/entrypoint.sh /bin…" 2 hours ago Up 2 hours 6933-6935/tcp, [...] airbyte-temporal +0573681a10e0 temporalio/auto-setup:1.13.4 "/entrypoint.sh /bin…" 2 hours ago Up 2 hours 6933-6935/tcp, [...] airbyte-temporal ``` You must see 4 containers running. If you are not seeing execute the following steps: diff --git a/kube/overlays/dev-integration-test/kustomization.yaml b/kube/overlays/dev-integration-test/kustomization.yaml index e2add7588d9f15..2a0ecee9ebad88 100644 --- a/kube/overlays/dev-integration-test/kustomization.yaml +++ b/kube/overlays/dev-integration-test/kustomization.yaml @@ -18,7 +18,7 @@ images: - name: airbyte/worker newTag: dev - name: temporalio/auto-setup - newTag: 1.7.0 + newTag: 1.13.4 - name: airbyte/cron newTag: dev diff --git a/kube/overlays/dev/kustomization.yaml b/kube/overlays/dev/kustomization.yaml index fb29ae23858176..15fc5af798b96d 100644 --- a/kube/overlays/dev/kustomization.yaml +++ b/kube/overlays/dev/kustomization.yaml @@ -18,7 +18,7 @@ images: - name: airbyte/worker newTag: dev - name: temporalio/auto-setup - newTag: 1.7.0 + newTag: 1.13.4 - name: airbyte/cron newTag: dev diff --git a/kube/overlays/stable-with-resource-limits/kustomization.yaml b/kube/overlays/stable-with-resource-limits/kustomization.yaml index 624c5994f469b9..93e5282e487e35 100644 --- a/kube/overlays/stable-with-resource-limits/kustomization.yaml +++ b/kube/overlays/stable-with-resource-limits/kustomization.yaml @@ -18,7 +18,7 @@ images: - name: airbyte/worker newTag: 0.40.17 - name: temporalio/auto-setup - newTag: 1.7.0 + newTag: 1.13.4 - name: airbyte/cron newTag: 0.40.17 diff --git a/kube/overlays/stable/kustomization.yaml b/kube/overlays/stable/kustomization.yaml index ec9936bd0c5d98..302cc0143f9ad6 100644 --- a/kube/overlays/stable/kustomization.yaml +++ b/kube/overlays/stable/kustomization.yaml @@ -18,7 +18,7 @@ images: - name: airbyte/worker newTag: 0.40.17 - name: temporalio/auto-setup - newTag: 1.7.0 + newTag: 1.13.4 - name: airbyte/cron newTag: 0.40.17 From ab9d2285fc7cde9731044bc8b0c5983eef26bf0d Mon Sep 17 00:00:00 2001 From: Rose Hooper Date: Mon, 31 Oct 2022 17:44:10 -0400 Subject: [PATCH 2/5] fix: use airbyte/temporal-auto-setup:1.13.0 --- charts/airbyte-temporal/README.md | 4 ++-- charts/airbyte-temporal/values.yaml | 6 +++--- charts/airbyte/README.md | 8 ++++---- charts/airbyte/values.yaml | 6 +++--- charts/airbyte/values.yaml.test | 6 +++--- docs/troubleshooting/on-deploying.md | 2 +- kube/overlays/dev-integration-test/kustomization.yaml | 4 ++-- kube/overlays/dev/kustomization.yaml | 4 ++-- kube/overlays/stable/kustomization.yaml | 4 ++-- kube/resources/temporal.yaml | 2 +- 10 files changed, 23 insertions(+), 23 deletions(-) diff --git a/charts/airbyte-temporal/README.md b/charts/airbyte-temporal/README.md index 2b72d7a743ea40..6a4c7164660ef2 100644 --- a/charts/airbyte-temporal/README.md +++ b/charts/airbyte-temporal/README.md @@ -33,8 +33,8 @@ Helm chart to deploy airbyte-temporal | global.secretName | string | `""` | | | global.serviceAccountName | string | `"placeholderServiceAccount"` | | | image.pullPolicy | string | `"IfNotPresent"` | | -| image.repository | string | `"temporalio/auto-setup"` | | -| image.tag | string | `"1.13.4"` | | +| image.repository | string | `"airbyte/temporal-auto-setup"` | | +| image.tag | string | `"1.13.0"` | | | livenessProbe.enabled | bool | `true` | | | livenessProbe.failureThreshold | int | `3` | | | livenessProbe.initialDelaySeconds | int | `5` | | diff --git a/charts/airbyte-temporal/values.yaml b/charts/airbyte-temporal/values.yaml index 3a0faf4fe2addc..66d8cf53169964 100644 --- a/charts/airbyte-temporal/values.yaml +++ b/charts/airbyte-temporal/values.yaml @@ -18,9 +18,9 @@ replicaCount: 1 ## temporal.image.pullPolicy The pull policy for the temporal image ## temporal.image.tag The temporal image tag to use image: - repository: temporalio/auto-setup + repository: airbyte/temporal-auto-setup pullPolicy: IfNotPresent - tag: "1.13.4" + tag: "1.13.0" ## temporal.service.type The Kubernetes Service Type ## temporal.service.port The temporal port and exposed kubernetes port @@ -44,7 +44,7 @@ containerSecurityContext: {} ## Examples (when using `temporal.containerSecurityContext.readOnlyRootFilesystem=true`): ## extraInitContainers: ## - name: config-loader -## image: temporalio/auto-setup:1.13.4 +## image: airbyte/temporal-auto-setup:1.13.0 ## command: ## - /bin/sh ## - -c diff --git a/charts/airbyte/README.md b/charts/airbyte/README.md index 7efbd55200eeaa..948c76cd27fe33 100644 --- a/charts/airbyte/README.md +++ b/charts/airbyte/README.md @@ -1,6 +1,6 @@ # 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.40.17](https://img.shields.io/badge/AppVersion-0.40.17-informational?style=flat-square) +![Version: 0.40.33](https://img.shields.io/badge/Version-0.40.33-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.40.17](https://img.shields.io/badge/AppVersion-0.40.17-informational?style=flat-square) Helm chart to deploy airbyte @@ -174,8 +174,8 @@ Helm chart to deploy airbyte | temporal.extraVolumeMounts | list | `[]` | | | temporal.extraVolumes | list | `[]` | | | temporal.image.pullPolicy | string | `"IfNotPresent"` | | -| temporal.image.repository | string | `"temporalio/auto-setup"` | | -| temporal.image.tag | string | `"1.7.0"` | | +| temporal.image.repository | string | `"airbyte/temporal-auto-setup"` | | +| temporal.image.tag | string | `"1.13.0"` | | | temporal.livenessProbe.enabled | bool | `true` | | | temporal.livenessProbe.failureThreshold | int | `3` | | | temporal.livenessProbe.initialDelaySeconds | int | `5` | | @@ -242,13 +242,13 @@ Helm chart to deploy airbyte | worker.containerOrchestrator.image | string | `""` | | | worker.containerSecurityContext | object | `{}` | | | worker.enabled | bool | `true` | | +| worker.extraContainers | list | `[]` | | | worker.extraEnv | list | `[]` | | | worker.extraVolumeMounts | list | `[]` | | | worker.extraVolumes | list | `[]` | | | worker.hpa.enabled | bool | `false` | | | worker.image.pullPolicy | string | `"IfNotPresent"` | | | worker.image.repository | string | `"airbyte/worker"` | | -| worker.image.tag | string | `"0.40.17"` | | | worker.livenessProbe.enabled | bool | `true` | | | worker.livenessProbe.failureThreshold | int | `3` | | | worker.livenessProbe.initialDelaySeconds | int | `30` | | diff --git a/charts/airbyte/values.yaml b/charts/airbyte/values.yaml index a5dcbf419b89de..7aaa61eb877f41 100644 --- a/charts/airbyte/values.yaml +++ b/charts/airbyte/values.yaml @@ -1043,9 +1043,9 @@ temporal: ## temporal.image.pullPolicy The pull policy for the temporal image ## temporal.image.tag The temporal image tag to use image: - repository: temporalio/auto-setup + repository: airbyte/temporal-auto-setup pullPolicy: IfNotPresent - tag: "1.7.0" + tag: "1.13.0" ## temporal.service.type The Kubernetes Service Type ## temporal.service.port The temporal port and exposed kubernetes port @@ -1069,7 +1069,7 @@ temporal: ## Examples (when using `temporal.containerSecurityContext.readOnlyRootFilesystem=true`): ## extraInitContainers: ## - name: config-loader - ## image: temporalio/auto-setup:1.13.4 + ## image: airbyte/temporal-auto-setup:1.13.4 ## command: ## - /bin/sh ## - -c diff --git a/charts/airbyte/values.yaml.test b/charts/airbyte/values.yaml.test index 341d68a12e6cf4..095bd46d30d210 100644 --- a/charts/airbyte/values.yaml.test +++ b/charts/airbyte/values.yaml.test @@ -1032,9 +1032,9 @@ temporal: ## temporal.image.pullPolicy The pull policy for the temporal image ## temporal.image.tag The temporal image tag to use image: - repository: temporalio/auto-setup + repository: airbyte/temporal-auto-setup pullPolicy: IfNotPresent - tag: "1.7.0" + tag: "1.13.0" ## temporal.service.type The Kubernetes Service Type ## temporal.service.port The temporal port and exposed kubernetes port @@ -1058,7 +1058,7 @@ temporal: ## Examples (when using `temporal.containerSecurityContext.readOnlyRootFilesystem=true`): ## extraInitContainers: ## - name: config-loader - ## image: temporalio/auto-setup:1.13.4 + ## image: airbyte/temporal-auto-setup:1.13.0 ## command: ## - /bin/sh ## - -c diff --git a/docs/troubleshooting/on-deploying.md b/docs/troubleshooting/on-deploying.md index ff0c1023432eab..8a9186e367993a 100644 --- a/docs/troubleshooting/on-deploying.md +++ b/docs/troubleshooting/on-deploying.md @@ -44,7 +44,7 @@ CONTAINER ID IMAGE COMMAND CREATED f02fc709b130 airbyte/server:1.11.1-alpha "/bin/bash -c './wai…" 2 hours ago Up 2 hours 8000/tcp, [...] :::8001->8001/tcp airbyte-server 153b2b322870 airbyte/webapp:1.11.1-alpha "/docker-entrypoint.…" 2 hours ago Up 2 hours :::8000->80/tcp airbyte-webapp b88d94652268 airbyte/db:1.11.1-alpha "docker-entrypoint.s…" 2 hours ago Up 2 hours 5432/tcp airbyte-db -0573681a10e0 temporalio/auto-setup:1.13.4 "/entrypoint.sh /bin…" 2 hours ago Up 2 hours 6933-6935/tcp, [...] airbyte-temporal +0573681a10e0 airbyte/temporal-auto-setup:1.13.4 "/entrypoint.sh /bin…" 2 hours ago Up 2 hours 6933-6935/tcp, [...] airbyte-temporal ``` You must see 4 containers running. If you are not seeing execute the following steps: diff --git a/kube/overlays/dev-integration-test/kustomization.yaml b/kube/overlays/dev-integration-test/kustomization.yaml index 2a0ecee9ebad88..6ca068ef6c99d8 100644 --- a/kube/overlays/dev-integration-test/kustomization.yaml +++ b/kube/overlays/dev-integration-test/kustomization.yaml @@ -17,8 +17,8 @@ images: newTag: dev - name: airbyte/worker newTag: dev - - name: temporalio/auto-setup - newTag: 1.13.4 + - name: airbyte/temporal-auto-setup + newTag: 1.13.0 - name: airbyte/cron newTag: dev diff --git a/kube/overlays/dev/kustomization.yaml b/kube/overlays/dev/kustomization.yaml index 15fc5af798b96d..466bfe9bb56d71 100644 --- a/kube/overlays/dev/kustomization.yaml +++ b/kube/overlays/dev/kustomization.yaml @@ -17,8 +17,8 @@ images: newTag: dev - name: airbyte/worker newTag: dev - - name: temporalio/auto-setup - newTag: 1.13.4 + - name: airbyte/temporal-auto-setup + newTag: 1.13.0 - name: airbyte/cron newTag: dev diff --git a/kube/overlays/stable/kustomization.yaml b/kube/overlays/stable/kustomization.yaml index 302cc0143f9ad6..f97259b8f78807 100644 --- a/kube/overlays/stable/kustomization.yaml +++ b/kube/overlays/stable/kustomization.yaml @@ -17,8 +17,8 @@ images: newTag: 0.40.17 - name: airbyte/worker newTag: 0.40.17 - - name: temporalio/auto-setup - newTag: 1.13.4 + - name: airbyte/temporal-auto-setup + newTag: 1.13.0 - name: airbyte/cron newTag: 0.40.17 diff --git a/kube/resources/temporal.yaml b/kube/resources/temporal.yaml index 9a4cf5af14949a..11f5d2df3e7f45 100644 --- a/kube/resources/temporal.yaml +++ b/kube/resources/temporal.yaml @@ -75,7 +75,7 @@ spec: spec: containers: - name: airbyte-temporal - image: temporalio/auto-setup:1.7.0 + image: airbyte/temporal-auto-setup:1.13.0 env: - name: POSTGRES_USER valueFrom: From 268fd605eac94f29d5ffbd1461274310c3700f6a Mon Sep 17 00:00:00 2001 From: Marcos Marx Date: Thu, 15 Dec 2022 14:23:17 -0300 Subject: [PATCH 3/5] Update kustomization.yaml --- kube/overlays/stable/kustomization.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kube/overlays/stable/kustomization.yaml b/kube/overlays/stable/kustomization.yaml index 12708b46141c1c..7bac89f7f16128 100644 --- a/kube/overlays/stable/kustomization.yaml +++ b/kube/overlays/stable/kustomization.yaml @@ -17,7 +17,7 @@ images: newTag: 0.40.25 - name: airbyte/worker newTag: 0.40.25 - - name: temporalio/auto-setup + - name: airbyte/temporal-auto-setup newTag: 1.13.0 - name: airbyte/cron newTag: 0.40.25 From 1618691027d3dde11cf73b003699369a5dcca27f Mon Sep 17 00:00:00 2001 From: Marcos Marx Date: Thu, 15 Dec 2022 14:24:41 -0300 Subject: [PATCH 4/5] Update kustomization.yaml --- kube/overlays/stable-with-resource-limits/kustomization.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kube/overlays/stable-with-resource-limits/kustomization.yaml b/kube/overlays/stable-with-resource-limits/kustomization.yaml index 1220d653245b12..a56d4cb900b2ed 100644 --- a/kube/overlays/stable-with-resource-limits/kustomization.yaml +++ b/kube/overlays/stable-with-resource-limits/kustomization.yaml @@ -17,8 +17,8 @@ images: newTag: 0.40.25 - name: airbyte/worker newTag: 0.40.25 - - name: temporalio/auto-setup - newTag: 1.13.4 + - name: airbyte/temporal-auto-setup + newTag: 1.13.0 - name: airbyte/cron newTag: 0.40.25 - name: airbyte/connector-builder-server From 06c3b307dbdc6e5b1ad812ebfda9408a2f8f07cd Mon Sep 17 00:00:00 2001 From: Marcos Marx Date: Thu, 15 Dec 2022 14:25:16 -0300 Subject: [PATCH 5/5] Update on-deploying.md --- docs/troubleshooting/on-deploying.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/troubleshooting/on-deploying.md b/docs/troubleshooting/on-deploying.md index 7482eae5209716..6bcb0681a7abef 100644 --- a/docs/troubleshooting/on-deploying.md +++ b/docs/troubleshooting/on-deploying.md @@ -44,7 +44,7 @@ CONTAINER ID IMAGE COMMAND CREATED f02fc709b130 airbyte/server:1.11.1-alpha "/bin/bash -c './wai…" 2 hours ago Up 2 hours 8000/tcp, [...] :::8001->8001/tcp airbyte-server 153b2b322870 airbyte/webapp:1.11.1-alpha "/docker-entrypoint.…" 2 hours ago Up 2 hours :::8000->80/tcp airbyte-webapp b88d94652268 airbyte/db:1.11.1-alpha "docker-entrypoint.s…" 2 hours ago Up 2 hours 5432/tcp airbyte-db -0573681a10e0 airbyte/temporal-auto-setup:1.13.4 "/entrypoint.sh /bin…" 2 hours ago Up 2 hours 6933-6935/tcp, [...] airbyte-temporal +0573681a10e0 airbyte/temporal-auto-setup:1.13.0 "/entrypoint.sh /bin…" 2 hours ago Up 2 hours 6933-6935/tcp, [...] airbyte-temporal ``` You must see 4 containers running. If you are not seeing execute the following steps: