Merge pull request #2054 from NCEAS/bug-2053-yaml-multiline-splits

Bug 2053 yaml multiline splits
NCEAS · Jan 24, 2025 · 26f325d · 26f325d
2 parents ea0aeef + cb37519
commit 26f325d
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 8 deletions.
diff --git a/helm/config/metacat-site.properties b/helm/config/metacat-site.properties
@@ -24,15 +24,19 @@ index.rabbitmq.password=${env:METACAT_RABBITMQ_PASSWORD}
     "database.connectionURI"
     "server.port"
     "server.https"
-    ""
     "solr.baseURL"
     "solr.coreName"
     "index.rabbitmq.password"
     "index.rabbitmq.hostname"
 }}
 {{- range $key, $value := .Values.metacat }}
     {{- if not (has $key $ignoredKeys) }}
-        {{- (printf "%s=%s" $key (toString $value)) | nindent 2 }}
+        {{- if typeIs "string" $value }}
+            {{- $value = regexReplaceAll "\n" $value " " }}
+            {{- (printf "%s=%s" $key (quote $value)) | nindent 2 }}
+        {{- else }}
+            {{- (printf "%s=%s" $key (toString $value)) | nindent 2 }}
+        {{- end }}
     {{- end }}
 {{- end }}
 

diff --git a/helm/examples/values-dev-cluster-arctic-example.yaml b/helm/examples/values-dev-cluster-arctic-example.yaml
@@ -59,8 +59,14 @@ metacat:
   dataone.autoRegisterMemberNode: 2024-01-25
   dataone.nodeId: "urn:node:TestBROOKELT"
   dataone.subject: "CN=urn:node:TestBROOKELT,DC=dataone,DC=org"
-  dataone.nodeName: Test BROOKE LT Metacat Node
-  dataone.nodeDescription: Dev cluster Test BROOKE LT Metacat Node
+  dataone.nodeName: Dev Deployment of Arctic Data Center
+  dataone.nodeDescription: |
+    The US National Science Foundation Arctic Data Center operates as the primary repository
+    supporting the NSF Arctic community for data preservation and access. The Center helps the
+    research community reproducibly preserve and discover all products of NSF-funded science
+    in the Arctic, including data, metadata, software, documents, and provenance that link
+    these in an open and reproducible way.
+
   dataone.contactSubject: http://orcid.org/0000-0002-1472-913X
   dataone.nodeSynchronize: true
   dataone.nodeReplicate: true

diff --git a/helm/examples/values-dev-cluster-example.yaml b/helm/examples/values-dev-cluster-example.yaml
@@ -20,7 +20,7 @@ global:
   metacatUiThemeName: "default"
   metacatUiWebRoot: "/"
   metacatExternalBaseUrl: "https://metacat-dev.test.dataone.org/"
-  d1ClientCnUrl: "https://cn-stage.test.dataone.org/cn"
+  d1ClientCnUrl: "https://cn-sandbox.test.dataone.org/cn"
   storageClass: &storageClassName csi-cephfs-sc
   ephemeralVolumeStorageClass: csi-cephfs-sc-ephemeral
   ## Use your own release name instead of metacatbrooke
@@ -50,11 +50,12 @@ metacat:
 
   ## DataONE Member Node (MN) Parameters
   dataone.certificate.fromHttpHeader.enabled: true
-  dataone.autoRegisterMemberNode: 2024-01-25
+  dataone.autoRegisterMemberNode: 2025-01-23
   dataone.nodeId: "urn:node:TestBROOKELT"
   dataone.subject: "CN=urn:node:TestBROOKELT,DC=dataone,DC=org"
-  dataone.nodeName: Test BROOKE LT Metacat Node
-  dataone.nodeDescription: Dev cluster Test BROOKE LT Metacat Node
+  dataone.nodeName: TestBROOKELT Metacat Node
+  dataone.nodeDescription: |
+    Dev cluster Test BROOKE LT Metacat Node. Last registered with CN on 1/23/2025
   dataone.contactSubject: http://orcid.org/0000-0002-1472-913X
   dataone.nodeSynchronize: true
   dataone.nodeReplicate: true