From a9d4403245a733f3ecfd3aaea0926dbf91d7168f Mon Sep 17 00:00:00 2001 From: Konrad Bańka Date: Thu, 19 Mar 2020 18:31:34 +0100 Subject: Correct defining dicts using yaml's anchors MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Change-Id: I15dfe0219ee1d6bcde7d29821ed2650bc8698244 --- kubernetes/sdnc/values.yaml | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'kubernetes') 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 -- cgit 1.2.3-korg