Upgrade onap submodule version to oslo

ONAP OOM submodule version upgraded to OSLO
Strimzi version changed to 0.44.0
DMAAP related override configuration removed as DMAAP has been removed from OOM

Issue-ID: NONRTRIC-1020
Change-Id: I6472a6a8fdb8ba2d1eb142d77123a8e8b802cf83
Signed-off-by: aravind.est <aravindhan.a@est.tech>

diff --git a/smo-install/helm-override/default/onap-override.yaml b/smo-install/helm-override/default/onap-override.yaml
index 6c1ae4c..40f22f3 100644 (file)
--- a/smo-install/helm-override/default/onap-override.yaml
+++ b/smo-install/helm-override/default/onap-override.yaml
@@ -1,7 +1,7 @@
 # Copyright © 2017 Amdocs, Bell Canada
 #
 # Modifications Copyright © 2021 AT&T
-# Modifications Copyright (C) 2024 OpenInfra Foundation Europe. All rights reserved.
+# Modifications Copyright (C) 2024-2025 OpenInfra Foundation Europe. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -142,14 +142,6 @@ dcaegen2-services:
     enabled: false
   dcae-ves-openapi-manager:
     enabled: false
-dmaap:
-  enabled: true
-  message-router:
-    enabled: true
-  dmaap-dr-node:
-    enabled: false
-  dmaap-dr-prov:
-    enabled: false
 mariadb-galera:
   enabled: true
   replicaCount: 1
@@ -230,3 +222,21 @@ sdnc:
 strimzi:
   enabled: true
   replicaCount: 1
+  # This runs the kafka container with root privileges
+  # This is required because of the permission issues with the volume mount
+  # This should be re-eveluated once the permission issues are resolved
+  kafka:
+    template:
+      kafkaContainer:
+        securityContext:
+          runAsNonRoot: false
+          runAsUser: 0
+  # This runs the zookeeper container with root privileges
+  # This is required because of the permission issues with the volume mount
+  # This should be re-eveluated once the permission issues are resolved
+  zookeeper:
+    template:
+      zookeeperContainer:
+        securityContext:
+          runAsNonRoot: false
+          runAsUser: 0
\ No newline at end of file

diff --git a/smo-install/onap_oom b/smo-install/onap_oom
index acb9fda..bfb1e3c 160000 (submodule)
--- a/smo-install/onap_oom
+++ b/smo-install/onap_oom
@@ -1 +1 @@
-Subproject commit acb9fda1b15519023f5a46e93bee527a21aa316d
+Subproject commit bfb1e3ca7140e0f16ac05811f1fcbdfdc992de17

diff --git a/smo-install/scripts/packages/strimzi-kafka-operator-helm-3-chart-0.36.1.tgz b/smo-install/scripts/packages/strimzi-kafka-operator-helm-3-chart-0.36.1.tgz
deleted file mode 100644 (file)
index e69db44..0000000
Binary files a/smo-install/scripts/packages/strimzi-kafka-operator-helm-3-chart-0.36.1.tgz and /dev/null differ

diff --git a/smo-install/scripts/packages/strimzi-kafka-operator-helm-3-chart-0.44.0.tgz b/smo-install/scripts/packages/strimzi-kafka-operator-helm-3-chart-0.44.0.tgz
new file mode 100644 (file)
index 0000000..8f87191
Binary files /dev/null and b/smo-install/scripts/packages/strimzi-kafka-operator-helm-3-chart-0.44.0.tgz differ

diff --git a/smo-install/scripts/sub-scripts/install-onap.sh b/smo-install/scripts/sub-scripts/install-onap.sh
index 0e15853..118621d 100755 (executable)
--- a/smo-install/scripts/sub-scripts/install-onap.sh
+++ b/smo-install/scripts/sub-scripts/install-onap.sh
@@ -6,6 +6,7 @@
 # ================================================================================
 # Copyright (C) 2021 AT&T Intellectual Property. All rights
 #                             reserved.
+# Modification Copyright (C) 2025 OpenInfra Foundation Europe. All rights reserved.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -27,9 +28,9 @@ SCRIPT=$(readlink -f "$0")
 SCRIPT_PATH=$(dirname "$SCRIPT")
 cd $SCRIPT_PATH
 
-helm cm-push ../packages/strimzi-kafka-operator-helm-3-chart-0.36.1.tgz local
+helm cm-push ../packages/strimzi-kafka-operator-helm-3-chart-0.44.0.tgz local
 helm repo update
-helm install strimzi-kafka-operator local/strimzi-kafka-operator --namespace strimzi-system --version 0.36.1 --set watchAnyNamespace=true --create-namespace
+helm install strimzi-kafka-operator local/strimzi-kafka-operator --namespace strimzi-system --version 0.44.0 --set watchAnyNamespace=true --create-namespace
 
 kubectl create namespace onap
 echo '### Installing ONAP part ###'