From a74be7c039fe4721b04f13397fa7d0bf644c5964 Mon Sep 17 00:00:00 2001 From: RafaelOAiSquared <106079170+RafaelOAiSquared@users.noreply.github.com> Date: Tue, 7 May 2024 09:08:13 -0400 Subject: [PATCH] feat: exposing temporal ui and supporting temporal connecting to ssl db (#17) * feat: exposing temporal-ui * feat: added flag to suppor temporal connecting to ssl db * chore: upgraded chart version --- charts/multiwoven/Chart.yaml | 4 ++-- .../templates/multiwoven-ingress.yaml | 17 ++++++++++++++++- .../templates/temporal-deployment.yaml | 12 ++++++++++++ charts/multiwoven/values.yaml | 2 ++ 4 files changed, 32 insertions(+), 3 deletions(-) diff --git a/charts/multiwoven/Chart.yaml b/charts/multiwoven/Chart.yaml index e5c81b8..ee4e192 100644 --- a/charts/multiwoven/Chart.yaml +++ b/charts/multiwoven/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 name: multiwoven description: Open-source reverse ETL, an alternative to Hightouch, Census etc. 🔥 type: application -version: 0.8.0 -appVersion: "0.8.0" +version: 0.9.0 +appVersion: "0.9.0" maintainers: - name: subintp - name: RafaelOAiSquared diff --git a/charts/multiwoven/templates/multiwoven-ingress.yaml b/charts/multiwoven/templates/multiwoven-ingress.yaml index 996695c..09a6c4c 100644 --- a/charts/multiwoven/templates/multiwoven-ingress.yaml +++ b/charts/multiwoven/templates/multiwoven-ingress.yaml @@ -17,6 +17,9 @@ spec: - hosts: - {{ .Values.multiwovenConfig.uiHost }} - {{ .Values.multiwovenConfig.apiHost }} + {{ if .Values.temporal.enabled }} + - {{ .Values.multiwovenConfig.temporalUiHost }} + {{ end }} secretName: mw-tls-cert rules: - host: {{ .Values.multiwovenConfig.uiHost }} @@ -38,4 +41,16 @@ spec: port: number: 3000 path: /(.*) - pathType: Prefix \ No newline at end of file + pathType: Prefix +{{ if .Values.temporal.enabled }} + - host: {{ .Values.multiwovenConfig.temporalUiHost }} + http: + paths: + - backend: + service: + name: '{{ include "chart.fullname" . }}-temporal-ui' + port: + number: 8080 + path: /(.*) + pathType: Prefix +{{ end }} diff --git a/charts/multiwoven/templates/temporal-deployment.yaml b/charts/multiwoven/templates/temporal-deployment.yaml index e198172..105fede 100644 --- a/charts/multiwoven/templates/temporal-deployment.yaml +++ b/charts/multiwoven/templates/temporal-deployment.yaml @@ -44,6 +44,18 @@ spec: configMapKeyRef: key: DB_USERNAME name: {{ include "chart.fullname" . }}-config + {{ if .Values.multiwovenConfig.temporalPostgresSsl }} + - name: TEMPORAL_TLS_REQUIRE_CLIENT_AUTH + value: 'true' + - name: SQL_TLS + value: 'true' + - name: SQL_TLS_ENABLED + value: 'true' + - name: SQL_TLS_DISABLE_HOST_VERIFICATION + value: 'true' + - name: SQL_HOST_VERIFICATION + value: 'false' + {{ end }} - name: KUBERNETES_CLUSTER_DOMAIN value: {{ quote .Values.kubernetesClusterDomain }} image: {{ .Values.temporal.temporal.image.repository }}:{{ .Values.temporal.temporal.image.tag | default .Chart.AppVersion }} diff --git a/charts/multiwoven/values.yaml b/charts/multiwoven/values.yaml index 349f4a8..4a150f9 100644 --- a/charts/multiwoven/values.yaml +++ b/charts/multiwoven/values.yaml @@ -26,10 +26,12 @@ multiwovenConfig: temporalPort: "7233" temporalPostgresDefaultPort: "5432" temporalPostgresPassword: password + temporalPostgresSsl: false temporalPostgresUser: multiwoven temporalPostgresqlVersion: "13" temporalRootCert: /certs/temporal.pem temporalTaskQueue: sync-dev + temporalUiHost: temporal.multiwoven.com temporalUiVersion: 2.23.2 temporalVersion: 1.22.4 temporalWorkflowThreadPoolSize: "10"