From 37686e89c5fa2571a2bb267a6a07697bc987f25d Mon Sep 17 00:00:00 2001 From: "aravind.est" Date: Tue, 30 Sep 2025 17:28:05 +0100 Subject: [PATCH] Use OSC Nexus proxy repository for docker hub images Nexus proxy repository has been used to fetch the images that are available in docker hub. Charts refactored to have a common template to use for OSC release/snapshot/staging repository. Required images has been replicated to the nexus proxy and used in the respective charts. Issue-ID: NONRTRIC-1076 Change-Id: I255b3eef9090600d216f9ca26f8ad48f7bc5b503 Signed-off-by: aravind.est --- .../helm-override/default/onap-override.yaml | 3 +- .../oran_oom/a1simulator/templates/deployment.yaml | 2 +- smo-install/oran_oom/a1simulator/values.yaml | 3 +- .../oran_oom/capifcore/templates/deployment.yaml | 4 +- smo-install/oran_oom/capifcore/values.yaml | 5 +-- .../controlpanel/templates/deployment.yaml | 5 ++- smo-install/oran_oom/controlpanel/values.yaml | 6 +-- .../dmaapadapterservice/templates/statefulset.yaml | 5 ++- .../oran_oom/dmaapadapterservice/values.yaml | 5 +-- .../dmeparticipant/templates/deployment.yaml | 2 +- smo-install/oran_oom/dmeparticipant/values.yaml | 3 +- .../informationservice/templates/statefulset.yaml | 4 +- .../oran_oom/informationservice/values.yaml | 7 +++- smo-install/oran_oom/kong/values.yaml | 13 +++++-- .../nonrtric-common/templates/_repositories.tpl | 43 ++++++++++++++++++++++ smo-install/oran_oom/nonrtric-common/values.yaml | 9 ++++- .../nonrtricgateway/templates/deployment.yaml | 5 ++- smo-install/oran_oom/nonrtricgateway/values.yaml | 6 +-- .../templates/statefulset.yaml | 7 ++-- .../oran_oom/policymanagementservice/values.yaml | 7 +++- .../rappmanager/templates/statefulset.yaml | 4 +- smo-install/oran_oom/rappmanager/values.yaml | 7 +++- .../servicemanager/templates/deployment.yaml | 4 +- smo-install/oran_oom/servicemanager/values.yaml | 3 +- .../influxdb2/templates/app-statefulset.yaml | 3 +- .../oran_oom/smo/common/influxdb2/values.yaml | 20 ++++++++++ .../smo/common/kafka-client/templates/app-pod.yaml | 4 +- .../oran_oom/smo/common/kafka-client/values.yaml | 20 ++++++++++ .../keycloak-proxy/templates/app-deployment.yaml | 3 +- .../oran_oom/smo/common/keycloak-proxy/values.yaml | 20 ++++++++++ .../common/keycloak/templates/app-deployment.yaml | 3 +- .../oran_oom/smo/common/keycloak/values.yaml | 20 ++++++++++ .../common/minio/templates/app-statefulset.yaml | 8 ++-- .../smo/common/minio/templates/client-pod.yaml | 4 +- smo-install/oran_oom/smo/common/minio/values.yaml | 12 ++++++ .../opa-rule-db/templates/app-deployment.yaml | 2 +- .../oran_oom/smo/common/opa-rule-db/values.yaml | 21 +++++++++++ .../smo/common/opa/templates/opa-deployment.yaml | 4 +- smo-install/oran_oom/smo/common/opa/values.yaml | 5 +++ .../redpanda-console/templates/app-deployment.yaml | 6 +-- .../smo/common/redpanda-console/values.yaml | 9 +++++ .../smo/common/templates/cps-kafkauser-patch.yaml | 2 +- .../common/templates/policy-kafkauser-patch.yaml | 2 +- .../smo/common/templates/strimzi-patch.yaml | 2 +- .../smo/common/templates/vescollector-patch.yaml | 2 +- smo-install/oran_oom/smo/common/values.yaml | 9 +++++ .../charts/dfc/templates/app-statefulset.yaml | 11 +++--- .../oran_oom/smo/ranpm/charts/dfc/values.yaml | 9 +++++ .../templates/app-statefulset.yaml | 6 +-- .../kafka-producer-pm-json2influx/values.yaml | 5 +++ .../templates/app-statefulset.yaml | 6 +-- .../kafka-producer-pm-json2kafka/values.yaml | 5 +++ .../templates/app-statefulset.yaml | 6 +-- .../charts/kafka-producer-pm-xml2json/values.yaml | 5 +++ .../nrt-pm-log/templates/app-statefulset.yaml | 10 ++--- .../smo/ranpm/charts/nrt-pm-log/values.yaml | 9 +++++ .../templates/app-statefulset.yaml | 10 ++--- .../charts/pm-producer-json2kafka/values.yaml | 9 +++++ .../oran_oom/smo/ranpm/templates/ics-init.yaml | 4 +- .../smo/ranpm/templates/influxdb2-init.yaml | 2 +- .../smo/ranpm/templates/keycloak-init.yaml | 2 +- smo-install/oran_oom/smo/ranpm/values.yaml | 8 ++++ .../smo/smo-common/templates/_repositories.tpl | 43 ++++++++++++++++++++++ smo-install/oran_oom/smo/smo-common/values.yaml | 29 +++++++++++++++ .../ncmp-to-teiv-adapter/templates/deployment.yaml | 4 +- .../charts/ncmp-to-teiv-adapter/values.yaml | 3 +- .../templates/deployment.yaml | 7 ++-- .../charts/topology-exposure-inventory/values.yaml | 11 ++++-- .../smo/topology-exposure-inventory/values.yaml | 17 +++++---- .../oran_oom/topology/templates/deployment.yaml | 2 +- smo-install/oran_oom/topology/values.yaml | 3 +- .../scripts/sub-scripts/preconfigure-smo.sh | 3 +- 72 files changed, 452 insertions(+), 120 deletions(-) create mode 100644 smo-install/oran_oom/nonrtric-common/templates/_repositories.tpl create mode 100644 smo-install/oran_oom/smo/common/influxdb2/values.yaml create mode 100644 smo-install/oran_oom/smo/common/kafka-client/values.yaml create mode 100644 smo-install/oran_oom/smo/common/keycloak-proxy/values.yaml create mode 100644 smo-install/oran_oom/smo/common/keycloak/values.yaml create mode 100644 smo-install/oran_oom/smo/common/opa-rule-db/values.yaml create mode 100644 smo-install/oran_oom/smo/smo-common/templates/_repositories.tpl create mode 100644 smo-install/oran_oom/smo/smo-common/values.yaml diff --git a/smo-install/helm-override/default/onap-override.yaml b/smo-install/helm-override/default/onap-override.yaml index 4ae8e60a..94f61c2d 100644 --- a/smo-install/helm-override/default/onap-override.yaml +++ b/smo-install/helm-override/default/onap-override.yaml @@ -35,7 +35,8 @@ global: # repository but ONLY if your repository mirrors all ONAP # docker images. This includes all images from dockerhub and # any other repository that hosts images for ONAP components. - repository: nexus3.onap.org:10001 + repository: &nexusDockerProxyRepo nexus3.onap.org:10001 + dockerHubRepository: *nexusDockerProxyRepo # readiness check - temporary repo until images migrated to nexus3 readinessRepository: oomk8s diff --git a/smo-install/oran_oom/a1simulator/templates/deployment.yaml b/smo-install/oran_oom/a1simulator/templates/deployment.yaml index bf4538cd..fc6e09b8 100644 --- a/smo-install/oran_oom/a1simulator/templates/deployment.yaml +++ b/smo-install/oran_oom/a1simulator/templates/deployment.yaml @@ -25,7 +25,7 @@ spec: hostname: "{{ $a1sim.name }}" containers: - name: {{ $.Chart.Name }} - image: "{{ $.Values.image.repository }}/{{ $.Values.image.name}}:{{ $.Values.image.tag }}" + image: "{{ include "repository.nexusReleaseRepo" . }}/{{ $.Values.image.name}}:{{ $.Values.image.tag }}" imagePullPolicy: {{ $.Values.image.pullPolicy }} tty: true stdin: true diff --git a/smo-install/oran_oom/a1simulator/values.yaml b/smo-install/oran_oom/a1simulator/values.yaml index 43656345..12d66ea0 100644 --- a/smo-install/oran_oom/a1simulator/values.yaml +++ b/smo-install/oran_oom/a1simulator/values.yaml @@ -16,8 +16,7 @@ # ============LICENSE_END================================================== image: - repository: 'nexus3.o-ran-sc.org:10002/o-ran-sc' - name: a1-simulator + name: 'o-ran-sc/a1-simulator' tag: 2.8.1 pullPolicy: IfNotPresent service: diff --git a/smo-install/oran_oom/capifcore/templates/deployment.yaml b/smo-install/oran_oom/capifcore/templates/deployment.yaml index 916f497f..2339ee3a 100644 --- a/smo-install/oran_oom/capifcore/templates/deployment.yaml +++ b/smo-install/oran_oom/capifcore/templates/deployment.yaml @@ -1,5 +1,5 @@ ################################################################################ -# 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. # @@ -26,7 +26,7 @@ spec: hostname: {{ include "common.name" . }} containers: - name: {{ include "common.containername" . }} - image: {{ .Values.image.registry }}/{{ .Values.image.name }}:{{ .Values.image.tag }} + image: {{ include "repository.nexusStagingRepo" . }}/{{ .Values.image.name }}:{{ .Values.image.tag }} imagePullPolicy: {{ .Values.imagePullPolicy }} ports: {{- include "common.containerPorts" . | nindent 8 }} {{- include "common.tcpsocketProbes" . | nindent 8 }} diff --git a/smo-install/oran_oom/capifcore/values.yaml b/smo-install/oran_oom/capifcore/values.yaml index fb4e1cdd..87a80079 100644 --- a/smo-install/oran_oom/capifcore/values.yaml +++ b/smo-install/oran_oom/capifcore/values.yaml @@ -1,5 +1,5 @@ # ============LICENSE_START=============================================== -# Copyright (C) 2023-2024 OpenInfra Foundation Europe. All rights reserved. +# Copyright (C) 2023-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. @@ -20,8 +20,7 @@ imagePullPolicy: IfNotPresent image: - registry: 'nexus3.o-ran-sc.org:10004/o-ran-sc' - name: nonrtric-plt-capifcore + name: 'o-ran-sc/nonrtric-plt-capifcore' tag: 1.4.0 service: type: ClusterIP diff --git a/smo-install/oran_oom/controlpanel/templates/deployment.yaml b/smo-install/oran_oom/controlpanel/templates/deployment.yaml index ff93fd53..871d88d6 100644 --- a/smo-install/oran_oom/controlpanel/templates/deployment.yaml +++ b/smo-install/oran_oom/controlpanel/templates/deployment.yaml @@ -1,5 +1,6 @@ ################################################################################ -# Copyright (c) 2020 Nordix Foundation. # +# Copyright (c) 2020-2023 Nordix Foundation. # +# 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. # @@ -26,7 +27,7 @@ spec: hostname: {{ include "common.name" . }} containers: - name: {{ include "common.containername" . }} - image: {{ .Values.image.registry }}/{{ .Values.image.name }}:{{ .Values.image.tag }} + image: {{ include "repository.nexusReleaseRepo" . }}/{{ .Values.image.name }}:{{ .Values.image.tag }} imagePullPolicy: {{ .Values.imagePullPolicy }} ports: {{- include "common.containerPorts" . | nindent 10 }} {{- include "common.tcpsocketProbes" . | nindent 10 }} diff --git a/smo-install/oran_oom/controlpanel/values.yaml b/smo-install/oran_oom/controlpanel/values.yaml index f1d439af..cfc22abf 100644 --- a/smo-install/oran_oom/controlpanel/values.yaml +++ b/smo-install/oran_oom/controlpanel/values.yaml @@ -1,5 +1,6 @@ ################################################################################ -# Copyright (c) 2020 Nordix Foundation. # +# Copyright (c) 2020-2023 Nordix Foundation. # +# 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. # @@ -20,8 +21,7 @@ imagePullPolicy: IfNotPresent image: - registry: 'nexus3.o-ran-sc.org:10002/o-ran-sc' - name: nonrtric-controlpanel + name: 'o-ran-sc/nonrtric-controlpanel' tag: 2.5.0 replicaCount: 1 liveness: diff --git a/smo-install/oran_oom/dmaapadapterservice/templates/statefulset.yaml b/smo-install/oran_oom/dmaapadapterservice/templates/statefulset.yaml index aff1a274..8cdf46f2 100644 --- a/smo-install/oran_oom/dmaapadapterservice/templates/statefulset.yaml +++ b/smo-install/oran_oom/dmaapadapterservice/templates/statefulset.yaml @@ -1,5 +1,6 @@ ################################################################################ -# Copyright (c) 2021 Nordix Foundation. # +# Copyright (c) 2021-2023 Nordix Foundation. # +# 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. # @@ -27,7 +28,7 @@ spec: hostname: {{ include "common.name" . }} containers: - name: {{ include "common.containername" . }} - image: {{ .Values.image.registry }}/{{ .Values.image.name }}:{{ .Values.image.tag }} + image: {{ include "repository.nexusReleaseRepo" . }}/{{ .Values.image.name }}:{{ .Values.image.tag }} imagePullPolicy: {{ .Values.imagePullPolicy }} ports: {{- include "common.containerPorts" . | nindent 8 }} {{- include "common.tcpsocketProbes" . | nindent 8 }} diff --git a/smo-install/oran_oom/dmaapadapterservice/values.yaml b/smo-install/oran_oom/dmaapadapterservice/values.yaml index 62cc766e..c3b0d29c 100644 --- a/smo-install/oran_oom/dmaapadapterservice/values.yaml +++ b/smo-install/oran_oom/dmaapadapterservice/values.yaml @@ -1,6 +1,6 @@ ################################################################################ # Copyright (c) 2021-22 Nordix Foundation. All rights reserved. # -# Copyright (C) 2023-2024 OpenInfra Foundation Europe. All rights reserved. # +# Copyright (C) 2023-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,8 +21,7 @@ imagePullPolicy: IfNotPresent image: - registry: "nexus3.o-ran-sc.org:10002/o-ran-sc" - name: "nonrtric-plt-dmaapadapter" + name: "o-ran-sc/nonrtric-plt-dmaapadapter" tag: 1.4.0 service: type: ClusterIP diff --git a/smo-install/oran_oom/dmeparticipant/templates/deployment.yaml b/smo-install/oran_oom/dmeparticipant/templates/deployment.yaml index a033d376..bca87d5c 100644 --- a/smo-install/oran_oom/dmeparticipant/templates/deployment.yaml +++ b/smo-install/oran_oom/dmeparticipant/templates/deployment.yaml @@ -27,7 +27,7 @@ spec: hostname: {{ include "common.name" . }} containers: - name: {{ include "common.containername" . }} - image: {{ .Values.image.registry }}/{{ .Values.image.name }}:{{ .Values.image.tag }} + image: {{ include "repository.nexusReleaseRepo" . }}/{{ .Values.image.name }}:{{ .Values.image.tag }} imagePullPolicy: {{ .Values.imagePullPolicy }} ports: {{- include "common.containerPorts" . | nindent 8 }} {{- include "common.tcpsocketProbes" . | nindent 8 }} diff --git a/smo-install/oran_oom/dmeparticipant/values.yaml b/smo-install/oran_oom/dmeparticipant/values.yaml index 37a9a584..4985cdda 100644 --- a/smo-install/oran_oom/dmeparticipant/values.yaml +++ b/smo-install/oran_oom/dmeparticipant/values.yaml @@ -21,8 +21,7 @@ imagePullPolicy: IfNotPresent image: - registry: "nexus3.o-ran-sc.org:10002/o-ran-sc" - name: nonrtric-plt-participant-impl-dme + name: 'o-ran-sc/nonrtric-plt-participant-impl-dme' tag: 0.3.0 service: type: ClusterIP diff --git a/smo-install/oran_oom/informationservice/templates/statefulset.yaml b/smo-install/oran_oom/informationservice/templates/statefulset.yaml index 1436a9d0..b362b9a4 100644 --- a/smo-install/oran_oom/informationservice/templates/statefulset.yaml +++ b/smo-install/oran_oom/informationservice/templates/statefulset.yaml @@ -33,14 +33,14 @@ spec: - -c - mkdir /var/information-coordinator-service/database; chown -R 999:1000 /var/information-coordinator-service; - image: busybox:1.28 + image: {{ include "repository.nexusProxyRepo" . }}/{{ .Values.initContainer.image.name }}:{{ .Values.initContainer.image.tag }} imagePullPolicy: {{ .Values.imagePullPolicy }} volumeMounts: - name: {{ include "common.vardataMountName" . }} mountPath: /var/information-coordinator-service containers: - name: {{ include "common.containername" . }} - image: {{ .Values.image.registry }}/{{ .Values.image.name }}:{{ .Values.image.tag }} + image: {{ include "repository.nexusReleaseRepo" . }}/{{ .Values.image.name }}:{{ .Values.image.tag }} imagePullPolicy: {{ .Values.imagePullPolicy }} ports: {{- include "common.containerPorts" . | nindent 8 }} {{- include "common.tcpsocketReadinessProbe" . | nindent 8 }} diff --git a/smo-install/oran_oom/informationservice/values.yaml b/smo-install/oran_oom/informationservice/values.yaml index 11f0ff46..da9147a8 100644 --- a/smo-install/oran_oom/informationservice/values.yaml +++ b/smo-install/oran_oom/informationservice/values.yaml @@ -21,9 +21,12 @@ imagePullPolicy: IfNotPresent image: - registry: "nexus3.o-ran-sc.org:10002/o-ran-sc" - name: "nonrtric-plt-informationcoordinatorservice" + name: "o-ran-sc/nonrtric-plt-informationcoordinatorservice" tag: 1.6.1 +initContainer: + image: + name: busybox + tag: 1.28 service: type: ClusterIP ports: diff --git a/smo-install/oran_oom/kong/values.yaml b/smo-install/oran_oom/kong/values.yaml index 71ca5c4c..3addf109 100644 --- a/smo-install/oran_oom/kong/values.yaml +++ b/smo-install/oran_oom/kong/values.yaml @@ -15,6 +15,13 @@ # limitations under the License. # ============LICENSE_END================================================= + +# This is used by the postgres container +global: + imageRegistry: "nexus3.o-ran-sc.org:10001" + kongImage: &kongImage "nexus3.o-ran-sc.org:10001/kong" + kongIngressImage: &kongIngressImage "nexus3.o-ran-sc.org:10001/kong/kubernetes-ingress-controller" + # Default values for Kong PV and PVC kongpv: @@ -56,7 +63,7 @@ kong: database: "postgres" # Specify Kong's Docker image and repository details here image: - repository: kong + repository: *kongImage tag: "3.4" pullPolicy: IfNotPresent # Specify Kong admin API service and listener configuration @@ -112,7 +119,7 @@ kong: enabled: true installCRDs: false image: - repository: kong/kubernetes-ingress-controller + repository: *kongIngressImage tag: "3.0" env: kong_admin_tls_skip_verify: true @@ -135,7 +142,7 @@ kong: volumePermissions: enabled: true image: - repository: bitnami/os-shell + repository: bitnamilegacy/os-shell primary: persistence: existingClaim: data-oran-nonrtric-postgresql-0 diff --git a/smo-install/oran_oom/nonrtric-common/templates/_repositories.tpl b/smo-install/oran_oom/nonrtric-common/templates/_repositories.tpl new file mode 100644 index 00000000..ba11612a --- /dev/null +++ b/smo-install/oran_oom/nonrtric-common/templates/_repositories.tpl @@ -0,0 +1,43 @@ +{{/* +################################################################################ +# Copyright (c) 2025 OpenInfra Foundation Europe. # +# # +# 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. # +################################################################################ +*/}} + +{{- define "repository.nexusRepo" -}} + {{- $repoKey := .repoKey | required "repoKey is required" -}} + {{- $default := .default | default "" -}} + {{- $dot := .dot | default . -}} + {{- $values := $dot.Values | default (dict) -}} + {{- $localValue := get $values $repoKey | default "" -}} + {{- $globalValue := get ($values.global | default (dict)) $repoKey | default "" -}} + {{- coalesce $localValue $globalValue $default -}} +{{- end -}} + +{{- define "repository.nexusProxyRepo" -}} + {{- include "repository.nexusRepo" (dict "dot" . "repoKey" "nexusProxyRepo" "default" "nexus3.o-ran-sc.org:10001") -}} +{{- end -}} + +{{- define "repository.nexusReleaseRepo" -}} + {{- include "repository.nexusRepo" (dict "dot" . "repoKey" "nexusReleaseRepo" "default" "nexus3.o-ran-sc.org:10002") -}} +{{- end -}} + +{{- define "repository.nexusSnapshotRepo" -}} + {{- include "repository.nexusRepo" (dict "dot" . "repoKey" "nexusSnapshotRepo" "default" "nexus3.o-ran-sc.org:10003") -}} +{{- end -}} + +{{- define "repository.nexusStagingRepo" -}} + {{- include "repository.nexusRepo" (dict "dot" . "repoKey" "nexusStagingRepo" "default" "nexus3.o-ran-sc.org:10004") -}} +{{- end -}} diff --git a/smo-install/oran_oom/nonrtric-common/values.yaml b/smo-install/oran_oom/nonrtric-common/values.yaml index 993d88d5..6eb4f0c8 100644 --- a/smo-install/oran_oom/nonrtric-common/values.yaml +++ b/smo-install/oran_oom/nonrtric-common/values.yaml @@ -1,5 +1,6 @@ ################################################################################ -# Copyright (c) 2020 Nordix Foundation. # +# Copyright (c) 2020-2023 Nordix Foundation. # +# Copyright (c) 2023-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. # @@ -13,3 +14,9 @@ # See the License for the specific language governing permissions and # # limitations under the License. # ################################################################################ + +global: + nexusProxyRepo: "nexus3.o-ran-sc.org:10001" + nexusReleaseRepo: "nexus3.o-ran-sc.org:10002" + nexusSnapshotRepo: "nexus3.o-ran-sc.org:10003" + nexusStagingRepo: "nexus3.o-ran-sc.org:10004" \ No newline at end of file diff --git a/smo-install/oran_oom/nonrtricgateway/templates/deployment.yaml b/smo-install/oran_oom/nonrtricgateway/templates/deployment.yaml index 02789f18..27f8138d 100644 --- a/smo-install/oran_oom/nonrtricgateway/templates/deployment.yaml +++ b/smo-install/oran_oom/nonrtricgateway/templates/deployment.yaml @@ -1,5 +1,6 @@ ################################################################################ -# Copyright (c) 2021 Nordix Foundation. # +# Copyright (c) 2021-2023 Nordix Foundation. # +# 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. # @@ -26,7 +27,7 @@ spec: hostname: {{ include "common.name" . }} containers: - name: {{ include "common.containername" . }} - image: {{ .Values.image.registry }}/{{ .Values.image.name }}:{{ .Values.image.tag }} + image: {{ include "repository.nexusReleaseRepo" . }}/{{ .Values.image.name }}:{{ .Values.image.tag }} imagePullPolicy: {{ .Values.imagePullPolicy }} ports: {{- include "common.containerPorts" . | nindent 10 }} {{- include "common.tcpsocketProbes" . | nindent 10 }} diff --git a/smo-install/oran_oom/nonrtricgateway/values.yaml b/smo-install/oran_oom/nonrtricgateway/values.yaml index 63c096f9..b63a32f0 100644 --- a/smo-install/oran_oom/nonrtricgateway/values.yaml +++ b/smo-install/oran_oom/nonrtricgateway/values.yaml @@ -1,5 +1,6 @@ ################################################################################ -# Copyright (c) 2021 Nordix Foundation. # +# Copyright (c) 2021-2023 Nordix Foundation. # +# 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. # @@ -20,8 +21,7 @@ imagePullPolicy: IfNotPresent image: - registry: 'nexus3.o-ran-sc.org:10002/o-ran-sc' - name: nonrtric-gateway + name: 'o-ran-sc/nonrtric-gateway' tag: 1.2.0 service: type: NodePort diff --git a/smo-install/oran_oom/policymanagementservice/templates/statefulset.yaml b/smo-install/oran_oom/policymanagementservice/templates/statefulset.yaml index 5986f83f..f2bd531b 100644 --- a/smo-install/oran_oom/policymanagementservice/templates/statefulset.yaml +++ b/smo-install/oran_oom/policymanagementservice/templates/statefulset.yaml @@ -1,5 +1,6 @@ ################################################################################ -# Copyright (c) 2020 Nordix Foundation. # +# Copyright (c) 2020-2023 Nordix Foundation. # +# 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. # @@ -27,7 +28,7 @@ spec: hostname: {{ include "common.name" . }} initContainers: - name: copy - image: busybox:1.28 + image: {{ include "repository.nexusProxyRepo" . }}/{{ .Values.initContainer.image.name }}:{{ .Values.initContainer.image.tag }} command: - /bin/sh - -c @@ -43,7 +44,7 @@ spec: mountPath: /etc/app/policy-management-service/initialdata containers: - name: {{ include "common.containername" . }} - image: {{ .Values.image.registry }}/{{ .Values.image.name }}:{{ .Values.image.tag }} + image: {{ include "repository.nexusReleaseRepo" . }}/{{ .Values.image.name }}:{{ .Values.image.tag }} imagePullPolicy: {{ .Values.imagePullPolicy }} ports: {{- include "common.containerPorts" . | nindent 8 }} {{- include "common.tcpsocketReadinessProbe" . | nindent 8 }} diff --git a/smo-install/oran_oom/policymanagementservice/values.yaml b/smo-install/oran_oom/policymanagementservice/values.yaml index 63260cf8..f815c0a3 100644 --- a/smo-install/oran_oom/policymanagementservice/values.yaml +++ b/smo-install/oran_oom/policymanagementservice/values.yaml @@ -21,9 +21,12 @@ imagePullPolicy: IfNotPresent image: - registry: "nexus3.o-ran-sc.org:10002/o-ran-sc" - name: nonrtric-plt-a1policymanagementservice + name: 'o-ran-sc/nonrtric-plt-a1policymanagementservice' tag: 2.10.0 +initContainer: + image: + name: busybox + tag: 1.28 service: type: NodePort ports: diff --git a/smo-install/oran_oom/rappmanager/templates/statefulset.yaml b/smo-install/oran_oom/rappmanager/templates/statefulset.yaml index 04ea5ead..82582cc1 100644 --- a/smo-install/oran_oom/rappmanager/templates/statefulset.yaml +++ b/smo-install/oran_oom/rappmanager/templates/statefulset.yaml @@ -28,11 +28,11 @@ spec: hostname: {{ include "common.name" . }} initContainers: - name: wait-for-servicemanager - image: alpine:latest + image: {{ include "repository.nexusProxyRepo" . }}/{{ .Values.initContainer.image.name }}:{{ .Values.initContainer.image.tag }} command: ['sh', '-c', 'apk add --no-cache netcat-openbsd && nc -zv servicemanager 8095'] containers: - name: {{ include "common.containername" . }} - image: {{ .Values.image.registry }}/{{ .Values.image.name }}:{{ .Values.image.tag }} + image: {{ include "repository.nexusReleaseRepo" . }}/{{ .Values.image.name }}:{{ .Values.image.tag }} imagePullPolicy: {{ .Values.imagePullPolicy }} ports: {{- include "common.containerPorts" . | nindent 8 }} {{- include "common.tcpsocketProbes" . | nindent 8 }} diff --git a/smo-install/oran_oom/rappmanager/values.yaml b/smo-install/oran_oom/rappmanager/values.yaml index cb1ba40d..37bd7142 100644 --- a/smo-install/oran_oom/rappmanager/values.yaml +++ b/smo-install/oran_oom/rappmanager/values.yaml @@ -22,9 +22,12 @@ imagePullPolicy: IfNotPresent image: - registry: "nexus3.o-ran-sc.org:10002/o-ran-sc" - name: nonrtric-plt-rappmanager + name: 'o-ran-sc/nonrtric-plt-rappmanager' tag: 0.3.0 +initContainer: + image: + name: alpine + tag: 3.22.1 service: type: ClusterIP ports: diff --git a/smo-install/oran_oom/servicemanager/templates/deployment.yaml b/smo-install/oran_oom/servicemanager/templates/deployment.yaml index fd768868..e87ac939 100644 --- a/smo-install/oran_oom/servicemanager/templates/deployment.yaml +++ b/smo-install/oran_oom/servicemanager/templates/deployment.yaml @@ -1,5 +1,5 @@ ################################################################################ -# Copyright (c) 2024 OpenInfra Foundation Europe. # +# Copyright (c) 2024-2025 OpenInfra Foundation Europe. # # # # Licensed under the Apache License, Version 2.0 (the "License"); # # you may not use this file except in compliance with the License. # @@ -26,7 +26,7 @@ spec: hostname: {{ include "common.name" . }} containers: - name: {{ include "common.containername" . }} - image: {{ .Values.image.registry }}/{{ .Values.image.name }}:{{ .Values.image.tag }} + image: {{ include "repository.nexusReleaseRepo" . }}/{{ .Values.image.name }}:{{ .Values.image.tag }} imagePullPolicy: {{ .Values.imagePullPolicy }} {{- include "common.tcpsocketProbes" . | nindent 8 }} volumeMounts: diff --git a/smo-install/oran_oom/servicemanager/values.yaml b/smo-install/oran_oom/servicemanager/values.yaml index e712d318..3ce2f300 100644 --- a/smo-install/oran_oom/servicemanager/values.yaml +++ b/smo-install/oran_oom/servicemanager/values.yaml @@ -18,8 +18,7 @@ imagePullPolicy: IfNotPresent image: - registry: 'nexus3.o-ran-sc.org:10002/o-ran-sc' - name: nonrtric-plt-servicemanager + name: 'o-ran-sc/nonrtric-plt-servicemanager' tag: 0.2.2 service: httpName: http diff --git a/smo-install/oran_oom/smo/common/influxdb2/templates/app-statefulset.yaml b/smo-install/oran_oom/smo/common/influxdb2/templates/app-statefulset.yaml index 46ca44ba..a9eb238f 100644 --- a/smo-install/oran_oom/smo/common/influxdb2/templates/app-statefulset.yaml +++ b/smo-install/oran_oom/smo/common/influxdb2/templates/app-statefulset.yaml @@ -34,7 +34,8 @@ spec: app: influxdb2 spec: containers: - - image: influxdb:2.7.12 + - image: {{ include "repository.nexusProxyRepo" . }}/{{ .Values.image.name }}:{{ .Values.image.tag }} + imagePullPolicy: {{ .Values.imagePullPolicy }} name: influxdb2 ports: - containerPort: 8086 diff --git a/smo-install/oran_oom/smo/common/influxdb2/values.yaml b/smo-install/oran_oom/smo/common/influxdb2/values.yaml new file mode 100644 index 00000000..aa7af980 --- /dev/null +++ b/smo-install/oran_oom/smo/common/influxdb2/values.yaml @@ -0,0 +1,20 @@ +################################################################################ +# 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. # +################################################################################ + +imagePullPolicy: IfNotPresent +image: + name: influxdb + tag: 2.7.12 diff --git a/smo-install/oran_oom/smo/common/kafka-client/templates/app-pod.yaml b/smo-install/oran_oom/smo/common/kafka-client/templates/app-pod.yaml index ee4c3e82..d3b77697 100644 --- a/smo-install/oran_oom/smo/common/kafka-client/templates/app-pod.yaml +++ b/smo-install/oran_oom/smo/common/kafka-client/templates/app-pod.yaml @@ -28,6 +28,6 @@ spec: restartPolicy: Always containers: - name: kafka-client - image: confluentinc/cp-kafka:7.2.2 + image: {{ include "repository.nexusProxyRepo" . }}/{{ .Values.image.name }}:{{ .Values.image.tag }} command: ['sh', '-c', 'while [ true ];do sleep 60;done'] - imagePullPolicy: IfNotPresent + imagePullPolicy: {{ .Values.imagePullPolicy }} diff --git a/smo-install/oran_oom/smo/common/kafka-client/values.yaml b/smo-install/oran_oom/smo/common/kafka-client/values.yaml new file mode 100644 index 00000000..58b79da6 --- /dev/null +++ b/smo-install/oran_oom/smo/common/kafka-client/values.yaml @@ -0,0 +1,20 @@ +################################################################################ +# 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. # +################################################################################ + +imagePullPolicy: IfNotPresent +image: + name: confluentinc/cp-kafka + tag: 7.2.2 diff --git a/smo-install/oran_oom/smo/common/keycloak-proxy/templates/app-deployment.yaml b/smo-install/oran_oom/smo/common/keycloak-proxy/templates/app-deployment.yaml index a201a89d..81a32092 100644 --- a/smo-install/oran_oom/smo/common/keycloak-proxy/templates/app-deployment.yaml +++ b/smo-install/oran_oom/smo/common/keycloak-proxy/templates/app-deployment.yaml @@ -39,7 +39,8 @@ spec: restartPolicy: Always containers: - name: keycloak-proxy - image: nginx:alpine + image: {{ include "repository.nexusProxyRepo" . }}/{{ .Values.image.name }}:{{ .Values.image.tag }} + imagePullPolicy: {{ .Values.imagePullPolicy }} ports: - containerPort: 8080 volumeMounts: diff --git a/smo-install/oran_oom/smo/common/keycloak-proxy/values.yaml b/smo-install/oran_oom/smo/common/keycloak-proxy/values.yaml new file mode 100644 index 00000000..d7613e62 --- /dev/null +++ b/smo-install/oran_oom/smo/common/keycloak-proxy/values.yaml @@ -0,0 +1,20 @@ +################################################################################ +# 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. # +################################################################################ + +imagePullPolicy: IfNotPresent +image: + name: nginx + tag: alpine diff --git a/smo-install/oran_oom/smo/common/keycloak/templates/app-deployment.yaml b/smo-install/oran_oom/smo/common/keycloak/templates/app-deployment.yaml index c9420861..67ff9ede 100644 --- a/smo-install/oran_oom/smo/common/keycloak/templates/app-deployment.yaml +++ b/smo-install/oran_oom/smo/common/keycloak/templates/app-deployment.yaml @@ -37,7 +37,8 @@ spec: spec: containers: - name: keycloak - image: quay.io/keycloak/keycloak:26.3 + image: {{ .Values.image.name }}:{{ .Values.image.tag }} + imagePullPolicy: {{ .Values.imagePullPolicy }} args: ["start-dev"] env: - name: KEYCLOAK_ADMIN diff --git a/smo-install/oran_oom/smo/common/keycloak/values.yaml b/smo-install/oran_oom/smo/common/keycloak/values.yaml new file mode 100644 index 00000000..0c4672c2 --- /dev/null +++ b/smo-install/oran_oom/smo/common/keycloak/values.yaml @@ -0,0 +1,20 @@ +################################################################################ +# 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. # +################################################################################ + +imagePullPolicy: IfNotPresent +image: + name: quay.io/keycloak/keycloak + tag: 26.3 diff --git a/smo-install/oran_oom/smo/common/minio/templates/app-statefulset.yaml b/smo-install/oran_oom/smo/common/minio/templates/app-statefulset.yaml index a06f267c..c8b6a81a 100644 --- a/smo-install/oran_oom/smo/common/minio/templates/app-statefulset.yaml +++ b/smo-install/oran_oom/smo/common/minio/templates/app-statefulset.yaml @@ -35,8 +35,8 @@ spec: spec: initContainers: - name: init - image: alpine:latest - imagePullPolicy: IfNotPresent + image: {{ include "repository.nexusProxyRepo" . }}/{{ .Values.image.alpine.name }}:{{ .Values.image.alpine.tag }} + imagePullPolicy: {{ .Values.imagePullPolicy }} command: ["ash","-c"] args: ["IDX=${HOSTNAME##*-} && mkdir -p /data/ && rm -rf /data//*"] volumeMounts: @@ -44,8 +44,8 @@ spec: name: data-vol containers: - name: minio - image: minio/minio:RELEASE.2025-06-13T11-33-47Z - imagePullPolicy: IfNotPresent + image: {{ include "repository.nexusProxyRepo" . }}/{{ .Values.image.minio.name }}:{{ .Values.image.minio.tag }} + imagePullPolicy: {{ .Values.imagePullPolicy }} ports: - name: tcpmain containerPort: 9000 diff --git a/smo-install/oran_oom/smo/common/minio/templates/client-pod.yaml b/smo-install/oran_oom/smo/common/minio/templates/client-pod.yaml index f91fa973..4a3b96fc 100644 --- a/smo-install/oran_oom/smo/common/minio/templates/client-pod.yaml +++ b/smo-install/oran_oom/smo/common/minio/templates/client-pod.yaml @@ -25,7 +25,7 @@ metadata: spec: containers: - name: mc-client - image: minio/mc + image: {{ include "repository.nexusProxyRepo" . }}/{{ .Values.image.minioclient.name }}:{{ .Values.image.minioclient.tag }} command: ['sh', '-c', 'while [ true ];do sleep 60;done'] - imagePullPolicy: Always + imagePullPolicy: {{ .Values.imagePullPolicy }} restartPolicy: Always diff --git a/smo-install/oran_oom/smo/common/minio/values.yaml b/smo-install/oran_oom/smo/common/minio/values.yaml index 05a55a4a..514efc76 100644 --- a/smo-install/oran_oom/smo/common/minio/values.yaml +++ b/smo-install/oran_oom/smo/common/minio/values.yaml @@ -16,6 +16,18 @@ # ============LICENSE_END================================================= # +imagePullPolicy: IfNotPresent +image: + alpine: + name: alpine + tag: 3.22.1 + minio: + name: minio/minio + tag: RELEASE.2025-06-13T11-33-47Z + minioclient: + name: minio/mc + tag: RELEASE.2025-08-13T08-35-41Z + minio: opa: decisionlogs: true \ No newline at end of file diff --git a/smo-install/oran_oom/smo/common/opa-rule-db/templates/app-deployment.yaml b/smo-install/oran_oom/smo/common/opa-rule-db/templates/app-deployment.yaml index 6a9f71b5..171ec0e9 100644 --- a/smo-install/oran_oom/smo/common/opa-rule-db/templates/app-deployment.yaml +++ b/smo-install/oran_oom/smo/common/opa-rule-db/templates/app-deployment.yaml @@ -33,7 +33,7 @@ spec: spec: containers: - name: bundle-server - image: nginx:1.21 + image: {{ include "repository.nexusProxyRepo" . }}/{{ .Values.image.name }}:{{ .Values.image.tag }} ports: - containerPort: 80 volumeMounts: diff --git a/smo-install/oran_oom/smo/common/opa-rule-db/values.yaml b/smo-install/oran_oom/smo/common/opa-rule-db/values.yaml new file mode 100644 index 00000000..2a26d350 --- /dev/null +++ b/smo-install/oran_oom/smo/common/opa-rule-db/values.yaml @@ -0,0 +1,21 @@ +# ============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================================================= +# + +imagePullPolicy: IfNotPresent +image: + name: nginx + tag: 1.21 \ No newline at end of file diff --git a/smo-install/oran_oom/smo/common/opa/templates/opa-deployment.yaml b/smo-install/oran_oom/smo/common/opa/templates/opa-deployment.yaml index 2356ec32..66702f4b 100644 --- a/smo-install/oran_oom/smo/common/opa/templates/opa-deployment.yaml +++ b/smo-install/oran_oom/smo/common/opa/templates/opa-deployment.yaml @@ -33,8 +33,8 @@ spec: spec: containers: - name: opa - image: openpolicyagent/opa:0.70.0-envoy-17 - imagePullPolicy: Always + image: {{ include "repository.nexusProxyRepo" . }}/{{ .Values.image.name }}:{{ .Values.image.tag }} + imagePullPolicy: {{ .Values.imagePullPolicy }} ports: - name: http containerPort: 8181 diff --git a/smo-install/oran_oom/smo/common/opa/values.yaml b/smo-install/oran_oom/smo/common/opa/values.yaml index 4c9cb47c..17a65260 100644 --- a/smo-install/oran_oom/smo/common/opa/values.yaml +++ b/smo-install/oran_oom/smo/common/opa/values.yaml @@ -16,5 +16,10 @@ # ============LICENSE_END================================================= # +imagePullPolicy: IfNotPresent +image: + name: openpolicyagent/opa + tag: 0.70.0-envoy-17 + opa: decisionlogs: true \ No newline at end of file diff --git a/smo-install/oran_oom/smo/common/redpanda-console/templates/app-deployment.yaml b/smo-install/oran_oom/smo/common/redpanda-console/templates/app-deployment.yaml index e8e2b1c9..45cacce6 100644 --- a/smo-install/oran_oom/smo/common/redpanda-console/templates/app-deployment.yaml +++ b/smo-install/oran_oom/smo/common/redpanda-console/templates/app-deployment.yaml @@ -32,12 +32,12 @@ spec: spec: initContainers: - name: kafka-readiness-check - image: alpine:latest + image: {{ include "repository.nexusProxyRepo" . }}/{{ .Values.image.alpine.name }}:{{ .Values.image.alpine.tag }} command: ['sh', '-c', 'apk add --no-cache netcat-openbsd && nc -zv onap-strimzi-kafka-bootstrap.onap 9092'] containers: - name: redpanda-console - image: redpandadata/console:v3.1.2 - imagePullPolicy: IfNotPresent + image: {{ include "repository.nexusProxyRepo" . }}/{{ .Values.image.redpanda.name }}:{{ .Values.image.redpanda.tag }} + imagePullPolicy: {{ .Values.imagePullPolicy }} env: - name: KAFKA_BROKERS value: "onap-strimzi-kafka-bootstrap.onap:9092" diff --git a/smo-install/oran_oom/smo/common/redpanda-console/values.yaml b/smo-install/oran_oom/smo/common/redpanda-console/values.yaml index f1cfb0e5..cc1bd733 100644 --- a/smo-install/oran_oom/smo/common/redpanda-console/values.yaml +++ b/smo-install/oran_oom/smo/common/redpanda-console/values.yaml @@ -19,6 +19,15 @@ global: #Strimzi Kafka properties useStrimziKafka: true +imagePullPolicy: IfNotPresent +image: + alpine: + name: alpine + tag: 3.22.1 + redpanda: + name: redpandadata/console + tag: v3.1.2 + # Strimzi Kafka config kafkaUser: authenticationType: scram-sha-512 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 2b343adb..2220060d 100644 --- a/smo-install/oran_oom/smo/common/templates/cps-kafkauser-patch.yaml +++ b/smo-install/oran_oom/smo/common/templates/cps-kafkauser-patch.yaml @@ -28,7 +28,7 @@ spec: serviceAccountName: cps-kafkauser-patch-sa containers: - name: cps-kafkauser-patch-container - image: bitnami/kubectl:1.32.2 + image: {{ include "repository.nexusProxyRepo" . }}/{{ .Values.global.image.kubectl.name }}:{{ .Values.global.image.kubectl.tag }} command: ["bash","/scripts/patch-cps-kafka-users.sh"] securityContext: allowPrivilegeEscalation: false 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 40f9e742..02340c06 100644 --- a/smo-install/oran_oom/smo/common/templates/policy-kafkauser-patch.yaml +++ b/smo-install/oran_oom/smo/common/templates/policy-kafkauser-patch.yaml @@ -28,7 +28,7 @@ spec: serviceAccountName: policy-kafkauser-patch-sa containers: - name: policy-kafkauser-patch-container - image: bitnami/kubectl:1.32.2 + image: {{ include "repository.nexusProxyRepo" . }}/{{ .Values.global.image.kubectl.name }}:{{ .Values.global.image.kubectl.tag }} command: ["bash","/scripts/patch-policy-kafka-users.sh"] securityContext: allowPrivilegeEscalation: false 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 be163255..12a5cb82 100644 --- a/smo-install/oran_oom/smo/common/templates/strimzi-patch.yaml +++ b/smo-install/oran_oom/smo/common/templates/strimzi-patch.yaml @@ -28,7 +28,7 @@ spec: serviceAccountName: strimzi-patch-sa containers: - name: strimzi-patch-container - image: bitnami/kubectl:1.32.2 + image: {{ include "repository.nexusProxyRepo" . }}/{{ .Values.global.image.kubectl.name }}:{{ .Values.global.image.kubectl.tag }} command: ["bash","/scripts/patch-strimzi-kafka.sh"] securityContext: allowPrivilegeEscalation: false 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 0a8426fc..6dadab10 100644 --- a/smo-install/oran_oom/smo/common/templates/vescollector-patch.yaml +++ b/smo-install/oran_oom/smo/common/templates/vescollector-patch.yaml @@ -28,7 +28,7 @@ spec: serviceAccountName: vescollector-patch-sa containers: - name: vescollector-patch-container - image: bitnami/kubectl:1.32.2 + image: {{ include "repository.nexusProxyRepo" . }}/{{ .Values.global.image.kubectl.name }}:{{ .Values.global.image.kubectl.tag }} command: ["bash","/scripts/patch-ves-collector.sh"] securityContext: allowPrivilegeEscalation: false diff --git a/smo-install/oran_oom/smo/common/values.yaml b/smo-install/oran_oom/smo/common/values.yaml index fb40bd70..b7218f23 100644 --- a/smo-install/oran_oom/smo/common/values.yaml +++ b/smo-install/oran_oom/smo/common/values.yaml @@ -14,6 +14,15 @@ # limitations under the License. # ============LICENSE_END================================================= +global: + image: + bash: + name: bash + tag: alpine3.22 + kubectl: + name: bitnami/kubectl + tag: 1.32.2 + influxdb2: enabled: true kafka-client: diff --git a/smo-install/oran_oom/smo/ranpm/charts/dfc/templates/app-statefulset.yaml b/smo-install/oran_oom/smo/ranpm/charts/dfc/templates/app-statefulset.yaml index cfff8f44..79b29d29 100644 --- a/smo-install/oran_oom/smo/ranpm/charts/dfc/templates/app-statefulset.yaml +++ b/smo-install/oran_oom/smo/ranpm/charts/dfc/templates/app-statefulset.yaml @@ -50,7 +50,7 @@ spec: - name: wait-for-keycloak-and-kafka securityContext: runAsUser: 0 - image: bitnami/kubectl + image: {{ include "repository.nexusProxyRepo" . }}/{{ .Values.global.image.kubectl.name }}:{{ .Values.global.image.kubectl.tag }} command: ["/usr/bin/bash"] args: ["-c", "cp /opt/app/scripts/init-wait.sh /opt/ && chmod +x /opt/init-wait.sh && /opt/init-wait.sh"] volumeMounts: @@ -61,9 +61,8 @@ spec: - name: dfc securityContext: runAsUser: 0 # Need to run as root - needed when writing to hostpath - image: nexus3.o-ran-sc.org:10002/o-ran-sc/nonrtric-plt-ranpm-datafilecollector:1.2.0 - # image: aravindtga/dfc:1.2.0-SNAPSHOT - imagePullPolicy: Always + image: {{ include "repository.nexusReleaseRepo" . }}/{{ .Values.image.dfc.name }}:{{ .Values.image.dfc.tag }} + imagePullPolicy: {{ .Values.imagePullPolicy }} ports: - name: http containerPort: 8100 @@ -92,8 +91,8 @@ spec: - name: APP_KAFKA_CLIENT-ID value: "datafile-collector.$(APPNS).$(APPID)" - name: auth-token - image: nexus3.o-ran-sc.org:10002/o-ran-sc/nonrtric-plt-auth-token-fetch:1.1.1 - imagePullPolicy: Always + image: {{ include "repository.nexusReleaseRepo" . }}/{{ .Values.image.authtoken.name }}:{{ .Values.image.authtoken.tag }} + imagePullPolicy: {{ .Values.imagePullPolicy }} env: - name: CREDS_GRANT_TYPE value: client_credentials diff --git a/smo-install/oran_oom/smo/ranpm/charts/dfc/values.yaml b/smo-install/oran_oom/smo/ranpm/charts/dfc/values.yaml index 1a0c649d..905f7b90 100644 --- a/smo-install/oran_oom/smo/ranpm/charts/dfc/values.yaml +++ b/smo-install/oran_oom/smo/ranpm/charts/dfc/values.yaml @@ -19,6 +19,15 @@ global: #Strimzi Kafka properties useStrimziKafka: true +imagePullPolicy: IfNotPresent +image: + dfc: + name: 'o-ran-sc/nonrtric-plt-ranpm-datafilecollector' + tag: 1.2.0 + authtoken: + name: 'o-ran-sc/nonrtric-plt-auth-token-fetch' + tag: 1.1.1 + # Strimzi Kafka config kafkaUser: name: service-account-dfc diff --git a/smo-install/oran_oom/smo/ranpm/charts/kafka-producer-pm-json2influx/templates/app-statefulset.yaml b/smo-install/oran_oom/smo/ranpm/charts/kafka-producer-pm-json2influx/templates/app-statefulset.yaml index c66dc9ec..7deb6cd2 100644 --- a/smo-install/oran_oom/smo/ranpm/charts/kafka-producer-pm-json2influx/templates/app-statefulset.yaml +++ b/smo-install/oran_oom/smo/ranpm/charts/kafka-producer-pm-json2influx/templates/app-statefulset.yaml @@ -41,7 +41,7 @@ spec: - name: wait-for-keycloak-and-kafka securityContext: runAsUser: 0 - image: bitnami/kubectl + image: {{ include "repository.nexusProxyRepo" . }}/{{ .Values.global.image.kubectl.name }}:{{ .Values.global.image.kubectl.tag }} command: ["/usr/bin/bash"] args: ["-c", "cp /opt/app/scripts/init-wait.sh /opt/ && chmod +x /opt/init-wait.sh && /opt/init-wait.sh"] volumeMounts: @@ -50,8 +50,8 @@ spec: subPath: init-wait.sh containers: - name: kafka-producer-pm-json2influx - image: nexus3.o-ran-sc.org:10002/o-ran-sc/nonrtric-plt-ranpm-pm-file-converter:1.2.0 - imagePullPolicy: Always + image: {{ include "repository.nexusReleaseRepo" . }}/{{ .Values.image.name }}:{{ .Values.image.tag }} + imagePullPolicy: {{ .Values.imagePullPolicy }} ports: - name: http containerPort: 80 diff --git a/smo-install/oran_oom/smo/ranpm/charts/kafka-producer-pm-json2influx/values.yaml b/smo-install/oran_oom/smo/ranpm/charts/kafka-producer-pm-json2influx/values.yaml index 798e880f..67352a05 100644 --- a/smo-install/oran_oom/smo/ranpm/charts/kafka-producer-pm-json2influx/values.yaml +++ b/smo-install/oran_oom/smo/ranpm/charts/kafka-producer-pm-json2influx/values.yaml @@ -19,6 +19,11 @@ global: #Strimzi Kafka properties useStrimziKafka: true +imagePullPolicy: IfNotPresent +image: + name: 'o-ran-sc/nonrtric-plt-ranpm-pm-file-converter' + tag: 1.2.0 + # Strimzi Kafka config kafkaUser: # For SCRAM-SHA-512 the name need not to be filled diff --git a/smo-install/oran_oom/smo/ranpm/charts/kafka-producer-pm-json2kafka/templates/app-statefulset.yaml b/smo-install/oran_oom/smo/ranpm/charts/kafka-producer-pm-json2kafka/templates/app-statefulset.yaml index 18dd58d9..5ded9042 100644 --- a/smo-install/oran_oom/smo/ranpm/charts/kafka-producer-pm-json2kafka/templates/app-statefulset.yaml +++ b/smo-install/oran_oom/smo/ranpm/charts/kafka-producer-pm-json2kafka/templates/app-statefulset.yaml @@ -41,7 +41,7 @@ spec: - name: wait-for-keycloak-and-kafka securityContext: runAsUser: 0 - image: bitnami/kubectl + image: {{ include "repository.nexusProxyRepo" . }}/{{ .Values.global.image.kubectl.name }}:{{ .Values.global.image.kubectl.tag }} command: ["/usr/bin/bash"] args: ["-c", "cp /opt/app/scripts/init-wait.sh /opt/ && chmod +x /opt/init-wait.sh && /opt/init-wait.sh"] volumeMounts: @@ -50,8 +50,8 @@ spec: subPath: init-wait.sh containers: - name: kafka-producer-pm-json2kafka - image: nexus3.o-ran-sc.org:10002/o-ran-sc/nonrtric-plt-ranpm-pm-file-converter:1.2.0 - imagePullPolicy: Always + image: {{ include "repository.nexusReleaseRepo" . }}/{{ .Values.image.name }}:{{ .Values.image.tag }} + imagePullPolicy: {{ .Values.imagePullPolicy }} ports: - name: http containerPort: 80 diff --git a/smo-install/oran_oom/smo/ranpm/charts/kafka-producer-pm-json2kafka/values.yaml b/smo-install/oran_oom/smo/ranpm/charts/kafka-producer-pm-json2kafka/values.yaml index 78a09260..b1334876 100644 --- a/smo-install/oran_oom/smo/ranpm/charts/kafka-producer-pm-json2kafka/values.yaml +++ b/smo-install/oran_oom/smo/ranpm/charts/kafka-producer-pm-json2kafka/values.yaml @@ -19,6 +19,11 @@ global: #Strimzi Kafka properties useStrimziKafka: true +imagePullPolicy: IfNotPresent +image: + name: 'o-ran-sc/nonrtric-plt-ranpm-pm-file-converter' + tag: 1.2.0 + # Strimzi Kafka config kafkaUser: # For SCRAM-SHA-512 the name need not to be filled diff --git a/smo-install/oran_oom/smo/ranpm/charts/kafka-producer-pm-xml2json/templates/app-statefulset.yaml b/smo-install/oran_oom/smo/ranpm/charts/kafka-producer-pm-xml2json/templates/app-statefulset.yaml index c8c19f7d..cf77a115 100644 --- a/smo-install/oran_oom/smo/ranpm/charts/kafka-producer-pm-xml2json/templates/app-statefulset.yaml +++ b/smo-install/oran_oom/smo/ranpm/charts/kafka-producer-pm-xml2json/templates/app-statefulset.yaml @@ -41,7 +41,7 @@ spec: - name: wait-for-keycloak-and-kafka securityContext: runAsUser: 0 - image: bitnami/kubectl + image: {{ include "repository.nexusProxyRepo" . }}/{{ .Values.global.image.kubectl.name }}:{{ .Values.global.image.kubectl.tag }} command: ["/usr/bin/bash"] args: ["-c", "cp /opt/app/scripts/init-wait.sh /opt/ && chmod +x /opt/init-wait.sh && /opt/init-wait.sh"] volumeMounts: @@ -50,8 +50,8 @@ spec: subPath: init-wait.sh containers: - name: kafka-producer-pm-xml2json - image: nexus3.o-ran-sc.org:10002/o-ran-sc/nonrtric-plt-ranpm-pm-file-converter:1.2.0 - imagePullPolicy: Always + image: {{ include "repository.nexusReleaseRepo" . }}/{{ .Values.image.name }}:{{ .Values.image.tag }} + imagePullPolicy: {{ .Values.imagePullPolicy }} ports: - name: http containerPort: 80 diff --git a/smo-install/oran_oom/smo/ranpm/charts/kafka-producer-pm-xml2json/values.yaml b/smo-install/oran_oom/smo/ranpm/charts/kafka-producer-pm-xml2json/values.yaml index 5ed08661..dd1105c5 100644 --- a/smo-install/oran_oom/smo/ranpm/charts/kafka-producer-pm-xml2json/values.yaml +++ b/smo-install/oran_oom/smo/ranpm/charts/kafka-producer-pm-xml2json/values.yaml @@ -19,6 +19,11 @@ global: #Strimzi Kafka properties useStrimziKafka: true +imagePullPolicy: IfNotPresent +image: + name: 'o-ran-sc/nonrtric-plt-ranpm-pm-file-converter' + tag: 1.2.0 + # Strimzi Kafka config kafkaUser: # For SCRAM-SHA-512 the name need not to be filled diff --git a/smo-install/oran_oom/smo/ranpm/charts/nrt-pm-log/templates/app-statefulset.yaml b/smo-install/oran_oom/smo/ranpm/charts/nrt-pm-log/templates/app-statefulset.yaml index e9be833d..527878ff 100644 --- a/smo-install/oran_oom/smo/ranpm/charts/nrt-pm-log/templates/app-statefulset.yaml +++ b/smo-install/oran_oom/smo/ranpm/charts/nrt-pm-log/templates/app-statefulset.yaml @@ -39,7 +39,7 @@ spec: - name: wait-for-keycloak-and-kafka securityContext: runAsUser: 0 - image: bitnami/kubectl + image: {{ include "repository.nexusProxyRepo" . }}/{{ .Values.global.image.kubectl.name }}:{{ .Values.global.image.kubectl.tag }} command: ["/usr/bin/bash"] args: ["-c", "cp /opt/app/scripts/init-wait.sh /opt/ && chmod +x /opt/init-wait.sh && /opt/init-wait.sh"] volumeMounts: @@ -57,8 +57,8 @@ spec: emptyDir: {} containers: - name: auth-token - image: nexus3.o-ran-sc.org:10002/o-ran-sc/nonrtric-plt-auth-token-fetch:1.1.1 - imagePullPolicy: Always + image: {{ include "repository.nexusReleaseRepo" . }}/{{ .Values.image.authtoken.name }}:{{ .Values.image.authtoken.tag }} + imagePullPolicy: {{ .Values.imagePullPolicy }} env: - name: CREDS_GRANT_TYPE value: client_credentials @@ -77,8 +77,8 @@ spec: - mountPath: /token-cache name: token-cache-volume - name: pmlog - image: nexus3.o-ran-sc.org:10002/o-ran-sc/nonrtric-plt-pmlog:1.1.0 - imagePullPolicy: Always + image: {{ include "repository.nexusReleaseRepo" . }}/{{ .Values.image.pmlog.name }}:{{ .Values.image.pmlog.tag }} + imagePullPolicy: {{ .Values.imagePullPolicy }} command: - sh - -c diff --git a/smo-install/oran_oom/smo/ranpm/charts/nrt-pm-log/values.yaml b/smo-install/oran_oom/smo/ranpm/charts/nrt-pm-log/values.yaml index 0eae5f8a..83b711d5 100644 --- a/smo-install/oran_oom/smo/ranpm/charts/nrt-pm-log/values.yaml +++ b/smo-install/oran_oom/smo/ranpm/charts/nrt-pm-log/values.yaml @@ -19,6 +19,15 @@ global: #Strimzi Kafka properties useStrimziKafka: true +imagePullPolicy: IfNotPresent +image: + pmlog: + name: 'o-ran-sc/nonrtric-plt-pmlog' + tag: 1.1.0 + authtoken: + name: 'o-ran-sc/nonrtric-plt-auth-token-fetch' + tag: 1.1.1 + # Strimzi Kafka config kafkaUser: # For SCRAM-SHA-512 the name need not to be filled diff --git a/smo-install/oran_oom/smo/ranpm/charts/pm-producer-json2kafka/templates/app-statefulset.yaml b/smo-install/oran_oom/smo/ranpm/charts/pm-producer-json2kafka/templates/app-statefulset.yaml index 281738d3..ec30393c 100644 --- a/smo-install/oran_oom/smo/ranpm/charts/pm-producer-json2kafka/templates/app-statefulset.yaml +++ b/smo-install/oran_oom/smo/ranpm/charts/pm-producer-json2kafka/templates/app-statefulset.yaml @@ -39,7 +39,7 @@ spec: - name: wait-for-keycloak-and-kafka securityContext: runAsUser: 0 - image: bitnami/kubectl + image: {{ include "repository.nexusProxyRepo" . }}/{{ .Values.global.image.kubectl.name }}:{{ .Values.global.image.kubectl.tag }} command: ["/usr/bin/bash"] args: ["-c", "cp /opt/app/scripts/init-wait.sh /opt/ && chmod +x /opt/init-wait.sh && /opt/init-wait.sh"] volumeMounts: @@ -48,8 +48,8 @@ spec: subPath: init-wait.sh containers: - name: pm-producer-json2kafka - image: nexus3.o-ran-sc.org:10002/o-ran-sc/nonrtric-plt-pmproducer:1.1.0 - imagePullPolicy: Always + image: {{ include "repository.nexusReleaseRepo" . }}/{{ .Values.image.pmproducer.name }}:{{ .Values.image.pmproducer.tag }} + imagePullPolicy: {{ .Values.imagePullPolicy }} ports: - name: http containerPort: 8084 @@ -75,8 +75,8 @@ spec: - mountPath: /token-cache name: token-cache-volume - name: auth-token - image: nexus3.o-ran-sc.org:10002/o-ran-sc/nonrtric-plt-auth-token-fetch:1.1.1 - imagePullPolicy: Always + image: {{ include "repository.nexusReleaseRepo" . }}/{{ .Values.image.authtoken.name }}:{{ .Values.image.authtoken.tag }} + imagePullPolicy: {{ .Values.imagePullPolicy }} env: - name: CREDS_GRANT_TYPE value: client_credentials diff --git a/smo-install/oran_oom/smo/ranpm/charts/pm-producer-json2kafka/values.yaml b/smo-install/oran_oom/smo/ranpm/charts/pm-producer-json2kafka/values.yaml index c4d2a95c..dcb8411b 100644 --- a/smo-install/oran_oom/smo/ranpm/charts/pm-producer-json2kafka/values.yaml +++ b/smo-install/oran_oom/smo/ranpm/charts/pm-producer-json2kafka/values.yaml @@ -19,6 +19,15 @@ global: #Strimzi Kafka properties useStrimziKafka: true +imagePullPolicy: IfNotPresent +image: + pmproducer: + name: 'o-ran-sc/nonrtric-plt-pmproducer' + tag: 1.1.0 + authtoken: + name: 'o-ran-sc/nonrtric-plt-auth-token-fetch' + tag: 1.1.1 + # Strimzi Kafka config kafkaUser: # For SCRAM-SHA-512 the name need not to be filled diff --git a/smo-install/oran_oom/smo/ranpm/templates/ics-init.yaml b/smo-install/oran_oom/smo/ranpm/templates/ics-init.yaml index 6a5a1869..cee9022b 100644 --- a/smo-install/oran_oom/smo/ranpm/templates/ics-init.yaml +++ b/smo-install/oran_oom/smo/ranpm/templates/ics-init.yaml @@ -24,7 +24,7 @@ spec: serviceAccountName: ranpm-component-sa initContainers: - name: wait-for-keycloak-job - image: bitnami/kubectl + image: {{ include "repository.nexusProxyRepo" . }}/{{ .Values.global.image.kubectl.name }}:{{ .Values.global.image.kubectl.tag }} args: - wait - job.batch/keycloak-init @@ -34,7 +34,7 @@ spec: - 300s containers: - name: ics-init-container - image: bash:latest + image: {{ include "repository.nexusProxyRepo" . }}/{{ .Values.global.image.bash.name }}:{{ .Values.global.image.bash.tag }} command: ["bash","/scripts/configure_ics.sh"] env: - name: ICS_HOST diff --git a/smo-install/oran_oom/smo/ranpm/templates/influxdb2-init.yaml b/smo-install/oran_oom/smo/ranpm/templates/influxdb2-init.yaml index 9c2d2093..6a253d5c 100644 --- a/smo-install/oran_oom/smo/ranpm/templates/influxdb2-init.yaml +++ b/smo-install/oran_oom/smo/ranpm/templates/influxdb2-init.yaml @@ -23,7 +23,7 @@ spec: spec: containers: - name: influxdb2-init-container - image: bash:latest + image: {{ include "repository.nexusProxyRepo" . }}/{{ .Values.global.image.bash.name }}:{{ .Values.global.image.bash.tag }} command: ["bash","/scripts/configure_influx.sh"] env: - name: INFLUXDB2_HOST diff --git a/smo-install/oran_oom/smo/ranpm/templates/keycloak-init.yaml b/smo-install/oran_oom/smo/ranpm/templates/keycloak-init.yaml index dd8d339d..cf4e3d8e 100644 --- a/smo-install/oran_oom/smo/ranpm/templates/keycloak-init.yaml +++ b/smo-install/oran_oom/smo/ranpm/templates/keycloak-init.yaml @@ -27,7 +27,7 @@ spec: serviceAccountName: keycloak-init-sa containers: - name: keycloak-init-container - image: bitnami/kubectl:1.32.2 + image: {{ include "repository.nexusProxyRepo" . }}/{{ .Values.global.image.kubectl.name }}:{{ .Values.global.image.kubectl.tag }} command: ["bash","/scripts/configure_keycloak.sh"] securityContext: allowPrivilegeEscalation: false diff --git a/smo-install/oran_oom/smo/ranpm/values.yaml b/smo-install/oran_oom/smo/ranpm/values.yaml index 45bf2424..c046f032 100644 --- a/smo-install/oran_oom/smo/ranpm/values.yaml +++ b/smo-install/oran_oom/smo/ranpm/values.yaml @@ -17,6 +17,14 @@ global: #Strimzi Kafka properties useStrimziKafka: true + image: + bash: + name: bash + tag: alpine3.22 + kubectl: + name: bitnami/kubectl + tag: 1.32.2 + keycloak: host: "keycloak-proxy" diff --git a/smo-install/oran_oom/smo/smo-common/templates/_repositories.tpl b/smo-install/oran_oom/smo/smo-common/templates/_repositories.tpl new file mode 100644 index 00000000..ba11612a --- /dev/null +++ b/smo-install/oran_oom/smo/smo-common/templates/_repositories.tpl @@ -0,0 +1,43 @@ +{{/* +################################################################################ +# Copyright (c) 2025 OpenInfra Foundation Europe. # +# # +# 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. # +################################################################################ +*/}} + +{{- define "repository.nexusRepo" -}} + {{- $repoKey := .repoKey | required "repoKey is required" -}} + {{- $default := .default | default "" -}} + {{- $dot := .dot | default . -}} + {{- $values := $dot.Values | default (dict) -}} + {{- $localValue := get $values $repoKey | default "" -}} + {{- $globalValue := get ($values.global | default (dict)) $repoKey | default "" -}} + {{- coalesce $localValue $globalValue $default -}} +{{- end -}} + +{{- define "repository.nexusProxyRepo" -}} + {{- include "repository.nexusRepo" (dict "dot" . "repoKey" "nexusProxyRepo" "default" "nexus3.o-ran-sc.org:10001") -}} +{{- end -}} + +{{- define "repository.nexusReleaseRepo" -}} + {{- include "repository.nexusRepo" (dict "dot" . "repoKey" "nexusReleaseRepo" "default" "nexus3.o-ran-sc.org:10002") -}} +{{- end -}} + +{{- define "repository.nexusSnapshotRepo" -}} + {{- include "repository.nexusRepo" (dict "dot" . "repoKey" "nexusSnapshotRepo" "default" "nexus3.o-ran-sc.org:10003") -}} +{{- end -}} + +{{- define "repository.nexusStagingRepo" -}} + {{- include "repository.nexusRepo" (dict "dot" . "repoKey" "nexusStagingRepo" "default" "nexus3.o-ran-sc.org:10004") -}} +{{- end -}} diff --git a/smo-install/oran_oom/smo/smo-common/values.yaml b/smo-install/oran_oom/smo/smo-common/values.yaml new file mode 100644 index 00000000..808262a2 --- /dev/null +++ b/smo-install/oran_oom/smo/smo-common/values.yaml @@ -0,0 +1,29 @@ +################################################################################ +# Copyright (c) 2020-2023 Nordix Foundation. # +# Copyright (c) 2023-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. # +################################################################################ + +global: + nexusProxyRepo: "nexus3.o-ran-sc.org:10001" + nexusReleaseRepo: "nexus3.o-ran-sc.org:10002" + nexusSnapshotRepo: "nexus3.o-ran-sc.org:10003" + nexusStagingRepo: "nexus3.o-ran-sc.org:10004" + image: + bash: + name: bash + tag: alpine3.22 + kubectl: + name: bitnami/kubectl + tag: 1.32.2 \ No newline at end of file diff --git a/smo-install/oran_oom/smo/topology-exposure-inventory/charts/ncmp-to-teiv-adapter/templates/deployment.yaml b/smo-install/oran_oom/smo/topology-exposure-inventory/charts/ncmp-to-teiv-adapter/templates/deployment.yaml index 8684e67f..02b0a76d 100644 --- a/smo-install/oran_oom/smo/topology-exposure-inventory/charts/ncmp-to-teiv-adapter/templates/deployment.yaml +++ b/smo-install/oran_oom/smo/topology-exposure-inventory/charts/ncmp-to-teiv-adapter/templates/deployment.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. @@ -27,7 +27,7 @@ spec: hostname: {{ include "common.name" . }} containers: - name: {{ include "common.containername" . }} - image: {{ .Values.image.registry }}/{{ .Values.image.name }}:{{ .Values.image.tag }} + image: {{ include "repository.nexusReleaseRepo" . }}/{{ .Values.image.name }}:{{ .Values.image.tag }} imagePullPolicy: {{ .Values.imagePullPolicy }} {{- if .Values.global.useStrimziKafka }} env: diff --git a/smo-install/oran_oom/smo/topology-exposure-inventory/charts/ncmp-to-teiv-adapter/values.yaml b/smo-install/oran_oom/smo/topology-exposure-inventory/charts/ncmp-to-teiv-adapter/values.yaml index a456cc62..24d73d4e 100644 --- a/smo-install/oran_oom/smo/topology-exposure-inventory/charts/ncmp-to-teiv-adapter/values.yaml +++ b/smo-install/oran_oom/smo/topology-exposure-inventory/charts/ncmp-to-teiv-adapter/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. @@ -19,7 +19,6 @@ imagePullPolicy: IfNotPresent image: - registry: "" # Will be set from parent values.yaml name: "" # Will be set from parent values.yaml tag: "" # Will be set from parent values.yaml service: diff --git a/smo-install/oran_oom/smo/topology-exposure-inventory/charts/topology-exposure-inventory/templates/deployment.yaml b/smo-install/oran_oom/smo/topology-exposure-inventory/charts/topology-exposure-inventory/templates/deployment.yaml index 3f384690..1a40f6f1 100644 --- a/smo-install/oran_oom/smo/topology-exposure-inventory/charts/topology-exposure-inventory/templates/deployment.yaml +++ b/smo-install/oran_oom/smo/topology-exposure-inventory/charts/topology-exposure-inventory/templates/deployment.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. @@ -27,11 +27,12 @@ spec: hostname: {{ include "common.name" . }} initContainers: - name: postgres-readiness-check - image: alpine:latest + image: {{ include "repository.nexusProxyRepo" . }}/{{ .Values.image.alpine.name }}:{{ .Values.image.alpine.tag }} + imagePullPolicy: {{ .Values.imagePullPolicy }} command: ['sh', '-c', 'apk add --no-cache netcat-openbsd && nc -zv oran-smo-postgresql 5432'] containers: - name: {{ include "common.containername" . }} - image: {{ .Values.image.registry }}/{{ .Values.image.name }}:{{ .Values.image.tag }} + image: {{ include "repository.nexusReleaseRepo" . }}/{{ .Values.image.teiv.name }}:{{ .Values.image.teiv.tag }} imagePullPolicy: {{ .Values.imagePullPolicy }} ports: {{- include "common.containerPorts" . | nindent 12 }} {{- if .Values.global.useStrimziKafka }} diff --git a/smo-install/oran_oom/smo/topology-exposure-inventory/charts/topology-exposure-inventory/values.yaml b/smo-install/oran_oom/smo/topology-exposure-inventory/charts/topology-exposure-inventory/values.yaml index 3c3627f9..7552a8a3 100644 --- a/smo-install/oran_oom/smo/topology-exposure-inventory/charts/topology-exposure-inventory/values.yaml +++ b/smo-install/oran_oom/smo/topology-exposure-inventory/charts/topology-exposure-inventory/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. @@ -16,9 +16,12 @@ # imagePullPolicy: IfNotPresent image: - registry: "nexus3.o-ran-sc.org:10004/o-ran-sc" - name: smo-teiv-exposure - tag: 0.0.1 + teiv: + name: 'o-ran-sc/smo-teiv-exposure' + tag: 0.0.1 + alpine: + name: alpine + tag: 3.22.1 service: type: ClusterIP ports: diff --git a/smo-install/oran_oom/smo/topology-exposure-inventory/values.yaml b/smo-install/oran_oom/smo/topology-exposure-inventory/values.yaml index f45e6e25..17be40a3 100644 --- a/smo-install/oran_oom/smo/topology-exposure-inventory/values.yaml +++ b/smo-install/oran_oom/smo/topology-exposure-inventory/values.yaml @@ -17,6 +17,8 @@ global: nodePortPrefixExt: 305 + # This is used by the postgres container + imageRegistry: "nexus3.o-ran-sc.org:10001" #Strimzi Kafka properties useStrimziKafka: true kafkaTopics: @@ -39,6 +41,8 @@ postgresql: database: topology_exposure_db volumePermissions: enabled: true + image: + repository: bitnamilegacy/os-shell primary: initdb: scriptsConfigMap: *sqlconfigmapname @@ -52,9 +56,9 @@ topology-exposure: name: topology-exposure imagePullPolicy: IfNotPresent image: - registry: "nexus3.o-ran-sc.org:10002" - name: o-ran-sc/smo-teiv-exposure - tag: 0.2.0 + teiv: + name: o-ran-sc/smo-teiv-exposure + tag: 0.2.0 service: type: ClusterIP ports: @@ -91,9 +95,9 @@ topology-ingestion: name: topology-ingestion imagePullPolicy: IfNotPresent image: - registry: "nexus3.o-ran-sc.org:10002" - name: o-ran-sc/smo-teiv-ingestion - tag: 0.2.0 + teiv: + name: o-ran-sc/smo-teiv-ingestion + tag: 0.2.0 service: type: ClusterIP ports: @@ -133,7 +137,6 @@ ncmp-to-teiv-adapter: name: ncmp-to-teiv-adapter imagePullPolicy: IfNotPresent image: - registry: "nexus3.o-ran-sc.org:10002" name: o-ran-sc/smo-ncmp-to-teiv-adapter tag: 0.0.1 service: diff --git a/smo-install/oran_oom/topology/templates/deployment.yaml b/smo-install/oran_oom/topology/templates/deployment.yaml index aa141955..d490fd9b 100644 --- a/smo-install/oran_oom/topology/templates/deployment.yaml +++ b/smo-install/oran_oom/topology/templates/deployment.yaml @@ -23,7 +23,7 @@ spec: spec: containers: - name: {{ include "common.containername" . }} - image: "{{ .Values.image.repository }}/{{ .Values.image.name}}:{{ .Values.image.tag }}" + image: "{{ include "repository.nexusProxyRepo" . }}/{{ .Values.image.name}}:{{ .Values.image.tag }}" imagePullPolicy: {{ .Values.image.pullPolicy }} tty: true stdin: true diff --git a/smo-install/oran_oom/topology/values.yaml b/smo-install/oran_oom/topology/values.yaml index d7a6a4f7..b75d42a4 100644 --- a/smo-install/oran_oom/topology/values.yaml +++ b/smo-install/oran_oom/topology/values.yaml @@ -15,8 +15,7 @@ # Static Defaults replicaCount: 1 image: - repository: 'docker.io/hightec' - name: smo-topology-api-v2 + name: 'hightec/smo-topology-api-v2' tag: 2.0.2-SNAPSHOT-20210315T160448Z pullPolicy: IfNotPresent diff --git a/smo-install/scripts/sub-scripts/preconfigure-smo.sh b/smo-install/scripts/sub-scripts/preconfigure-smo.sh index 0da495de..641fcf5a 100755 --- a/smo-install/scripts/sub-scripts/preconfigure-smo.sh +++ b/smo-install/scripts/sub-scripts/preconfigure-smo.sh @@ -22,11 +22,12 @@ if ! command -v jq > /dev/null 2>&1; then fi OVERRIDEYAML=$1 +NEXUS_PROXY_DOCKER_IO_REPO="nexus3.o-ran-sc.org:10001" # OpenEBS installation helm repo add openebs https://openebs.github.io/openebs helm repo update -helm upgrade --install openebs --namespace openebs openebs/openebs --version 4.3.0 --create-namespace --set engines.replicated.mayastor.enabled=false --set engines.local.lvm.enabled=false --set engines.local.zfs.enabled=false --set loki.enabled=false --set alloy.enabled=false --wait +helm upgrade --install openebs --namespace openebs openebs/openebs --version 4.3.0 --create-namespace --set engines.replicated.mayastor.enabled=false --set engines.local.lvm.enabled=false --set engines.local.zfs.enabled=false --set loki.enabled=false --set alloy.enabled=false --set global.imageRegistry=$NEXUS_PROXY_DOCKER_IO_REPO --wait # Create storage class for smo kubectl apply -f ../packages/pre-configuration/smo-sc.yaml -- 2.16.6