aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukasz Rajewski <lukasz.rajewski@t-mobile.pl>2024-04-05 06:52:27 +0000
committerGerrit Code Review <gerrit@onap.org>2024-04-05 06:52:27 +0000
commitf1a3f7f6d93d070d1f733af8eb116e3ea8f76704 (patch)
tree4a3ea26f7adcbc53769cf1eb33f2c7aa7346a776
parent6d5a8690d675f65a8ec38b2c03f6fde2c2d2d9b8 (diff)
parent54ee982a1df59b2ad66ff07c3507e6ef5f638647 (diff)
Merge "[STRIMZI] Update strimzi-kafka-operator and kafka versions"
-rw-r--r--docs/sections/guides/infra_guides/oom_infra_deployment_requirements.rst2
-rw-r--r--kubernetes/dmaap/components/message-router/templates/statefulset.yaml18
-rw-r--r--kubernetes/strimzi/Chart.yaml2
-rw-r--r--kubernetes/strimzi/values.yaml2
4 files changed, 10 insertions, 14 deletions
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 dbb965dd86..4b2a7528cb 100644
--- 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 399e54f75a..74832848bb 100644
--- 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 2951c24a30..1b927d6c4d 100644
--- 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 3b420821ff..3cced3e41a 100644
--- 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