feat: make syncctl url globally overridable

stafftastic · Feb 7, 2024 · 8d92381 · 8d92381
1 parent 7f7538f
commit 8d92381
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/templates/console/_helpers.tpl b/templates/console/_helpers.tpl
@@ -74,13 +74,13 @@ app.kubernetes.io/component: console
 - name: SYNCS_ENABLED
   value: {{ . | quote }}
 {{- end }}
-{{- if and (not .syncctlUrl) $.Values.syncctl.enabled }}
+{{- if and (not .syncctlUrl) (not $.Values.config.syncctlUrl) $.Values.syncctl.enabled }}
 - name: SYNCCTL_URL
-  value: {{ .syncctlUrl | default (printf "http://%s-syncctl:%d" (include "jitsu.fullname" $) (int $.Values.syncctl.service.port)) | quote }}
+  value: {{ printf "http://%s-syncctl:%d" (include "jitsu.fullname" $) (int $.Values.syncctl.service.port) | quote }}
 {{- end }}
-{{- with .syncctlUrl }}
+{{- with (.syncctlUrl | default $.Values.config.syncctlUrl) }}
 - name: SYNCCTL_URL
-  value: {{ .syncctlUrl | quote }}
+  value: {{ . | quote }}
 {{- end }}
 {{- if and (not .syncctlAuthKey) $.Values.syncctl.enabled $.Values.tokenGenerator.enabled }}
 - name: SYNCCTL_AUTH_KEY

diff --git a/values.yaml b/values.yaml
@@ -30,6 +30,7 @@ config:
   # Use these values to override service URLs if deployed externally.
   bulkerUrl: ""
   rotorUrl: ""
+  syncctlUrl: ""
 
 # Unified and simplified ingress definition.
 # Uses a single host for both console and ingest and automatically configures public URL options.