commit fd450c4959d9cb4d4ae18218aa8b4e597139ce56
author Andreas Geissler <andreas-geissler@telekom.de> Fri Dec 10 08:36:45 2021 +0000
committer Sylvain Desbureaux <sylvain.desbureaux@orange.com> Wed Jan 12 07:53:19 2022 +0000
tree b2441bb12066f58ea1cf927a6aad88335e6b842d
parent 0d2cf1aee02c84d5ff262b4ac1d414fdadf5432b

[SDC] Add missing dependency to cassandra chart

In case of "localCluster: true" the cassandra chart will be added
in sdc-cs subchart. Renamed global section to sdc-cassandra.
Additionally serviceAccount is added to
cassandra definition in sdc-cs (see OOM-2905)

Issue-ID: OOM-2899

Signed-off-by: Andreas Geissler <andreas-geissler@telekom.de>
Change-Id: Id943db249a3abd9dbc67e333a05f6c2abd84a810

kubernetes/sdc/resources/config/environments/AUTO.json

diff --git a/kubernetes/sdc/resources/config/environments/AUTO.json b/kubernetes/sdc/resources/config/environments/AUTO.json
index bd76b97..3b03205 100755
--- a/kubernetes/sdc/resources/config/environments/AUTO.json
+++ b/kubernetes/sdc/resources/config/environments/AUTO.json
@@ -9,7 +9,7 @@
 
     "default_attributes": {
         "disableHttp": {{ .Values.global.security.disableHttp }},
-        "CS_VIP": "{{.Values.global.cassandra.serviceName}}.{{include "common.namespace" .}}",
+        "CS_VIP": "{{.Values.global.sdc_cassandra.serviceName}}.{{include "common.namespace" .}}",
         "BE_VIP": "sdc-be.{{include "common.namespace" .}}",
         "ONBOARDING_BE_VIP": "sdc-onboarding-be.{{include "common.namespace" .}}",
         "FE_VIP": "sdc-fe.{{include "common.namespace" .}}",
@@ -37,7 +37,7 @@
         },
         "Nodes": {
             "CS": [
-                "{{.Values.global.cassandra.serviceName}}.{{include "common.namespace" .}}"
+                "{{.Values.global.sdc_cassandra.serviceName}}.{{include "common.namespace" .}}"
             ],
             "BE": "sdc-be.{{include "common.namespace" .}}",
             "ONBOARDING_BE": "sdc-onboarding-be.{{include "common.namespace" .}}",
@@ -79,8 +79,8 @@
             "cassandra_user": "asdc_user",
             "cassandra_password": "Aa1234%^!",
             "concurrent_writes": "32",
-            "cluster_name": "{{.Values.global.cassandra.clusterName}}",
-            "datacenter_name": "{{.Values.global.cassandra.dataCenter}}",
+            "cluster_name": "{{.Values.global.sdc_cassandra.clusterName}}",
+            "datacenter_name": "{{.Values.global.sdc_cassandra.dataCenter}}",
             "multithreaded_compaction": "false",
             "cache_dir": "/var/lib/cassandra/saved_caches",
             "log_file": "/var/lib/cassandra/log/system.log",
@@ -89,10 +89,10 @@
             "socket_read_timeout": "20000",
             "socket_connect_timeout": "20000",
             "janusgraph_connection_timeout": "10000",
-            "replication_factor": "{{.Values.global.cassandra.replicaCount}}",
-            "db_cache": "{{.Values.global.cassandra.dbCache}}",
-            "read_consistency_level": "{{.Values.global.cassandra.readConsistencyLevel}}",
-            "write_consistency_level":"{{.Values.global.cassandra.writeConsistencyLevel}}"
+            "replication_factor": "{{.Values.global.sdc_cassandra.replicaCount}}",
+            "db_cache": "{{.Values.global.sdc_cassandra.dbCache}}",
+            "read_consistency_level": "{{.Values.global.sdc_cassandra.readConsistencyLevel}}",
+            "write_consistency_level":"{{.Values.global.sdc_cassandra.writeConsistencyLevel}}"
         },
       "DMAAP": {
          "consumer": {