fix webapp and supervisor templates

Author: nicktrn

hosting/k8s/helm/templates/_helpers.tpl

@@ -166,13 +166,30 @@ ClickHouse hostname
 {{- end }}
 
 {{/*
-ClickHouse URL
+ClickHouse URL for application (with secure parameter)
 */}}
 {{- define "trigger-v4.clickhouse.url" -}}
-{{- if .Values.clickhouse.host -}}
-http://{{ .Values.clickhouse.username }}:{{ .Values.clickhouse.password }}@{{ .Values.clickhouse.host }}:{{ .Values.clickhouse.httpPort | default 8123 }}
-{{- else if .Values.clickhouse.deploy -}}
-http://{{ .Values.clickhouse.auth.username }}:{{ .Values.clickhouse.auth.password }}@{{ include "trigger-v4.clickhouse.hostname" . }}:8123
+{{- if .Values.clickhouse.deploy -}}
+{{- $protocol := ternary "https" "http" .Values.clickhouse.secure -}}
+{{- $secure := ternary "true" "false" .Values.clickhouse.secure -}}
+{{ $protocol }}://{{ .Values.clickhouse.auth.username }}:{{ .Values.clickhouse.auth.password }}@{{ include "trigger-v4.clickhouse.hostname" . }}:8123?secure={{ $secure }}
+{{- else if .Values.clickhouse.external.host -}}
+{{- $protocol := ternary "https" "http" .Values.clickhouse.external.secure -}}
+{{- $secure := ternary "true" "false" .Values.clickhouse.external.secure -}}
+{{ $protocol }}://{{ .Values.clickhouse.external.username }}:{{ .Values.clickhouse.external.password }}@{{ .Values.clickhouse.external.host }}:{{ .Values.clickhouse.external.httpPort | default 8123 }}?secure={{ $secure }}
+{{- end -}}
+{{- end }}
+
+{{/*
+ClickHouse URL for replication (without secure parameter)
+*/}}
+{{- define "trigger-v4.clickhouse.replication.url" -}}
+{{- if .Values.clickhouse.deploy -}}
+{{- $protocol := ternary "https" "http" .Values.clickhouse.secure -}}
+{{ $protocol }}://{{ .Values.clickhouse.auth.username }}:{{ .Values.clickhouse.auth.password }}@{{ include "trigger-v4.clickhouse.hostname" . }}:8123
+{{- else if .Values.clickhouse.external.host -}}
+{{- $protocol := ternary "https" "http" .Values.clickhouse.external.secure -}}
+{{ $protocol }}://{{ .Values.clickhouse.external.username }}:{{ .Values.clickhouse.external.password }}@{{ .Values.clickhouse.external.host }}:{{ .Values.clickhouse.external.httpPort | default 8123 }}
 {{- end -}}
 {{- end }}
 

hosting/k8s/helm/templates/supervisor.yaml

@@ -1,4 +1,3 @@
-{{- if .Values.supervisor.deploy }}
 {{- if .Values.supervisor.serviceAccount.create }}
 apiVersion: v1
 kind: ServiceAccount
@@ -282,5 +281,4 @@ spec:
       protocol: TCP
       name: metrics
   selector:
-    {{- include "trigger-v4.componentSelectorLabels" (dict "Chart" .Chart "Release" .Release "Values" .Values "component" $component) | nindent 4 }}
-{{- end }}
+    {{- include "trigger-v4.componentSelectorLabels" (dict "Chart" .Chart "Release" .Release "Values" .Values "component" $component) | nindent 4 }}

hosting/k8s/helm/templates/webapp.yaml

@@ -224,7 +224,7 @@ spec:
             - name: RUN_REPLICATION_ENABLED
               value: "1"
             - name: RUN_REPLICATION_CLICKHOUSE_URL
-              value: {{ include "trigger-v4.clickhouse.url" . | quote }}
+              value: {{ include "trigger-v4.clickhouse.replication.url" . | quote }}
             - name: RUN_REPLICATION_LOG_LEVEL
               value: {{ .Values.webapp.runReplication.logLevel | quote }}
             {{- if not .Values.telemetry.enabled }}

hosting/k8s/helm/values-production-example.yaml

@@ -79,6 +79,8 @@ redis:
 
 # Production ClickHouse
 clickhouse:
+  # Set to true to enable TLS/secure connections in production
+  secure: true
   persistence:
     enabled: true
     size: 100Gi
@@ -123,8 +125,7 @@ supervisor:
       memory: 512Mi
 # Example: Use external PostgreSQL instead
 # postgres:
-#   enabled: false
-#   external: true
+#   deploy: false
 #   external:
 #     host: "your-postgres-host.rds.amazonaws.com"
 #     port: 5432
@@ -136,9 +137,19 @@ supervisor:
 
 # Example: Use external Redis instead
 # redis:
-#   enabled: false
-#   external: true
+#   deploy: false
 #   external:
 #     host: "your-redis-cluster.cache.amazonaws.com"
 #     port: 6379
 #     password: "your-redis-password"
+
+# Example: Use external ClickHouse instead
+# clickhouse:
+#   deploy: false
+#   external:
+#     host: "your-clickhouse-host.cloud.provider.com"
+#     httpPort: 8443  # Use 8443 for HTTPS
+#     nativePort: 9440  # Use 9440 for secure native connections
+#     username: "trigger_user"
+#     password: "your-clickhouse-password"
+#     secure: true  # Use true for TLS/secure connections

hosting/k8s/helm/values.yaml

@@ -413,6 +413,9 @@ electric:
 clickhouse:
   deploy: true
 
+  # TLS/Secure connection configuration
+  secure: false # Set to true to use HTTPS and secure connections
+
   # Bitnami ClickHouse chart configuration (when deploy: true)
   auth:
     username: "default"
@@ -437,6 +440,7 @@ clickhouse:
     nativePort: 9000
     username: ""
     password: ""
+    secure: false # Set to true for external secure connections
 
   # ClickHouse configuration override
   # These defaults are based on official recommendations for systems with <16GB RAM: