From a10cf6d49027e70fe8945ec0d9363c0a132ed29c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20HO?= Date: Fri, 6 Dec 2024 18:39:37 +0100 Subject: [PATCH 1/6] ASRE-550: Fix WORKLOAD_API_BEARER_TOKEN issue --- charts/airbyte/templates/secret.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/airbyte/templates/secret.yaml b/charts/airbyte/templates/secret.yaml index 7d4230d09c3..a0c6a3d4320 100644 --- a/charts/airbyte/templates/secret.yaml +++ b/charts/airbyte/templates/secret.yaml @@ -15,4 +15,4 @@ stringData: KEYCLOAK_ADMIN_USER: {{ .Values.keycloak.auth.adminUsername | quote }} KEYCLOAK_ADMIN_PASSWORD: {{ .Values.keycloak.auth.adminPassword | quote }} {{- end }} - WORKLOAD_API_BEARER_TOKEN: {{ index ".Values.workload-api.bearerToken" | quote }} + WORKLOAD_API_BEARER_TOKEN: {{ index .Values "workload-api-server" "bearerToken" | quote }} From 1e433fbf0228f8c090263c2b4825c38881e60d99 Mon Sep 17 00:00:00 2001 From: sho-equativ Date: Fri, 6 Dec 2024 19:36:12 +0100 Subject: [PATCH 2/6] ASRE-550: Fix _database/tpl with password and user --- charts/airbyte/templates/_database.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/airbyte/templates/_database.tpl b/charts/airbyte/templates/_database.tpl index fd0e5ef8736..ab08bf8607b 100644 --- a/charts/airbyte/templates/_database.tpl +++ b/charts/airbyte/templates/_database.tpl @@ -207,11 +207,11 @@ Renders all of the common environment variables which provide database credentia Renders a set of database secrets to be included in the shared Airbyte secret */}} {{- define "airbyte.database.secrets" }} -{{ $user := (include "airbyte.database.user" .)}} +{{ $user := (include "airbyte.database.user" .) | trim }} {{- if not (empty $user) }} DATABASE_USER: {{ $user }} {{- end }} -{{ $password := (include "airbyte.database.password" .)}} +{{ $password := (include "airbyte.database.password" .) | trim }} {{- if not (empty $password) }} DATABASE_PASSWORD: {{ $password }} {{- end}} From c3a763d4aaf98874ba4ea0497d21ec0deda078d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20HO?= Date: Tue, 17 Dec 2024 23:46:44 +0100 Subject: [PATCH 3/6] Add new shareProcessNamespace --- charts/airbyte-bootloader/README.md | 1 + charts/airbyte-bootloader/templates/pod.yaml | 3 +++ charts/airbyte-bootloader/values.yaml | 1 + 3 files changed, 5 insertions(+) diff --git a/charts/airbyte-bootloader/README.md b/charts/airbyte-bootloader/README.md index ceaa5352775..006203def34 100644 --- a/charts/airbyte-bootloader/README.md +++ b/charts/airbyte-bootloader/README.md @@ -35,6 +35,7 @@ Helm chart to deploy airbyte-bootloader | global.secretName | string | `""` | | | global.secrets | object | `{}` | | | global.serviceAccountName | string | `"placeholderServiceAccount"` | | +| global.shareProcessNamespace | string | `"false"` | the shareProcessNamespace field is used in a PodSpec to enable all containers within a pod to share the same process namespace. This allows containers to view and interact with each other's processes. | | 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 index 8a72fa90911..5e38611c443 100644 --- a/charts/airbyte-bootloader/templates/pod.yaml +++ b/charts/airbyte-bootloader/templates/pod.yaml @@ -18,6 +18,9 @@ metadata: {{- include "common.tplvalues.render" (dict "value" .Values.podAnnotations "context" $) | nindent 4 }} {{- end }} spec: + {{- if .Values.global.shareProcessNamespace }} + shareProcessNamespace: true + {{- end }} serviceAccountName: {{ .Values.global.serviceAccountName }} {{- if .Values.global.imagePullSecrets }} imagePullSecrets: diff --git a/charts/airbyte-bootloader/values.yaml b/charts/airbyte-bootloader/values.yaml index ee3bc615733..27ba1046c22 100644 --- a/charts/airbyte-bootloader/values.yaml +++ b/charts/airbyte-bootloader/values.yaml @@ -7,6 +7,7 @@ global: serviceAccountName: placeholderServiceAccount deploymentMode: oss secretName: "" + shareProcessNamespace: false database: secretName: "" secretValue: "" From cf87933955015b7f3e89dd42fb1379aa713da75c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20HO?= Date: Mon, 6 Jan 2025 22:20:46 +0100 Subject: [PATCH 4/6] ASRE-931: Update code to add shareProcessNamespace --- charts/airbyte-bootloader/README.md | 1 + charts/airbyte-bootloader/templates/pod.yaml | 3 +++ charts/airbyte-bootloader/values.yaml | 2 ++ 3 files changed, 6 insertions(+) diff --git a/charts/airbyte-bootloader/README.md b/charts/airbyte-bootloader/README.md index ceaa5352775..3456110c4ab 100644 --- a/charts/airbyte-bootloader/README.md +++ b/charts/airbyte-bootloader/README.md @@ -43,5 +43,6 @@ Helm chart to deploy airbyte-bootloader | resources.limits | object | `{}` | | | resources.requests | object | `{}` | | | secrets | object | `{}` | | +| shareProcessNamespace | string | `"false"` | the shareProcessNamespace field is used in a PodSpec to enable all containers within a pod to share the same process namespace. This allows containers to view and interact with each other's processes. | | tolerations | list | `[]` | | diff --git a/charts/airbyte-bootloader/templates/pod.yaml b/charts/airbyte-bootloader/templates/pod.yaml index 8a72fa90911..5e38611c443 100644 --- a/charts/airbyte-bootloader/templates/pod.yaml +++ b/charts/airbyte-bootloader/templates/pod.yaml @@ -18,6 +18,9 @@ metadata: {{- include "common.tplvalues.render" (dict "value" .Values.podAnnotations "context" $) | nindent 4 }} {{- end }} spec: + {{- if .Values.global.shareProcessNamespace }} + shareProcessNamespace: true + {{- end }} serviceAccountName: {{ .Values.global.serviceAccountName }} {{- if .Values.global.imagePullSecrets }} imagePullSecrets: diff --git a/charts/airbyte-bootloader/values.yaml b/charts/airbyte-bootloader/values.yaml index ee3bc615733..189d91d8384 100644 --- a/charts/airbyte-bootloader/values.yaml +++ b/charts/airbyte-bootloader/values.yaml @@ -35,6 +35,8 @@ image: repository: airbyte/bootloader pullPolicy: IfNotPresent +shareProcessNamespace: false + ## podAnnotations [object] Add extra annotations to the bootloader pod ## podAnnotations: {} From ff8b01269e80c38f6eb82fec76656aa688e7b984 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20HO?= Date: Tue, 7 Jan 2025 14:36:47 +0100 Subject: [PATCH 5/6] ASRE-931: Fix shareProcessNamespace issue --- charts/airbyte-bootloader/templates/pod.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/airbyte-bootloader/templates/pod.yaml b/charts/airbyte-bootloader/templates/pod.yaml index 5e38611c443..cc141c38128 100644 --- a/charts/airbyte-bootloader/templates/pod.yaml +++ b/charts/airbyte-bootloader/templates/pod.yaml @@ -18,7 +18,7 @@ metadata: {{- include "common.tplvalues.render" (dict "value" .Values.podAnnotations "context" $) | nindent 4 }} {{- end }} spec: - {{- if .Values.global.shareProcessNamespace }} + {{- if .Values.shareProcessNamespace }} shareProcessNamespace: true {{- end }} serviceAccountName: {{ .Values.global.serviceAccountName }} From b32e25a5e748b5cc17d5b5ae1f51e8d8a059fb9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20HO?= Date: Tue, 7 Jan 2025 16:05:07 +0100 Subject: [PATCH 6/6] ASRE-931: Fix shareProcessNamespace issue --- charts/airbyte-bootloader/README.md | 1 - charts/airbyte-bootloader/values.yaml | 1 - 2 files changed, 2 deletions(-) diff --git a/charts/airbyte-bootloader/README.md b/charts/airbyte-bootloader/README.md index 5d1577a7419..3456110c4ab 100644 --- a/charts/airbyte-bootloader/README.md +++ b/charts/airbyte-bootloader/README.md @@ -35,7 +35,6 @@ Helm chart to deploy airbyte-bootloader | global.secretName | string | `""` | | | global.secrets | object | `{}` | | | global.serviceAccountName | string | `"placeholderServiceAccount"` | | -| global.shareProcessNamespace | string | `"false"` | the shareProcessNamespace field is used in a PodSpec to enable all containers within a pod to share the same process namespace. This allows containers to view and interact with each other's processes. | | image.pullPolicy | string | `"IfNotPresent"` | | | image.repository | string | `"airbyte/bootloader"` | | | nodeSelector | object | `{}` | | diff --git a/charts/airbyte-bootloader/values.yaml b/charts/airbyte-bootloader/values.yaml index 4dc8a4fde86..189d91d8384 100644 --- a/charts/airbyte-bootloader/values.yaml +++ b/charts/airbyte-bootloader/values.yaml @@ -7,7 +7,6 @@ global: serviceAccountName: placeholderServiceAccount deploymentMode: oss secretName: "" - shareProcessNamespace: false database: secretName: "" secretValue: ""