From c4851c859da2967f8e5748ce22d0416bc14c7b9a Mon Sep 17 00:00:00 2001
From: Andreas Geissler <andreas-geissler@telekom.de>
Date: Fri, 23 Feb 2024 09:06:17 +0100
Subject: [PATCH] [CASSANDRA] Update cassandra version and fix timeouts

Update cassandra to 4.1.3 and increase the write timeouts
to improve the AAI/SDC stability.
Increase the cql client version in SDC to be compliant with cassandra

Issue-ID: OOM-3275

Change-Id: Ie1b2f4d38e580eecacd416fca4e392b4a8b0c62a
Signed-off-by: Andreas Geissler <andreas-geissler@telekom.de>
---
 kubernetes/common/cassandra/Chart.yaml       | 2 +-
 kubernetes/common/cassandra/values.yaml      | 8 +++++---
 kubernetes/sdc/components/sdc-cs/values.yaml | 5 +++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/kubernetes/common/cassandra/Chart.yaml b/kubernetes/common/cassandra/Chart.yaml
index 75e07a1373..ee3f4e5355 100644
--- a/kubernetes/common/cassandra/Chart.yaml
+++ b/kubernetes/common/cassandra/Chart.yaml
@@ -18,7 +18,7 @@
 apiVersion: v2
 description: ONAP cassandra
 name: cassandra
-version: 13.0.0
+version: 13.1.0
 
 dependencies:
   - name: common
diff --git a/kubernetes/common/cassandra/values.yaml b/kubernetes/common/cassandra/values.yaml
index 205c7113df..b5c74ea3ef 100644
--- a/kubernetes/common/cassandra/values.yaml
+++ b/kubernetes/common/cassandra/values.yaml
@@ -29,7 +29,7 @@ global: # global defaults
     enableServiceAccount: false
 
 k8ssandraOperator:
-  cassandraVersion: 4.0.10
+  cassandraVersion: 4.1.3
   persistence:
     #storageClassName: default
     size: 10Gi
@@ -40,6 +40,8 @@ k8ssandraOperator:
     superuserPassword: &superuserpassword cassandra
     casOptions:
       authorizer: AllowAllAuthorizer
+      write_request_timeout: 10000ms
+      counter_write_request_timeout: 15000ms
     jvmOptions:
       heap_initial_size: 512M
       heap_max_size: 4096M
@@ -50,8 +52,8 @@ k8ssandraOperator:
   reaper:
     enabled: true
   stargate:
-    enabled: true
-    tag: v1.0.76
+    enabled: false
+    tag: v1.0.77
     size: 1
     jvmOptions:
       heapSize: 384Mi
diff --git a/kubernetes/sdc/components/sdc-cs/values.yaml b/kubernetes/sdc/components/sdc-cs/values.yaml
index 364c36313e..2c896ea77f 100644
--- a/kubernetes/sdc/components/sdc-cs/values.yaml
+++ b/kubernetes/sdc/components/sdc-cs/values.yaml
@@ -48,8 +48,9 @@ global:
     clusterName: cassandra
     #datacenter name (use "dc1" in case of k8ssandra-operator, otherwise "Pod")
     dataCenter: dc1
-    #cqlVersion for cassandra 3.11.* must be "3.4.4" and cassandra 4.* must be "3.4.5"
-    cqlVersion: "3.4.5"
+    #cqlVersion for cassandra 3.11.* must be "3.4.4" and cassandra 4.0.* must be "3.4.5"
+    #and cassandra 4.1.* must be "3.4.6"
+    cqlVersion: "3.4.6"
 
 #################################################################
 # Application configuration defaults.
-- 
2.16.6