Add individual control flag for RANPM common components

RANPM components are provided with individual flags.
SMO Patch operations are provided with flags to control with the overrride files.
Installation flavours updated to support the required patching/RANPM common components.

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

diff --git a/smo-install/helm-override/default/oran-override.yaml b/smo-install/helm-override/default/oran-override.yaml
index 5f8781f..8ddb72b 100644 (file)
--- a/smo-install/helm-override/default/oran-override.yaml
+++ b/smo-install/helm-override/default/oran-override.yaml
@@ -58,9 +58,34 @@ nonrtric:
     - name: dmeparticipant-ku
       dependsOn: nonrtric.installDmeparticipant
 
+# This common index used by NONRTRIC components
 common:
   releasePrefix: r3-dev-nonrtric
   ingressClassName: kong
+  # This is the common configuration for SMO components
+  enabled: true # This controls all components and patches of smo/common
+  influxdb2:
+    enabled: true
+  kafka-client:
+    enabled: true
+  keycloak:
+    enabled: true
+  keycloak-proxy:
+    enabled: true
+  minio:
+    enabled: true
+  opa:
+    enabled: true
+  opa-rule-db:
+    enabled: true
+  redpanda-console:
+    enabled: true
+  # This controls the patching in smo installation
+  patch:
+    strimzi: true # This patch adds oauth+keycloak based listener to strimzi (Used by RANPM)
+    vescollector: true # This patch adds Rel18 Schema (https://forge.3gpp.org/rep/sa5/MnS/-/archive/Rel-18/MnS-Rel-18.tar?path=OpenAPI) to VES Collector
+    policy: true # This patch adds wildcard access to the policy kafkausers
+    cps: true # This patch adds kafkauser patch for CPS
 
 informationservice:
   persistence:

diff --git a/smo-install/helm-override/ranpm/oran-flavour-config.yaml b/smo-install/helm-override/ranpm/oran-flavour-config.yaml
index b5748e6..e21ff78 100644 (file)
--- a/smo-install/helm-override/ranpm/oran-flavour-config.yaml
+++ b/smo-install/helm-override/ranpm/oran-flavour-config.yaml
@@ -25,5 +25,10 @@ nonrtric:
   installCapifcore: false
   installServicemanager: false
 
+common:
+  patch:
+    policy: false
+    cps: false
+
 smo:
   installTeiv: false

diff --git a/smo-install/helm-override/rappmanager/oran-flavour-config.yaml b/smo-install/helm-override/rappmanager/oran-flavour-config.yaml
index d62dd04..e5084f1 100644 (file)
--- a/smo-install/helm-override/rappmanager/oran-flavour-config.yaml
+++ b/smo-install/helm-override/rappmanager/oran-flavour-config.yaml
@@ -22,5 +22,29 @@ nonrtric:
   installDmaapadapterservice: false
   installRanpm: false
 
+common:
+  influxdb2:
+    enabled: false
+  kafka-client:
+    enabled: false
+  keycloak:
+    enabled: false
+  keycloak-proxy:
+    enabled: false
+  minio:
+    enabled: false
+  opa:
+    enabled: false
+  opa-rule-db:
+    enabled: false
+  redpanda-console:
+    enabled: false
+  # This controls the patching in smo installation
+  patch:
+    strimzi: false
+    vescollector: false
+    policy: true
+    cps: false
+
 smo:
   installTeiv: false

diff --git a/smo-install/helm-override/standalone-nonrtric/oran-flavour-config.yaml b/smo-install/helm-override/standalone-nonrtric/oran-flavour-config.yaml
index 414c315..e8a455f 100644 (file)
--- a/smo-install/helm-override/standalone-nonrtric/oran-flavour-config.yaml
+++ b/smo-install/helm-override/standalone-nonrtric/oran-flavour-config.yaml
@@ -16,21 +16,13 @@
 #
 
 nonrtric:
-  installPms: true
-  installA1controller: true
-  installA1simulator: true
-  installControlpanel: true
-  installInformationservice: true
-  installNonrtricgateway: true
-  installKong: true
   installTopology: false
-  installDmaapadapterservice: true
   installDmeparticipant: false
-  installrAppmanager: true
-  installCapifcore: true
-  installServicemanager: true
   installRanpm: false
 
+common:
+  enabled: false
+
 smo:
   installTeiv: false
 

diff --git a/smo-install/oran_oom/smo/common/Chart.yaml b/smo-install/oran_oom/smo/common/Chart.yaml
index b6a821a..ed7db82 100644 (file)
--- a/smo-install/oran_oom/smo/common/Chart.yaml
+++ b/smo-install/oran_oom/smo/common/Chart.yaml
@@ -27,24 +27,32 @@ dependencies:
   - name: influxdb2
     version: 0.1.0
     repository: "file://influxdb2"
+    condition: influxdb2.enabled
   - name: kafka-client
     version: 0.1.0
     repository: "file://kafka-client"
+    condition: kafka-client.enabled
   - name: keycloak
     version: 0.1.0
     repository: "file://keycloak"
+    condition: keycloak.enabled
   - name: keycloak-proxy
     version: 0.1.0
     repository: "file://keycloak-proxy"
+    condition: keycloak-proxy.enabled
   - name: minio
     version: 0.1.0
     repository: "file://minio"
+    condition: minio.enabled
   - name: opa
     version: 0.1.0
     repository: "file://opa"
+    condition: opa.enabled
   - name: opa-rule-db
     version: 0.1.0
     repository: "file://opa-rule-db"
+    condition: opa-rule-db.enabled
   - name: redpanda-console
     version: 0.1.0
-    repository: "file://redpanda-console"
\ No newline at end of file
+    repository: "file://redpanda-console"
+    condition: redpanda-console.enabled
\ No newline at end of file

diff --git a/smo-install/oran_oom/smo/common/templates/cps-kafkauser-patch-configmap.yaml b/smo-install/oran_oom/smo/common/templates/cps-kafkauser-patch-configmap.yaml
index 3cb324b..e52eb64 100644 (file)
--- a/smo-install/oran_oom/smo/common/templates/cps-kafkauser-patch-configmap.yaml
+++ b/smo-install/oran_oom/smo/common/templates/cps-kafkauser-patch-configmap.yaml
@@ -15,6 +15,7 @@
 #  ============LICENSE_END=================================================
 #
 
