[CASSANDRA] Update Cassandra version and set Reaper image

- Update the cassandra version to 4.1.8
- Update _casOp template to make the reaper version configurable
- Set reaper version to 3.8.0

Issue-ID: OOM-3342

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

diff --git a/kubernetes/aai/Chart.yaml b/kubernetes/aai/Chart.yaml
index fb6f677..474ddaa 100644 (file)
--- a/kubernetes/aai/Chart.yaml
+++ b/kubernetes/aai/Chart.yaml
@@ -18,14 +18,14 @@
 apiVersion: v2
 description: ONAP Active and Available Inventory
 name: aai
-version: 16.0.0
+version: 16.0.1
 
 dependencies:
   - name: common
     version: ~13.x-0
     repository: '@local'
   - name: cassandra
-    version: ~13.x-0
+    version: ~16.x-0
     # local reference to common chart, as it is
     # a part of this chart's package and will not
     # be published independently to a repo (at this point)

diff --git a/kubernetes/common/cassandra/Chart.yaml b/kubernetes/common/cassandra/Chart.yaml
index 544ebb2..9c86146 100644 (file)
--- 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.1.1
+version: 16.0.0
 
 dependencies:
   - name: common

diff --git a/kubernetes/common/cassandra/values.yaml b/kubernetes/common/cassandra/values.yaml
index e69d305..b8632af 100644 (file)
--- a/kubernetes/common/cassandra/values.yaml
+++ b/kubernetes/common/cassandra/values.yaml
@@ -29,7 +29,7 @@ global: # global defaults
     enableServiceAccount: false
 
 k8ssandraOperator:
-  cassandraVersion: 4.1.6
+  cassandraVersion: 4.1.8
   persistence:
     #storageClassName: default
     size: 10Gi
@@ -66,6 +66,7 @@ k8ssandraOperator:
           memory: 8Gi
   reaper:
     enabled: true
+    tag: 3.8.0
   stargate:
     enabled: false
     tag: v1.0.77

diff --git a/kubernetes/common/common/Chart.yaml b/kubernetes/common/common/Chart.yaml
index 5c4d727..df6138b 100644 (file)
--- a/kubernetes/common/common/Chart.yaml
+++ b/kubernetes/common/common/Chart.yaml
@@ -17,4 +17,4 @@
 apiVersion: v2
 description: Common templates for inclusion in other charts
 name: common
-version: 13.2.17
+version: 13.2.19

diff --git a/kubernetes/common/common/templates/_cassOp.tpl b/kubernetes/common/common/templates/_cassOp.tpl
index c707312..bbcdf91 100644 (file)
--- a/kubernetes/common/common/templates/_cassOp.tpl
+++ b/kubernetes/common/common/templates/_cassOp.tpl
@@ -29,6 +29,7 @@ spec:
       registry: {{ include "repositoryGenerator.dockerHubRepository" . }}
     containerImage:
       registry: {{ include "repositoryGenerator.dockerHubRepository" . }}
+      tag: {{ .Values.k8ssandraOperator.reaper.tag }}
     autoScheduling:
       enabled: true
     metadata:

diff --git a/kubernetes/common/common/templates/_labels.tpl b/kubernetes/common/common/templates/_labels.tpl
index b2b490a..97e2e7f 100644 (file)
--- a/kubernetes/common/common/templates/_labels.tpl
+++ b/kubernetes/common/common/templates/_labels.tpl
@@ -79,7 +79,12 @@ app.kubernetes.io/instance: {{ include "common.release" $dot }}
 {{- $suffix := default "" .suffix -}}
 {{- $labels := default (dict) .labels -}}
 {{- $annotations := default (dict) .annotations -}}
+{{- $includeFullname := default "true" .includeFullname -}}
+{{- if eq ($includeFullname | lower) "true" -}}
 name: {{ include "common.fullname" (dict "suffix" $suffix "dot" $dot )}}
