Merge branch 'main' of https://github.com/opencadc/deployments into resource-fix

Author: at88mph

docs/helm/cavern.md

@@ -101,6 +101,7 @@ $ curl https://myhost.example.com/cavern/availability
 | `deployment.resources.requests.cpu` | CPU request for the Cavern container | `500m` |
 | `deployment.resources.limits.memory` | Memory limit for the Cavern container | `1Gi` |
 | `deployment.resources.limits.cpu` | CPU limit for the Cavern container | `500m` |
+| `deployment.cavern.registryURL` | (list OR string) | `[]` IVOA Registry array of IVOA Registry locations or single IVOA Registry location |
 | `livenessProbe` | Configure the liveness probe check | `{}` |
 | `readinessProbe` | Configure the readiness probe check | `{}` |
 | `tolerations` | Tolerations to apply to the Cavern Pod | `[]` |

docs/helm/posix-mapper.md

@@ -146,6 +146,7 @@ See the [values.yaml](values.yaml) file for a complete list of configuration opt
 | `deployment.posixMapper.extraHosts` | List of extra hosts to be added to the POSIX Mapper deployment.  See the `values.yaml` file for examples. | `[]` |
 | `deployment.posixMapper.extraEnv` | List of extra environment variables to be set in the POSIX Mapper service.  See the `values.yaml` file for examples. | `[]` |
 | `deployment.posixMapper.resources` | Resource requests and limits for the POSIX Mapper API | `{}` |
+| `deployment.posixMapper.registryURL` | (list OR string) | `[]` IVOA Registry array of IVOA Registry locations or single IVOA Registry location |
 | `postgresql.maxActive` | Maximum number of active connections to the PostgreSQL database | `8` |
 | `postgresql.url` | Required JDBC URL for the PostgreSQL database | `""` |
 | `postgresql.schema` | Required Database schema to use for the POSIX Mapper | `""` |

docs/helm/skaha.md

@@ -79,6 +79,7 @@ The following table lists the configurable parameters for the Skaha Helm chart:
 | `deployment.skaha.serviceAccountName` | Name of the Service Account for the Skaha API Pod | `"skaha"` |
 | `deployment.skaha.identityManagerClass` | Java Class name for the [IdentityManager](https://github.com/opencadc/core/blob/main/cadc-util/src/main/java/ca/nrc/cadc/auth/IdentityManager.java) to use.  Defaults to [`org.opencadc.auth.StandardIdentityManager`](https://github.com/opencadc/ac/blob/main/cadc-gms/src/main/java/org/opencadc/auth/StandardIdentityManager.java) for use with bearer tokens (OIDC) | `"org.opencadc.auth.StandardIdentityManager"` |
 | `deployment.skaha.apiVersion` | API version used to match the Ingress path (e.g. `/skaha/v0`) | `"v0"` |
+| `deployment.skaha.registryURL` | (list OR string) | `[]` IVOA Registry array of IVOA Registry locations or single IVOA Registry location |
 | `deployment.skaha.sessions.expirySeconds` | Expiry time, in seconds, for interactive sessions.  Defaults to four (4) days. | `"345600"` |
 | `deployment.skaha.sessions.imagePullPolicy` | Image pull policy for all User Sessions. | `"Always"` |
 | `deployment.skaha.sessions.maxCount` | Maximum number of interactive sessions per user.  Defaults to three (3). | `"3"` |

helm/applications/cavern/README.md

@@ -33,6 +33,7 @@ A Helm chart to install the VOSpace User Storage API (Cavern)
 | deployment.cavern.identityManagerClass | string | `"org.opencadc.auth.StandardIdentityManager"` |  |
 | deployment.cavern.image | string | `"images.opencadc.org/platform/cavern:0.9.0"` |  |
 | deployment.cavern.imagePullPolicy | string | `"IfNotPresent"` |  |
+| deployment.cavern.registryURL | (list OR string) | `[]` | IVOA Registry array of IVOA Registry locations or single IVOA Registry location |
 | deployment.cavern.resourceID | string | `"ivo://example.org/cavern"` |  |
 | deployment.cavern.resources.limits.cpu | string | `"500m"` |  |
 | deployment.cavern.resources.limits.memory | string | `"1Gi"` |  |

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/README.md

@@ -21,7 +21,7 @@ A Helm chart to install the UID/GID POSIX Mapper
 | deployment.posixMapper.minGID | int | `900000` |  |
 | deployment.posixMapper.minUID | int | `10000` |  |
 | deployment.posixMapper.oidcURI | string | `nil` |  |
-| deployment.posixMapper.registryURL | string | `nil` |  |
+| deployment.posixMapper.registryURL | (list OR string) | `[]` | IVOA Registry array of IVOA Registry locations or single IVOA Registry location |
 | deployment.posixMapper.resourceID | string | `"ivo://opencadc.org/posix-mapper"` |  |
 | deployment.posixMapper.resources.limits.cpu | string | `"750m"` |  |
 | deployment.posixMapper.resources.limits.memory | string | `"1500Mi"` |  |

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/README.md

@@ -26,6 +26,7 @@ A Helm chart to install the Science Portal UI
 | deployment.sciencePortal.identityManagerClass | string | `"org.opencadc.auth.StandardIdentityManager"` |  |
 | deployment.sciencePortal.image | string | `"images.opencadc.org/platform/science-portal:1.0.2"` |  |
 | deployment.sciencePortal.imagePullPolicy | string | `"Always"` |  |
+| deployment.sciencePortal.registryURL | (list OR string) | `[]` | IVOA Registry array of IVOA Registry locations or single IVOA Registry location |
 | deployment.sciencePortal.resources.limits.cpu | string | `"500m"` |  |
 | deployment.sciencePortal.resources.limits.memory | string | `"500M"` |  |
 | deployment.sciencePortal.resources.requests.cpu | string | `"500m"` |  |

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/README.md

@@ -33,6 +33,7 @@ A Helm chart to install the Skaha web service of the CANFAR Science Platform
 | deployment.skaha.init.imagePullPolicy | string | `"IfNotPresent"` |  |
 | deployment.skaha.priorityClassName | string | `"uber-user-preempt-high"` |  |
 | deployment.skaha.registryHosts | string | `"images.canfar.net"` |  |
+| deployment.skaha.registryURL | (list OR string) | `[]` | IVOA Registry array of IVOA Registry locations or single IVOA Registry location |
 | deployment.skaha.resources.limits.cpu | string | `"2000m"` |  |
 | deployment.skaha.resources.limits.memory | string | `"3Gi"` |  |
 | deployment.skaha.resources.requests.cpu | string | `"1000m"` |  |