Skip to content

Commit 26f325d

Browse files
authored
Merge pull request #2054 from NCEAS/bug-2053-yaml-multiline-splits
Bug 2053 yaml multiline splits
2 parents ea0aeef + cb37519 commit 26f325d

File tree

3 files changed

+19
-8
lines changed

3 files changed

+19
-8
lines changed

helm/config/metacat-site.properties

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,19 @@ index.rabbitmq.password=${env:METACAT_RABBITMQ_PASSWORD}
2424
"database.connectionURI"
2525
"server.port"
2626
"server.https"
27-
""
2827
"solr.baseURL"
2928
"solr.coreName"
3029
"index.rabbitmq.password"
3130
"index.rabbitmq.hostname"
3231
}}
3332
{{- range $key, $value := .Values.metacat }}
3433
{{- if not (has $key $ignoredKeys) }}
35-
{{- (printf "%s=%s" $key (toString $value)) | nindent 2 }}
34+
{{- if typeIs "string" $value }}
35+
{{- $value = regexReplaceAll "\n" $value " " }}
36+
{{- (printf "%s=%s" $key (quote $value)) | nindent 2 }}
37+
{{- else }}
38+
{{- (printf "%s=%s" $key (toString $value)) | nindent 2 }}
39+
{{- end }}
3640
{{- end }}
3741
{{- end }}
3842

helm/examples/values-dev-cluster-arctic-example.yaml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,14 @@ metacat:
5959
dataone.autoRegisterMemberNode: 2024-01-25
6060
dataone.nodeId: "urn:node:TestBROOKELT"
6161
dataone.subject: "CN=urn:node:TestBROOKELT,DC=dataone,DC=org"
62-
dataone.nodeName: Test BROOKE LT Metacat Node
63-
dataone.nodeDescription: Dev cluster Test BROOKE LT Metacat Node
62+
dataone.nodeName: Dev Deployment of Arctic Data Center
63+
dataone.nodeDescription: |
64+
The US National Science Foundation Arctic Data Center operates as the primary repository
65+
supporting the NSF Arctic community for data preservation and access. The Center helps the
66+
research community reproducibly preserve and discover all products of NSF-funded science
67+
in the Arctic, including data, metadata, software, documents, and provenance that link
68+
these in an open and reproducible way.
69+
6470
dataone.contactSubject: http://orcid.org/0000-0002-1472-913X
6571
dataone.nodeSynchronize: true
6672
dataone.nodeReplicate: true

helm/examples/values-dev-cluster-example.yaml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ global:
2020
metacatUiThemeName: "default"
2121
metacatUiWebRoot: "/"
2222
metacatExternalBaseUrl: "https://metacat-dev.test.dataone.org/"
23-
d1ClientCnUrl: "https://cn-stage.test.dataone.org/cn"
23+
d1ClientCnUrl: "https://cn-sandbox.test.dataone.org/cn"
2424
storageClass: &storageClassName csi-cephfs-sc
2525
ephemeralVolumeStorageClass: csi-cephfs-sc-ephemeral
2626
## Use your own release name instead of metacatbrooke
@@ -50,11 +50,12 @@ metacat:
5050

5151
## DataONE Member Node (MN) Parameters
5252
dataone.certificate.fromHttpHeader.enabled: true
53-
dataone.autoRegisterMemberNode: 2024-01-25
53+
dataone.autoRegisterMemberNode: 2025-01-23
5454
dataone.nodeId: "urn:node:TestBROOKELT"
5555
dataone.subject: "CN=urn:node:TestBROOKELT,DC=dataone,DC=org"
56-
dataone.nodeName: Test BROOKE LT Metacat Node
57-
dataone.nodeDescription: Dev cluster Test BROOKE LT Metacat Node
56+
dataone.nodeName: TestBROOKELT Metacat Node
57+
dataone.nodeDescription: |
58+
Dev cluster Test BROOKE LT Metacat Node. Last registered with CN on 1/23/2025
5859
dataone.contactSubject: http://orcid.org/0000-0002-1472-913X
5960
dataone.nodeSynchronize: true
6061
dataone.nodeReplicate: true

0 commit comments

Comments
 (0)