+{{- if .Values.patch.cps }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -23,4 +24,5 @@ metadata:
     "helm.sh/hook": pre-install
     "helm.sh/hook-weight": "2"
 data:
-{{ tpl (.Files.Glob "resources/patch-cps-kafka-users.sh").AsConfig . | indent 2 }}
\ No newline at end of file
+{{ tpl (.Files.Glob "resources/patch-cps-kafka-users.sh").AsConfig . | indent 2 }}
+{{- end }}
\ No newline at end of file

diff --git a/smo-install/oran_oom/smo/common/templates/cps-kafkauser-patch-rbac.yaml b/smo-install/oran_oom/smo/common/templates/cps-kafkauser-patch-rbac.yaml
index dd0c1c2..715e6f0 100644 (file)
--- a/smo-install/oran_oom/smo/common/templates/cps-kafkauser-patch-rbac.yaml
+++ b/smo-install/oran_oom/smo/common/templates/cps-kafkauser-patch-rbac.yaml
@@ -14,6 +14,7 @@
 #  limitations under the License.
 #  ============LICENSE_END=================================================
 
+{{- if .Values.patch.cps }}
 apiVersion: v1
 kind: ServiceAccount
 metadata:
@@ -50,4 +51,5 @@ roleRef:
 subjects:
 - kind: ServiceAccount
   name: cps-kafkauser-patch-sa
-  namespace: smo
\ No newline at end of file
+  namespace: smo
+{{- end }}

diff --git a/smo-install/oran_oom/smo/common/templates/cps-kafkauser-patch.yaml b/smo-install/oran_oom/smo/common/templates/cps-kafkauser-patch.yaml
index 8c8468f..2b343ad 100644 (file)
--- a/smo-install/oran_oom/smo/common/templates/cps-kafkauser-patch.yaml
+++ b/smo-install/oran_oom/smo/common/templates/cps-kafkauser-patch.yaml
@@ -14,6 +14,7 @@
 #   limitations under the License.                                             #
 ################################################################################
 
+{{- if .Values.patch.cps }}
 apiVersion: batch/v1
 kind: Job
 metadata:
@@ -41,3 +42,4 @@ spec:
             name: cps-kafkauser-patch-config
             defaultMode: 0755
       restartPolicy: Never
+{{- end }}

diff --git a/smo-install/oran_oom/smo/common/templates/policy-kafkauser-patch-configmap.yaml b/smo-install/oran_oom/smo/common/templates/policy-kafkauser-patch-configmap.yaml
index 0c79ac1..f41e8c8 100644 (file)
--- a/smo-install/oran_oom/smo/common/templates/policy-kafkauser-patch-configmap.yaml
+++ b/smo-install/oran_oom/smo/common/templates/policy-kafkauser-patch-configmap.yaml
@@ -15,6 +15,7 @@
 #  ============LICENSE_END=================================================
 #
 
+{{- if .Values.patch.policy }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -23,4 +24,5 @@ metadata:
     "helm.sh/hook": pre-install
     "helm.sh/hook-weight": "2"
 data:
-{{ tpl (.Files.Glob "resources/patch-policy-kafka-users.sh").AsConfig . | indent 2 }}
\ No newline at end of file
+{{ tpl (.Files.Glob "resources/patch-policy-kafka-users.sh").AsConfig . | indent 2 }}
+{{- end }}

diff --git a/smo-install/oran_oom/smo/common/templates/policy-kafkauser-patch-rbac.yaml b/smo-install/oran_oom/smo/common/templates/policy-kafkauser-patch-rbac.yaml
index 68ec069..9deb0ec 100644 (file)
--- a/smo-install/oran_oom/smo/common/templates/policy-kafkauser-patch-rbac.yaml
+++ b/smo-install/oran_oom/smo/common/templates/policy-kafkauser-patch-rbac.yaml
@@ -14,6 +14,7 @@
 #  limitations under the License.
 #  ============LICENSE_END=================================================
 
+{{- if .Values.patch.policy }}
 apiVersion: v1
 kind: ServiceAccount
 metadata:
@@ -50,4 +51,5 @@ roleRef:
 subjects:
 - kind: ServiceAccount
   name: policy-kafkauser-patch-sa
-  namespace: smo
\ No newline at end of file
+  namespace: smo
+{{- end }}

diff --git a/smo-install/oran_oom/smo/common/templates/policy-kafkauser-patch.yaml b/smo-install/oran_oom/smo/common/templates/policy-kafkauser-patch.yaml
index 523a3e8..40f9e74 100644 (file)
--- a/smo-install/oran_oom/smo/common/templates/policy-kafkauser-patch.yaml
+++ b/smo-install/oran_oom/smo/common/templates/policy-kafkauser-patch.yaml
@@ -14,6 +14,7 @@
 #   limitations under the License.                                             #
 ################################################################################
 
+{{- if .Values.patch.policy }}
 apiVersion: batch/v1
 kind: Job
 metadata:
@@ -41,3 +42,4 @@ spec:
             name: policy-kafkauser-patch-config
             defaultMode: 0755
       restartPolicy: Never
+{{- end }}
\ No newline at end of file

diff --git a/smo-install/oran_oom/smo/common/templates/strimzi-patch-configmap.yaml b/smo-install/oran_oom/smo/common/templates/strimzi-patch-configmap.yaml
index b51a174..e819e0b 100644 (file)
--- a/smo-install/oran_oom/smo/common/templates/strimzi-patch-configmap.yaml
+++ b/smo-install/oran_oom/smo/common/templates/strimzi-patch-configmap.yaml
@@ -15,6 +15,7 @@
 #  ============LICENSE_END=================================================
 #
 
+{{- if .Values.patch.strimzi }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -23,4 +24,5 @@ metadata:
     "helm.sh/hook": pre-install
     "helm.sh/hook-weight": "2"
 data:
-{{ tpl (.Files.Glob "resources/patch-strimzi-kafka.sh").AsConfig . | indent 2 }}
\ No newline at end of file
+{{ tpl (.Files.Glob "resources/patch-strimzi-kafka.sh").AsConfig . | indent 2 }}
+{{- end }}
\ No newline at end of file

diff --git a/smo-install/oran_oom/smo/common/templates/strimzi-patch-rbac.yaml b/smo-install/oran_oom/smo/common/templates/strimzi-patch-rbac.yaml
index 49a2ef0..cc52fe6 100644 (file)
--- a/smo-install/oran_oom/smo/common/templates/strimzi-patch-rbac.yaml
+++ b/smo-install/oran_oom/smo/common/templates/strimzi-patch-rbac.yaml
@@ -14,6 +14,7 @@
 #  limitations under the License.
 #  ============LICENSE_END=================================================
 
+{{- if .Values.patch.strimzi }}
 apiVersion: v1
 kind: ServiceAccount
 metadata:
@@ -53,4 +54,5 @@ roleRef:
 subjects:
 - kind: ServiceAccount
   name: strimzi-patch-sa
-  namespace: smo
\ No newline at end of file
+  namespace: smo
+{{- end }}

diff --git a/smo-install/oran_oom/smo/common/templates/strimzi-patch.yaml b/smo-install/oran_oom/smo/common/templates/strimzi-patch.yaml
index 0fc751a..be16325 100644 (file)
--- a/smo-install/oran_oom/smo/common/templates/strimzi-patch.yaml
+++ b/smo-install/oran_oom/smo/common/templates/strimzi-patch.yaml
@@ -14,6 +14,7 @@
 #   limitations under the License.                                             #
 ################################################################################
 
+{{- if .Values.patch.strimzi }}
 apiVersion: batch/v1
 kind: Job
 metadata:
@@ -41,3 +42,4 @@ spec:
             name: strimzi-patch-config
             defaultMode: 0755
       restartPolicy: Never
+{{- end }}

diff --git a/smo-install/oran_oom/smo/common/templates/vescollector-patch-configmap.yaml b/smo-install/oran_oom/smo/common/templates/vescollector-patch-configmap.yaml
index 7f872d6..c9ded26 100644 (file)
--- a/smo-install/oran_oom/smo/common/templates/vescollector-patch-configmap.yaml
+++ b/smo-install/oran_oom/smo/common/templates/vescollector-patch-configmap.yaml
@@ -15,6 +15,7 @@
 #  ============LICENSE_END=================================================
 #
 
+{{- if .Values.patch.vescollector }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -23,4 +24,5 @@ metadata:
     "helm.sh/hook": pre-install
     "helm.sh/hook-weight": "2"
 data:
-{{ tpl (.Files.Glob "resources/patch-ves-collector.sh").AsConfig . | indent 2 }}
\ No newline at end of file
+{{ tpl (.Files.Glob "resources/patch-ves-collector.sh").AsConfig . | indent 2 }}
+{{- end }}

diff --git a/smo-install/oran_oom/smo/common/templates/vescollector-patch-rbac.yaml b/smo-install/oran_oom/smo/common/templates/vescollector-patch-rbac.yaml
index 38dbe57..cd89d19 100644 (file)
--- a/smo-install/oran_oom/smo/common/templates/vescollector-patch-rbac.yaml
+++ b/smo-install/oran_oom/smo/common/templates/vescollector-patch-rbac.yaml
@@ -14,6 +14,7 @@
 #  limitations under the License.
 #  ============LICENSE_END=================================================
 
+{{- if .Values.patch.vescollector }}
 apiVersion: v1
 kind: ServiceAccount
 metadata:
@@ -50,4 +51,5 @@ roleRef:
 subjects:
 - kind: ServiceAccount
   name: vescollector-patch-sa
-  namespace: smo
\ No newline at end of file
+  namespace: smo
+{{- end }}

diff --git a/smo-install/oran_oom/smo/common/templates/vescollector-patch.yaml b/smo-install/oran_oom/smo/common/templates/vescollector-patch.yaml
index 5422c3e..0a8426f 100644 (file)
--- a/smo-install/oran_oom/smo/common/templates/vescollector-patch.yaml
+++ b/smo-install/oran_oom/smo/common/templates/vescollector-patch.yaml
@@ -14,6 +14,7 @@
 #   limitations under the License.                                             #
 ################################################################################
 
+{{- if .Values.patch.vescollector }}
 apiVersion: batch/v1
 kind: Job
 metadata:
@@ -41,3 +42,4 @@ spec:
             name: vescollector-patch-config
             defaultMode: 0755
       restartPolicy: Never
+{{- end }}

diff --git a/smo-install/oran_oom/smo/common/values.yaml b/smo-install/oran_oom/smo/common/values.yaml
new file mode 100644 (file)
index 0000000..fb40bd7
--- /dev/null
+++ b/smo-install/oran_oom/smo/common/values.yaml
@@ -0,0 +1,37 @@
+#  ============LICENSE_START===============================================
+#  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.
+#  You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+#  ============LICENSE_END=================================================
+
+influxdb2:
+  enabled: true
+kafka-client:
+  enabled: true
+keycloak:
+  enabled: true
+keycloak-proxy:
+  enabled: true
+minio:
+  enabled: true
+opa:
+  enabled: true
+opa-rule-db:
+  enabled: true
+redpanda-console:
+  enabled: true
+patch:
+  strimzi: true
+  vescollector: true
+  policy: true
+  cps: true

diff --git a/smo-install/oran_oom/smo/smo/Chart.yaml b/smo-install/oran_oom/smo/smo/Chart.yaml
index 14bdaa9..8eb91b1 100644 (file)
--- a/smo-install/oran_oom/smo/smo/Chart.yaml
+++ b/smo-install/oran_oom/smo/smo/Chart.yaml
@@ -25,7 +25,7 @@ dependencies:
   - name: common
     version: ~1.0.0
     repository: "@local"
-    condition: nonrtric.installRanpm
+    condition: common.enabled
   - name: ranpm
     version: ~1.0.0
     repository: "@local"

diff --git a/smo-install/oran_oom/smo/smo/values.yaml b/smo-install/oran_oom/smo/smo/values.yaml
index 386ece9..e99f330 100644 (file)
--- a/smo-install/oran_oom/smo/smo/values.yaml
+++ b/smo-install/oran_oom/smo/smo/values.yaml
@@ -1,5 +1,5 @@
 #  ============LICENSE_START===============================================
-#  Copyright (C) 2024 OpenInfra Foundation Europe. All rights reserved.
+#  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.
@@ -21,3 +21,27 @@ smo:
   pgsqlvolume:
     size: 1Gi
     storageClassName: pgsql-sc
+
+common:
+  enabled: true
+  influxdb2:
+    enabled: true
+  kafka-client:
+    enabled: true
+  keycloak:
+    enabled: true
+  keycloak-proxy:
+    enabled: true
+  minio:
+    enabled: true
+  opa:
+    enabled: true
+  opa-rule-db:
+    enabled: true
+  redpanda-console:
+    enabled: true
+  patch:
+    strimzi: true
+    vescollector: true
+    policy: true
+    cps: true
\ No newline at end of file