Add support to change ztp url's (#247)

added support for ZTP configmap.yaml of akeyless url's in values using helper func and a default value
akeylesslabs · Jun 2, 2024 · 6229c0f · 6229c0f
1 parent 02ce102
commit 6229c0f
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/charts/akeyless-secure-remote-access/Chart.yaml b/charts/akeyless-secure-remote-access/Chart.yaml
@@ -14,7 +14,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 
-version: 1.1.2
+version: 1.1.3
 
 
 appVersion: 2.1.1_1.5.0

diff --git a/charts/akeyless-secure-remote-access/templates/_helpers.tpl b/charts/akeyless-secure-remote-access/templates/_helpers.tpl
@@ -171,4 +171,8 @@ Get the Ingress TLS secret.
     {{- else -}}
         {{- printf "%s-tls" .Values.ztpConfig.ingress.hostname -}}
     {{- end -}}
+{{- end -}}
+
+{{- define "akeylessTenantUrl" -}}
+{{- default "akeyless.io" .Values.ztpConfig.akeylessTenantUrl -}}
 {{- end -}}
diff --git a/charts/akeyless-secure-remote-access/templates/akeyless-zero-trust-portal/configmap.yaml b/charts/akeyless-secure-remote-access/templates/akeyless-zero-trust-portal/configmap.yaml
@@ -11,8 +11,8 @@ data:
   env-config.js: |
     window._env_ = {
         CLI_GW_DNS: {{ $.Values.apiGatewayURL | quote }},
-        AUTH_DNS: 'https://auth.akeyless.io',
-        CERT_AUTH_DNS: 'https://auth-cert.akeyless.io',
-        CLI_GW_DNS_V_2: 'https://api.akeyless.io'
+        AUTH_DNS: 'https://auth.{{ include "akeylessTenantUrl" . }}',
+        CERT_AUTH_DNS: 'https://auth-cert.{{ include "akeylessTenantUrl" . }}',
+        CLI_GW_DNS_V_2: 'https://api.{{ include "akeylessTenantUrl" . }}'
     };
     {{- end }}
diff --git a/charts/akeyless-secure-remote-access/values.yaml b/charts/akeyless-secure-remote-access/values.yaml
@@ -236,6 +236,8 @@ ztbConfig:
 ztpConfig:
   # Enable akeyless-zero-trust-portal. Valid values: true/false.
   enabled: false
+  # The default URL suffix is "akeyless.io".It can be overridden to "eu.akeyless.io" or "us.akeyless.io"
+  akeylessTenantUrl:
   replicaCount: 1
 
   nodeSelector: