Merge pull request #110 from manuparra/main

fix: Enable multiple registry entries for the helm chart (--registry client)

Author: at88mph

helm/applications/cavern/config/cadc-registry.properties

@@ -18,4 +18,8 @@ ivo://ivoa.net/std/CDP#proxy-1.0 = ivo://cadc.nrc.ca/cred
 http://www.opencadc.org/std/posix#group-mapping-0.1 = {{ .Values.deployment.cavern.posixMapperResourceID }}
 http://www.opencadc.org/std/posix#user-mapping-0.1 = {{ .Values.deployment.cavern.posixMapperResourceID }}
 
-ca.nrc.cadc.reg.client.RegistryClient.baseURL = {{ .Values.deployment.cavern.registryURL }}
+{{- $raw := .Values.deployment.cavern.registryURL -}}
+{{- $urls := ternary (list $raw) $raw (kindIs "string" $raw) -}}
+{{- range $urls }}
+ca.nrc.cadc.reg.client.RegistryClient.baseURL = {{ . }}
+{{- end }}

helm/applications/posix-mapper/config/cadc-registry.properties

@@ -13,4 +13,8 @@ ivo://ivoa.net/sso#OpenID = {{ .Values.deployment.posixMapper.oidcURI | required
 http://www.opencadc.org/std/posix#group-mapping-0.1 = {{ .Values.deployment.posixMapper.resourceID | required "Please ensure deployment.posixMapper.resourceID is set." }}
 http://www.opencadc.org/std/posix#user-mapping-0.1 = {{ .Values.deployment.posixMapper.resourceID | required "Please ensure deployment.posixMapper.resourceID is set." }}
 
-ca.nrc.cadc.reg.client.RegistryClient.baseURL = {{ .Values.deployment.posixMapper.registryURL | required "Please ensure deployment.posixMapper.registryURL is set." }}
+{{- $raw := .Values.deployment.posixMapper.registryURL -}}
+{{- $urls := ternary (list $raw) $raw (kindIs "string" $raw) -}}
+{{- range $urls }}
+ca.nrc.cadc.reg.client.RegistryClient.baseURL = {{ . | required "Please ensure deployment.posixMapper.registryURL is set."  }}
+{{- end }}

helm/applications/science-portal/config/cadc-registry.properties

@@ -19,4 +19,8 @@ ivo://ivoa.net/sso#OpenID = {{ .Values.deployment.sciencePortal.gmsID }}
 # Ignore this, it's only here to satisfy the availability check.
 ivo://ivoa.net/std/CDP#proxy-1.0 = ivo://cadc.nrc.ca/cred
 
-ca.nrc.cadc.reg.client.RegistryClient.baseURL = {{ .Values.deployment.sciencePortal.registryURL | required "Set the deployment.sciencePortal.registryURL value to the Registry URL" }}
+{{- $raw := .Values.deployment.sciencePortal.registryURL -}}
+{{- $urls := ternary (list $raw) $raw (kindIs "string" $raw) -}}
+{{- range $urls }}
+ca.nrc.cadc.reg.client.RegistryClient.baseURL = {{ . | required "Please ensure deployment.sciencePortal.registryURL is set."  }}
+{{- end }}

helm/applications/skaha/config/cadc-registry.properties

@@ -18,4 +18,8 @@ ivo://ivoa.net/std/CDP#proxy-1.0 = ivo://cadc.nrc.ca/cred
 http://www.opencadc.org/std/posix#group-mapping-0.1 = {{ .Values.deployment.skaha.posixMapperResourceID }}
 http://www.opencadc.org/std/posix#user-mapping-0.1 = {{ .Values.deployment.skaha.posixMapperResourceID }}
 
-ca.nrc.cadc.reg.client.RegistryClient.baseURL = {{ .Values.deployment.skaha.registryURL }}
+{{- $raw := .Values.deployment.skaha.registryURL -}}
+{{- $urls := ternary (list $raw) $raw (kindIs "string" $raw) -}}
+{{- range $urls }}
+ca.nrc.cadc.reg.client.RegistryClient.baseURL = {{ . }}
+{{- end }}

helm/applications/storage-ui/config/cadc-registry.properties

@@ -20,7 +20,11 @@ ivo://ivoa.net/sso#OpenID = {{ .Values.deployment.storageUI.gmsID }}
 {{- end }}
 
 {{- if .Values.deployment.storageUI.registryURL }}
-ca.nrc.cadc.reg.client.RegistryClient.baseURL = {{ .Values.deployment.storageUI.registryURL }}
+{{- $raw := .Values.deployment.storageUI.registryURL -}}
+{{- $urls := ternary (list $raw) $raw (kindIs "string" $raw) -}}
+{{- range $urls }}
+ca.nrc.cadc.reg.client.RegistryClient.baseURL = {{ . }}
+{{- end }}
 {{- else }}
 {{- required "Please set the deployment.storageUI.registryURL to the Registry URL" .Values.deployment.storageUI.registryURL }}
 {{- end }}