From: Andreas Geissler Date: Mon, 10 Jul 2023 12:31:00 +0000 (+0200) Subject: [CASSANDRA] Enable new cassandra version using operator X-Git-Tag: 13.0.0-DOC~36 X-Git-Url: https://gerrit.onap.org/r/gitweb?p=oom.git;a=commitdiff_plain;h=e5f9156814f2571b0f4b79a4ba5789b743d837db [CASSANDRA] Enable new cassandra version using operator Deployment of shared cassandra (4.0.1) using k8ssandra-operator AAI config update to use new cassandra SDC config update to use new cassandra correct link in the oom_infra_optional_addons.rst Issue-ID: OOM-3226 Signed-off-by: Andreas Geissler Change-Id: Ieeec9ad5c22a0674a477741d0515ae4515c6f3b8 --- diff --git a/docs/sections/guides/infra_guides/oom_infra_optional_addons.rst b/docs/sections/guides/infra_guides/oom_infra_optional_addons.rst index 8b15f6c7c2..ad1104e569 100644 --- a/docs/sections/guides/infra_guides/oom_infra_optional_addons.rst +++ b/docs/sections/guides/infra_guides/oom_infra_optional_addons.rst @@ -4,7 +4,7 @@ .. Copyright (C) 2022 Nordix Foundation .. Links -.. _Prometheus stack README: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack#readme +.. _Prometheus stack README: https://github.com/prometheus-community/helm-charts/blob/main/charts/kube-prometheus-stack/README.md .. _ONAP Next Generation Security & Logging Structure: https://wiki.onap.org/pages/viewpage.action?pageId=103417456 .. _Istio setup guide: https://istio.io/latest/docs/setup/install/helm/ .. _Kiali setup guide: https://kiali.io/docs/installation/installation-guide/example-install/ diff --git a/kubernetes/aai/values.yaml b/kubernetes/aai/values.yaml index c40dbe0d2d..d822476af4 100644 --- a/kubernetes/aai/values.yaml +++ b/kubernetes/aai/values.yaml @@ -43,11 +43,11 @@ global: # global defaults #Override it to aai-cassandra if localCluster is enabled. #in case of using k8ssandra-operator in the common cassandra installation #the service name is: - #serviceName: cassandra-dc1-service + serviceName: cassandra-dc1-service #in case of local k8ssandra-operator instance it is #serviceName: aai-cassandra-dc1-service #in case the older cassandra installation is used: - serviceName: cassandra + #serviceName: cassandra #This should be same as shared cassandra instance or if localCluster is enabled #then it should be same as aai-cassandra replicaCount diff --git a/kubernetes/common/cassandra/values.yaml b/kubernetes/common/cassandra/values.yaml index 66e6d795cc..5bff17eaef 100644 --- a/kubernetes/common/cassandra/values.yaml +++ b/kubernetes/common/cassandra/values.yaml @@ -23,7 +23,7 @@ global: # global defaults mountPath: /dockerdata-nfs/backup k8ssandraOperator: - enabled: false + enabled: true cassandraVersion: 4.0.1 persistence: storageClassName: default diff --git a/kubernetes/sdc/components/sdc-cs/values.yaml b/kubernetes/sdc/components/sdc-cs/values.yaml index 3f7a88f318..e5d1c84129 100644 --- a/kubernetes/sdc/components/sdc-cs/values.yaml +++ b/kubernetes/sdc/components/sdc-cs/values.yaml @@ -28,20 +28,20 @@ global: #The cassandra service name to connect to (default: shared cassandra service) #in case of using k8ssandra-operator in the common cassandra installation #the service name is: - #serviceName: cassandra-dc1-service + serviceName: cassandra-dc1-service #in case of local k8ssandra-operator instance it is #serviceName: sdc-cs-dc1-service #in case the older cassandra installation is used: - serviceName: cassandra + #serviceName: cassandra #Shared cassandra cluster replicaCount, should be changed if localCluster is enabled #to match with its own cluster replica replicaCount: 3 clusterName: cassandra #datacenter name (use "dc1" in case of k8ssandra-operator, otherwise "Pod") - dataCenter: Pod + dataCenter: dc1 #cqlVersion for cassandra 3.11.* must be "3.4.4" and cassandra 4.* must be "3.4.5" - cqlVersion: "3.4.4" + cqlVersion: "3.4.5" ################################################################# # Application configuration defaults. diff --git a/kubernetes/sdc/values.yaml b/kubernetes/sdc/values.yaml index 955ac4b46e..80481d4c70 100644 --- a/kubernetes/sdc/values.yaml +++ b/kubernetes/sdc/values.yaml @@ -32,9 +32,9 @@ global: #The cassandra service name to connect to (default: shared cassandra service) #in case of using k8ssandra-operator in the common cassandra installation #the service name is: - #serviceName: cassandra-dc1-service + serviceName: cassandra-dc1-service #in case the older cassandra installation is used: - serviceName: cassandra + #serviceName: cassandra #Shared cassandra cluster replicaCount, should be changed if localCluster is enabled #to match with its own cluster replica #see "cassandra: replicaCount" in file sdc-cs/values.yaml) @@ -44,9 +44,9 @@ global: writeConsistencyLevel: ALL clusterName: cassandra #datacenter name (use "dc1" in case of k8ssandra-operator, otherwise "Pod") - dataCenter: Pod + dataCenter: dc1 #cqlVersion for cassandra 3.11.* must be "3.4.4" and cassandra 4.* must be "3.4.5" - cqlVersion: "3.4.4" + cqlVersion: "3.4.5" centralizedLoggingEnabled: true # global Kafka config passed to sdc-be chart