+{{- else -}}
+name: {{ include "common.name" (dict "suffix" $suffix "dot" $dot )}}
+{{- end }}
 namespace: {{ include "common.namespace" $dot }}
 labels: {{- include "common.labels" (dict "labels" $labels "ignoreHelmChart" .ignoreHelmChart "dot" $dot ) | nindent 2 }}
 {{- if $annotations }}
@@ -109,10 +114,11 @@ matchLabels: {{- include "common.matchLabels" (dict "matchLabels" $matchLabels "
 {{- define "common.templateMetadata" -}}
 {{- $dot := default . .dot -}}
 {{- $labels := default (dict) .labels -}}
+{{- $suffix := default "" .suffix -}}
 {{- $annotations := default $dot.Values.podAnnotations .annotations -}}
 {{- if $annotations}}
 annotations: {{- include "common.tplValue" (dict "value" $annotations "context" $dot) | nindent 2 }}
 {{- end }}
 labels: {{- include "common.labels" (dict "labels" $labels "ignoreHelmChart" .ignoreHelmChart "dot" $dot) | nindent 2 }}
-name: {{ include "common.name" $dot }}
+name: {{ include "common.name" (dict "suffix" $suffix "dot" $dot )}}
 {{- end -}}

diff --git a/kubernetes/common/common/templates/_name.tpl b/kubernetes/common/common/templates/_name.tpl
index 0805508..39f50bc 100644 (file)
--- a/kubernetes/common/common/templates/_name.tpl
+++ b/kubernetes/common/common/templates/_name.tpl
@@ -51,9 +51,9 @@
      - .prefix : add a prefix to the fullname
 */}}
 {{- define "common.fullname" -}}
-{{- $dot := default . .dot -}}
-{{- $suffix := default "" .suffix -}}
-{{- $prefix := default "" .prefix -}}
+  {{- $dot := default . .dot -}}
+  {{- $suffix := default "" .suffix -}}
+  {{- $prefix := default "" .prefix -}}
   {{- $name := default $dot.Chart.Name $dot.Values.nameOverride -}}
   {{/* when linted, the name must be lower cased. When used from a component,
        name should be overriden in order to avoid collision so no need to do it */}}

diff --git a/kubernetes/onap/Chart.yaml b/kubernetes/onap/Chart.yaml
index 93dbfa4..c3b7943 100644 (file)
--- a/kubernetes/onap/Chart.yaml
+++ b/kubernetes/onap/Chart.yaml
@@ -34,7 +34,7 @@ dependencies:
     repository: '@local'
     condition: aai.enabled
   - name: cassandra
-    version: ~13.x-0
+    version: ~16.x-0
     repository: '@local'
     condition: cassandra.enabled
   - name: cds

diff --git a/kubernetes/sdc/Chart.yaml b/kubernetes/sdc/Chart.yaml
index 7ed46ed..68ee222 100644 (file)
--- a/kubernetes/sdc/Chart.yaml
+++ b/kubernetes/sdc/Chart.yaml
@@ -19,7 +19,7 @@
 apiVersion: v2
 description: Service Design and Creation Umbrella Helm charts
 name: sdc
-version: 13.0.6
+version: 13.0.7
 
 dependencies:
   - name: common

diff --git a/kubernetes/sdc/components/sdc-cs/Chart.yaml b/kubernetes/sdc/components/sdc-cs/Chart.yaml
index f04d09d..dded8cd 100644 (file)
--- a/kubernetes/sdc/components/sdc-cs/Chart.yaml
+++ b/kubernetes/sdc/components/sdc-cs/Chart.yaml
@@ -19,7 +19,7 @@
 apiVersion: v2
 description: ONAP Service Design and Creation Cassandra
 name: sdc-cs
-version: 13.0.4
+version: 13.0.5
 
 dependencies:
   - name: common
@@ -32,7 +32,7 @@ dependencies:
     version: ~13.x-0
     repository: '@local'
   - name: cassandra
-    version: ~13.x-0
+    version: ~16.x-0
     # local reference to common chart, as it is
     # a part of this chart's package and will not
     # be published independently to a repo (at this point)