[STRIMZI] Update strimzi-kafka-operator and kafka versions

Update the recommended operator version and used kafka versions
in the documentation and onap-strimzi.
Changed the DMaaP MR ststefulset probe settings to ne compliant
to the new operator version.

Issue-ID: OOM-3269

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

diff --git a/docs/sections/guides/infra_guides/oom_infra_deployment_requirements.rst b/docs/sections/guides/infra_guides/oom_infra_deployment_requirements.rst
index dbb965d..4b2a752 100644 (file)
--- a/docs/sections/guides/infra_guides/oom_infra_deployment_requirements.rst
+++ b/docs/sections/guides/infra_guides/oom_infra_deployment_requirements.rst
@@ -50,7 +50,7 @@ The versions of software that are supported and tested by OOM are as follows:
   ==============     ===========  =======  ========  ========  =============  ========
   London             1.23.8       3.8.2    1.23.x    20.10.x   1.12.2         0.35.0
   Montreal           1.27.5       3.12.3   1.27.x    20.10.x   1.13.2         0.36.1
-  New Delhi          1.27.5       3.12.3   1.27.x    20.10.x   1.13.2         0.36.3
+  New Delhi          1.27.5       3.12.3   1.27.x    20.10.x   1.13.2         0.40.0
   ==============     ===========  =======  ========  ========  =============  ========
 
 .. table:: OOM Software Requirements (production)

diff --git a/kubernetes/dmaap/components/message-router/templates/statefulset.yaml b/kubernetes/dmaap/components/message-router/templates/statefulset.yaml
index 399e54f..7483284 100644 (file)
--- a/kubernetes/dmaap/components/message-router/templates/statefulset.yaml
+++ b/kubernetes/dmaap/components/message-router/templates/statefulset.yaml
@@ -34,15 +34,13 @@ spec:
           ports: {{ include "common.containerPorts" . | nindent 10  }}
           {{- if eq .Values.liveness.enabled true }}
           livenessProbe:
-            httpGet:
-              path: /events/__strimzi-topic-operator-kstreams-topic-store-changelog/CG1/C1
+            tcpSocket:
               port: {{ .Values.liveness.port }}
-              scheme: HTTP
-            failureThreshold: {{ .Values.liveness.failureThreshold }}
             initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
             periodSeconds: {{ .Values.liveness.periodSeconds }}
-            successThreshold: {{ .Values.liveness.successThreshold }}
             timeoutSeconds: {{ .Values.liveness.timeoutSeconds }}
+            successThreshold: {{ .Values.liveness.successThreshold }}
+            failureThreshold: {{ .Values.liveness.failureThreshold }}
           {{ end }}
           readinessProbe:
             tcpSocket:
@@ -53,15 +51,13 @@ spec:
             successThreshold: {{ .Values.readiness.successThreshold }}
             failureThreshold: {{ .Values.readiness.failureThreshold }}
           startupProbe:
-            httpGet:
-              path: /events/__strimzi-topic-operator-kstreams-topic-store-changelog/CG1/C1
-              port: {{ .Values.startup.port }}
-              scheme: HTTP
-            failureThreshold: {{ .Values.startup.failureThreshold }}
+            tcpSocket:
+                port: {{ .Values.startup.port }}
             initialDelaySeconds: {{ .Values.startup.initialDelaySeconds }}
             periodSeconds: {{ .Values.startup.periodSeconds }}
-            successThreshold: {{ .Values.startup.successThreshold }}
             timeoutSeconds: {{ .Values.startup.timeoutSeconds }}
+            successThreshold: {{ .Values.startup.successThreshold }}
+            failureThreshold: {{ .Values.startup.failureThreshold }}
           env:
           - name: JAASLOGIN
             valueFrom:

diff --git a/kubernetes/strimzi/Chart.yaml b/kubernetes/strimzi/Chart.yaml
index 2951c24..1b927d6 100644 (file)
--- a/kubernetes/strimzi/Chart.yaml
+++ b/kubernetes/strimzi/Chart.yaml
@@ -15,7 +15,7 @@
 apiVersion: v2
 description: ONAP Strimzi Kafka
 name: strimzi
-version: 13.0.0
+version: 13.0.1
 
 dependencies:
   - name: common

diff --git a/kubernetes/strimzi/values.yaml b/kubernetes/strimzi/values.yaml
index 3b42082..3cced3e 100644 (file)
--- a/kubernetes/strimzi/values.yaml
+++ b/kubernetes/strimzi/values.yaml
@@ -33,7 +33,7 @@ affinity:
   podAntiAffinity:
     enabled: true
 config:
-  kafkaVersion: 3.4.0
+  kafkaVersion: 3.7.0
   authType: simple
   saslMechanism: &saslMech scram-sha-512
   kafkaInternalPort: &plainPort 9092