From 8522db2d3e7295bf6f0a7c1e6d3c057ae096e7d1 Mon Sep 17 00:00:00 2001 From: CyberHippo Date: Fri, 27 Sep 2024 15:59:04 +0200 Subject: [PATCH] feat(temporal): allow customization of SSL mode for external db Signed-off-by: CyberHippo --- charts/airbyte-temporal/README.md | 3 ++- charts/airbyte-temporal/templates/deployment.yaml | 14 ++++++++------ charts/airbyte-temporal/values.yaml | 2 ++ 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/charts/airbyte-temporal/README.md b/charts/airbyte-temporal/README.md index 036ddee1aac..8679cbda7a6 100644 --- a/charts/airbyte-temporal/README.md +++ b/charts/airbyte-temporal/README.md @@ -28,6 +28,8 @@ Helm chart to deploy airbyte-temporal | global.configMapName | string | `""` | | | global.database.secretName | string | `""` | | | global.database.secretValue | string | `""` | | +| global.database.type | string | `"internal"` | | +| global.database.ssl.enabled | bool | `"true"` | | | global.deploymentMode | string | `"oss"` | | | global.extraContainers | list | `[]` | | | global.extraLabels | object | `{}` | | @@ -59,4 +61,3 @@ Helm chart to deploy airbyte-temporal | service.port | int | `7233` | | | service.type | string | `"ClusterIP"` | | | tolerations | list | `[]` | | - diff --git a/charts/airbyte-temporal/templates/deployment.yaml b/charts/airbyte-temporal/templates/deployment.yaml index 23b6a615e60..16abd55b797 100644 --- a/charts/airbyte-temporal/templates/deployment.yaml +++ b/charts/airbyte-temporal/templates/deployment.yaml @@ -59,21 +59,23 @@ spec: value: "config/dynamicconfig/development.yaml" {{- include "airbyte.temporal.database.envs" . | nindent 10 }} - + {{- end }} {{- if eq .Values.global.database.type "external" }} - # Assume an external database requires SSL. - - name: POSTGRES_TLS_ENABLED - value: "true" - name: POSTGRES_TLS_DISABLE_HOST_VERIFICATION value: "true" - - name: SQL_TLS_ENABLED - value: "true" - name: SQL_TLS_DISABLE_HOST_VERIFICATION value: "true" {{- end }} + {{- if .Values.global.database.ssl.enabled }} + - name: POSTGRES_TLS_ENABLED + value: "true" + - name: SQL_TLS_ENABLED + value: "true" + {{- end }} + {{- if .Values.extraEnv }} {{ .Values.extraEnv | toYaml | nindent 10 }} {{- end }} diff --git a/charts/airbyte-temporal/values.yaml b/charts/airbyte-temporal/values.yaml index 062d54ef338..1c42c618b14 100644 --- a/charts/airbyte-temporal/values.yaml +++ b/charts/airbyte-temporal/values.yaml @@ -10,6 +10,8 @@ global: extraLabels: {} database: type: internal + ssl: + enabled: true secretName: "" secretValue: ""