Merge pull request #78 from lalithkota/main

Mimoto: updated pbms base url
OpenG2P · Sep 24, 2024 · cb3482f · cb3482f
2 parents 2bfbe71 + b49fa39
commit cb3482f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/charts/mimoto/questions.yaml b/charts/mimoto/questions.yaml
@@ -13,7 +13,7 @@ questions:
   type: string
   label: Esignet Hostname
 
-- variable: envVars.openg2p_pbms_baseUrl
+- variable: envVars.openg2p_pbms_base_url
   type: string
   label: OpenG2P PBMS Base URL
 

diff --git a/charts/mimoto/templates/_helpers.tpl b/charts/mimoto/templates/_helpers.tpl
@@ -67,7 +67,7 @@ Render Env values section
 {{- end -}}
 
 {{- define "mimoto.envVars" -}}
-{{- $envVars := merge (.Values.springCloudConfig.enabled | ternary (deepCopy .Values.springCloudConfigEnvVars) dict) (deepCopy .Values.coreEnvVars) (deepCopy .Values.coreEnvVarsFrom) (deepCopy .Values.envVars) (deepCopy .Values.envVarsFrom) -}}
+{{- $envVars := merge (.Values.springCloudConfig.enabled | ternary (deepCopy .Values.springCloudConfigEnvVars) dict) (deepCopy .Values.coreEnvVars) (deepCopy .Values.coreEnvVarsFrom) (.Values.springCloudConfig.enabled | ternary dict (merge (deepCopy .Values.envVars) (deepCopy .Values.envVarsFrom))) -}}
 {{- include "mimoto.baseEnvVars" (dict "envVars" $envVars "context" $) }}
 {{- end -}}
 

diff --git a/charts/mimoto/values.yaml b/charts/mimoto/values.yaml
@@ -448,7 +448,7 @@ envVars:
   mimoto_oidc_openg2p_partner_clientid: openg2p-mimoto-oidc
   mimoto_wallet_binding_partner_api_key: ""
 
-  openg2p_pbms_baseUrl: https://pbms.openg2p.sandbox.net
+  openg2p_pbms_base_url: https://pbms.openg2p.sandbox.net
 
 # Env Vars from this section will be rendered on the service if springCloudConfig.enabled=false.
 # Else they will be rendered on config-server as overrides.