diff options
| author |   Konrad Bańka <k.banka@samsung.com> | 2020-03-19 18:31:34 +0100 |
|---|---|---|
| committer | Konrad Bańka <k.banka@samsung.com> | 2020-03-19 19:02:20 +0100 |
| commit | a9d4403245a733f3ecfd3aaea0926dbf91d7168f (patch) | |
| tree | 859437ce0ede0890e7f1cce7705a4abfd00cdbf5 /kubernetes | |
| parent | f2158a2f746b9170551bb214bedcd2e897fd8a76 (diff) | |
Correct defining dicts using yaml's anchors
This commit corrects previous mistake assuming that
parameter's nested content derived via "<<" operator
can be overwritten with single value, while in practice,
whole key would be change.
For practical explanation, following entry:
a: &a
b: 1
c:
d: 2
e: 3
x:
<<: *a
c:
d: 10
Would yield following content:
a:
b: 1
c:
d: 2
e: 3
x:
b: 1
c:
d: 10
And as we can see, "e" key is missing there.
This commit correct this.
Issue-ID: SDNC-1122
Signed-off-by: Konrad Bańka <k.banka@samsung.com>
Change-Id: I15dfe0219ee1d6bcde7d29821ed2650bc8698244
Diffstat (limited to 'kubernetes')
| -rw-r--r-- | kubernetes/sdnc/values.yaml | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/kubernetes/sdnc/values.yaml b/kubernetes/sdnc/values.yaml index 8fd7590863..8547e40b99 100644 --- a/kubernetes/sdnc/values.yaml +++ b/kubernetes/sdnc/values.yaml @@ -198,7 +198,7 @@ aaf_init: mariadb-galera: &mariadbGalera nameOverride: sdnc-db - config: + config: &mariadbGaleraConfig rootPasswordExternalSecret: '{{ ternary (include "common.release" .)-sdnc-db-root-password "" .Values.global.mariadbGalera.localCluster }}' userName: sdnctl userCredentialsExternalSecret: *dbSecretName @@ -217,8 +217,9 @@ cds: dmaap-listener: nameOverride: sdnc-dmaap-listener mariadb-galera: - << : *mariadbGalera + <<: *mariadbGalera config: + <<: *mariadbGaleraConfig mysqlDatabase: *sdncDbName config: sdncChartName: sdnc @@ -229,8 +230,9 @@ dmaap-listener: ueb-listener: mariadb-galera: - << : *mariadbGalera + <<: *mariadbGalera config: + <<: *mariadbGaleraConfig mysqlDatabase: *sdncDbName nameOverride: sdnc-ueb-listener config: @@ -241,8 +243,9 @@ ueb-listener: sdnc-portal: mariadb-galera: - << : *mariadbGalera + <<: *mariadbGalera config: + <<: *mariadbGaleraConfig mysqlDatabase: *sdncDbName config: sdncChartName: sdnc @@ -253,8 +256,9 @@ sdnc-ansible-server: config: restCredsExternalSecret: *ansibleSecretName mariadb-galera: - << : *mariadbGalera + <<: *mariadbGalera config: + <<: *mariadbGaleraConfig mysqlDatabase: ansible service: name: sdnc-ansible-server |