From cfd8434fe9484b9219560159094b174421d6d6a2 Mon Sep 17 00:00:00 2001 From: Andreas Geissler Date: Wed, 16 Aug 2023 17:18:49 +0200 Subject: [MARIADB][COMMON] Add support for mariadb-operator Add template functions for the mariadb-operator resources and update the mariadb-galera chart to support them Change the flag to "useOperator" in cassandra to the global setup and additional labels for cassandra resources Changed Policy DB users to support the new mariadb User and fixed db.sh script to wait for the DB user creation Use the new readiness image 5.0.1 with the "app-name" option Change the MariaDB-Galera Service to the "primary" to avoid Deadlocks Fix previous SDNC patch (https://gerrit.onap.org/r/c/oom/+/135308) and temporary disable MariaDB for SDNR, as it is not compatible to MariaDB 11 Issue-ID: OOM-3236 Change-Id: Ie63fcc9c6d5fa802d38c592b449e7ff8553c2ab9 Signed-off-by: Andreas Geissler --- kubernetes/sdc/components/sdc-cs/templates/job.yaml | 2 +- kubernetes/sdc/components/sdc-cs/values.yaml | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) (limited to 'kubernetes/sdc/components/sdc-cs') diff --git a/kubernetes/sdc/components/sdc-cs/templates/job.yaml b/kubernetes/sdc/components/sdc-cs/templates/job.yaml index 61104ede0b..3738ff4a22 100644 --- a/kubernetes/sdc/components/sdc-cs/templates/job.yaml +++ b/kubernetes/sdc/components/sdc-cs/templates/job.yaml @@ -34,7 +34,7 @@ spec: command: - /app/ready.py args: - - --container-name + - --app-name {{- if .Values.global.sdc_cassandra.localCluster }} - sdc-cs {{- else }} diff --git a/kubernetes/sdc/components/sdc-cs/values.yaml b/kubernetes/sdc/components/sdc-cs/values.yaml index e5d1c84129..ac8103e380 100644 --- a/kubernetes/sdc/components/sdc-cs/values.yaml +++ b/kubernetes/sdc/components/sdc-cs/values.yaml @@ -25,6 +25,14 @@ global: #This flag allows SDC to instantiate its own cluster, serviceName #should be sdc-cs if this flag is enabled localCluster: false + + # in case of a local cassandra cluster + # flag to enable the DB creation via k8ssandra-operator + useOperator: true + # if useOperator set to "true", set "enableServiceAccount to "false" + # as the SA is created by the Operator + enableServiceAccount: false + #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: @@ -59,7 +67,6 @@ cassandra: mountSubPath: sdc/sdc-cs/CS enabled: true k8ssandraOperator: - enabled: false config: clusterName: sdc-cs -- cgit 1.2.3-korg