From 0ebd1ae06259318d72ef7b9f14f83e5b3db11870 Mon Sep 17 00:00:00 2001 From: Andreas Geissler Date: Thu, 10 Nov 2022 13:07:55 +0100 Subject: [DOC] Update release version for RTDs in Kohn Modify the versions in conf.* files to create Kohn RTDs Issue-ID: OOM-3040 Signed-off-by: Andreas Geissler Change-Id: I43334f1f642aa61ca7b0c6becbd8efcfece56dce --- docs/conf.py | 8 ++++---- docs/conf.yaml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/conf.py b/docs/conf.py index 6e3da64513..39f5051de4 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -1,6 +1,6 @@ project = "onap" -release = "master" -version = "master" +release = "kohn" +version = "kohn" author = "Open Network Automation Platform" # yamllint disable-line rule:line-length @@ -32,7 +32,7 @@ exclude_patterns = ['archived/*.rst', '.tox'] # Change to {releasename} after you have created the new 'doc' branch. # -branch = 'latest' +branch = 'kohn' intersphinx_mapping = {} doc_url = 'https://docs.onap.org/projects' @@ -55,4 +55,4 @@ def setup(app): linkcheck_ignore = [ r'http://localhost:\d+/' -] \ No newline at end of file +] diff --git a/docs/conf.yaml b/docs/conf.yaml index ab5928131c..11eaff6045 100644 --- a/docs/conf.yaml +++ b/docs/conf.yaml @@ -3,5 +3,5 @@ project_cfg: onap project: onap # Change this to ReleaseBranchName to modify the header -default-version: latest +default-version: kohn # -- cgit 1.2.3-korg From 8a56671acfd33f4f44c2114ba4c17139f8ea0984 Mon Sep 17 00:00:00 2001 From: efiacor Date: Fri, 18 Nov 2022 09:15:43 +0000 Subject: [STRIMZI] Bump kafka version to 3.2.3 Bump strimzi kafka to 3.2.3 Signed-off-by: efiacor Change-Id: I8921fef35550c7b97e463102a18e3596f958871e Issue-ID: OOM-3057 (cherry picked from commit f78db40dae64ae2d7cbfabac1e798db01df1cf07) --- kubernetes/strimzi/templates/strimzi-kafka.yaml | 4 ++-- kubernetes/strimzi/values.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/kubernetes/strimzi/templates/strimzi-kafka.yaml b/kubernetes/strimzi/templates/strimzi-kafka.yaml index 8fa74b8474..c7dc2aff08 100644 --- a/kubernetes/strimzi/templates/strimzi-kafka.yaml +++ b/kubernetes/strimzi/templates/strimzi-kafka.yaml @@ -71,8 +71,8 @@ spec: offsets.topic.replication.factor: {{ .Values.replicaCount }} transaction.state.log.replication.factor: {{ .Values.replicaCount }} transaction.state.log.min.isr: {{ .Values.replicaCount }} - log.message.format.version: "3.0" - inter.broker.protocol.version: "3.0" + log.message.format.version: {{ .Values.version }} + inter.broker.protocol.version: {{ .Values.version }} storage: type: jbod volumes: diff --git a/kubernetes/strimzi/values.yaml b/kubernetes/strimzi/values.yaml index f88f3a0939..dcfa913604 100644 --- a/kubernetes/strimzi/values.yaml +++ b/kubernetes/strimzi/values.yaml @@ -26,7 +26,7 @@ global: replicaCount: 3 kafkaInternalPort: 9092 saslMechanism: scram-sha-512 -version: 3.1.0 +version: 3.2.3 kafkaStrimziAdminUser: strimzi-kafka-admin persistence: {} -- cgit 1.2.3-korg From 29f699a96cb221c061cd292b5dbfb897b14b154e Mon Sep 17 00:00:00 2001 From: efiacor Date: Fri, 18 Nov 2022 20:34:48 +0000 Subject: [DOC] Update strimzi doc version Bump strimzi in versions table Signed-off-by: efiacor Change-Id: I38ae67827c27db706b4a785f063f452c6a5a2c32 Issue-ID: OOM-3057 --- docs/sections/guides/infra_guides/oom_infra_setup.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/sections/guides/infra_guides/oom_infra_setup.rst b/docs/sections/guides/infra_guides/oom_infra_setup.rst index d8fb743f42..f9668de458 100644 --- a/docs/sections/guides/infra_guides/oom_infra_setup.rst +++ b/docs/sections/guides/infra_guides/oom_infra_setup.rst @@ -58,7 +58,7 @@ The versions of software that are supported by OOM are as follows: Release Kubernetes Helm kubectl Docker Cert-Manager Prometheus Stack Strimzi ============== =========== ======= ======== ======== ============ ================= ======= Jakarta 1.22.4 3.6.3 1.22.4 20.10.x 1.8.0 35.x 0.28.0 - Kohn 1.23.8 3.8.2 1.23.8 20.10.x 1.8.0 35.x 0.31.1 + Kohn 1.23.8 3.8.2 1.23.8 20.10.x 1.8.0 35.x 0.32.0 ============== =========== ======= ======== ======== ============ ================= ======= -- cgit 1.2.3-korg