From 8ba83f6b99ce459460814e5b7e50bfdf46b11383 Mon Sep 17 00:00:00 2001 From: rohithrajneesh Date: Fri, 11 Aug 2023 12:25:01 +0100 Subject: [PATCH] RANPM - Update to latest image versions ISSUE-ID: NONRTRIC-909 Change-Id: I9dfaa072c77a985639dff9e52466fc3b840a4b29 Signed-off-by: rohithrajneesh --- install/README.md | 34 ++++++++++------------ .../helm/nrt-pm-log/templates/app-statefulset.yaml | 2 +- .../charts/dfc/templates/app-statefulset.yaml | 5 ++-- .../charts/ics/templates/app-deployment.yaml | 3 +- .../templates/app-statefulset.yaml | 6 +--- .../templates/app-statefulset.yaml | 6 +--- .../templates/app-statefulset.yaml | 6 +--- .../templates/app-statefulset.yaml | 5 ++-- 8 files changed, 24 insertions(+), 43 deletions(-) diff --git a/install/README.md b/install/README.md index e5b3ab2..6260248 100644 --- a/install/README.md +++ b/install/README.md @@ -1,4 +1,17 @@ +## License + +Copyright (C) 2023 Nordix Foundation. 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. ## Prerequisites @@ -33,7 +46,6 @@ If external repo is used, use the same repo for all built images and configure t Build the following images (build instruction in each dir) - ranpm/https-server -- ranpm/pm-file-converter - pm-rapp @@ -49,12 +61,12 @@ The following scripts are provided for installing (install-nrt.sh mush be instal - install-pm-influx-job.sh : Sets up an alternative job to produce data stored in influx db. - install-pm-rapp.sh : Installs a rapp that subscribe and print out received data -## Unstallation +## Uninstallation There is a corresponding uninstall script for each install script. However, it is enough to just run `uninstall-nrt.sh` and `uninstall-pm-rapp.sh´. ## Exposed ports to APIs -All exposed APIs on individual port numbers (nodeporta) on the address of the kubernetes control plane. +All exposed APIs on individual port numbers (nodeports) on the address of the kubernetes control plane. ### Keycloak API Keycloak API accessed via proxy (proxy is needed to make keycloak issue token with the internal address of keycloak). @@ -97,19 +109,3 @@ Browser for influx db. - nodeport: 31812 - user: admin - password: mySuP3rS3cr3tT0keN - - -## License - -Copyright (C) 2023 Nordix Foundation. 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. diff --git a/install/helm/nrt-pm-log/templates/app-statefulset.yaml b/install/helm/nrt-pm-log/templates/app-statefulset.yaml index bb033ee..cc3a874 100644 --- a/install/helm/nrt-pm-log/templates/app-statefulset.yaml +++ b/install/helm/nrt-pm-log/templates/app-statefulset.yaml @@ -45,7 +45,7 @@ spec: emptyDir: {} containers: - name: auth-token - image: nexus3.o-ran-sc.org:10004/o-ran-sc/nonrtric-plt-auth-token-fetch:1.1.1 + image: nexus3.o-ran-sc.org:10001/o-ran-sc/nonrtric-plt-auth-token-fetch:1.1.1 imagePullPolicy: Always env: - name: CREDS_GRANT_TYPE diff --git a/install/helm/nrt-pm/charts/dfc/templates/app-statefulset.yaml b/install/helm/nrt-pm/charts/dfc/templates/app-statefulset.yaml index ed095ac..a2d02f6 100644 --- a/install/helm/nrt-pm/charts/dfc/templates/app-statefulset.yaml +++ b/install/helm/nrt-pm/charts/dfc/templates/app-statefulset.yaml @@ -46,8 +46,7 @@ spec: - name: dfc securityContext: runAsUser: 0 # Need to run as root - needed when writing to hostpath -# image: nexus3.o-ran-sc.org:10004/o-ran-sc/nonrtric-plt-ranpm-datafilecollector:1.0.0 - image: nexus3.o-ran-sc.org:10003/o-ran-sc/nonrtric-plt-ranpm-datafilecollector:1.0.0-SNAPSHOT + image: nexus3.o-ran-sc.org:10001/o-ran-sc/nonrtric-plt-ranpm-datafilecollector:1.0.0 imagePullPolicy: Always ports: - name: http @@ -73,7 +72,7 @@ spec: - name: APP_KAFKA_CLIENT-ID value: "datafile-collector.$(APPNS).$(APPID)" - name: auth-token - image: nexus3.o-ran-sc.org:10004/o-ran-sc/nonrtric-plt-auth-token-fetch:1.1.1 + image: nexus3.o-ran-sc.org:10001/o-ran-sc/nonrtric-plt-auth-token-fetch:1.1.1 imagePullPolicy: Always env: - name: CREDS_GRANT_TYPE diff --git a/install/helm/nrt-pm/charts/ics/templates/app-deployment.yaml b/install/helm/nrt-pm/charts/ics/templates/app-deployment.yaml index b737e67..269bbcf 100644 --- a/install/helm/nrt-pm/charts/ics/templates/app-deployment.yaml +++ b/install/helm/nrt-pm/charts/ics/templates/app-deployment.yaml @@ -34,8 +34,7 @@ spec: spec: containers: - name: informationservice -# image: nexus3.o-ran-sc.org:10004/o-ran-sc/nonrtric-plt-informationcoordinatorservice:1.5.0 - image: nexus3.o-ran-sc.org:10003/o-ran-sc/nonrtric-plt-informationcoordinatorservice:1.5.0-SNAPSHOT + image: nexus3.o-ran-sc.org:10001/o-ran-sc/nonrtric-plt-informationcoordinatorservice:1.5.0 imagePullPolicy: Always ports: - name: http diff --git a/install/helm/nrt-pm/charts/kafka-producer-pm-json2influx/templates/app-statefulset.yaml b/install/helm/nrt-pm/charts/kafka-producer-pm-json2influx/templates/app-statefulset.yaml index b28e025..fe01f56 100644 --- a/install/helm/nrt-pm/charts/kafka-producer-pm-json2influx/templates/app-statefulset.yaml +++ b/install/helm/nrt-pm/charts/kafka-producer-pm-json2influx/templates/app-statefulset.yaml @@ -38,12 +38,8 @@ spec: spec: containers: - name: kafka-producer-pm-json2influx - image: {{ .Values.global.extimagerepo }}pm-file-converter:latest - {{- if .Values.global.extimagerepo }} + image: nexus3.o-ran-sc.org:10001/o-ran-sc/nonrtric-plt-ranpm-pm-file-converter:1.0.1 imagePullPolicy: Always - {{- else }} - imagePullPolicy: Never - {{- end }} ports: - name: http containerPort: 80 diff --git a/install/helm/nrt-pm/charts/kafka-producer-pm-json2kafka/templates/app-statefulset.yaml b/install/helm/nrt-pm/charts/kafka-producer-pm-json2kafka/templates/app-statefulset.yaml index ef7e60a..d0354b9 100644 --- a/install/helm/nrt-pm/charts/kafka-producer-pm-json2kafka/templates/app-statefulset.yaml +++ b/install/helm/nrt-pm/charts/kafka-producer-pm-json2kafka/templates/app-statefulset.yaml @@ -38,12 +38,8 @@ spec: spec: containers: - name: kafka-producer-pm-json2kafka - image: {{ .Values.global.extimagerepo }}pm-file-converter:latest - {{- if .Values.global.extimagerepo }} + image: nexus3.o-ran-sc.org:10001/o-ran-sc/nonrtric-plt-ranpm-pm-file-converter:1.0.1 imagePullPolicy: Always - {{- else }} - imagePullPolicy: Never - {{- end }} ports: - name: http containerPort: 80 diff --git a/install/helm/nrt-pm/charts/kafka-producer-pm-xml2json/templates/app-statefulset.yaml b/install/helm/nrt-pm/charts/kafka-producer-pm-xml2json/templates/app-statefulset.yaml index 06f289e..4a1e17e 100644 --- a/install/helm/nrt-pm/charts/kafka-producer-pm-xml2json/templates/app-statefulset.yaml +++ b/install/helm/nrt-pm/charts/kafka-producer-pm-xml2json/templates/app-statefulset.yaml @@ -38,12 +38,8 @@ spec: spec: containers: - name: kafka-producer-pm-xml2json - image: {{ .Values.global.extimagerepo }}pm-file-converter:latest - {{- if .Values.global.extimagerepo }} + image: nexus3.o-ran-sc.org:10001/o-ran-sc/nonrtric-plt-ranpm-pm-file-converter:1.0.1 imagePullPolicy: Always - {{- else }} - imagePullPolicy: Never - {{- end }} ports: - name: http containerPort: 80 diff --git a/install/helm/nrt-pm/charts/pm-producer-json2kafka/templates/app-statefulset.yaml b/install/helm/nrt-pm/charts/pm-producer-json2kafka/templates/app-statefulset.yaml index 8f3866b..c906f17 100644 --- a/install/helm/nrt-pm/charts/pm-producer-json2kafka/templates/app-statefulset.yaml +++ b/install/helm/nrt-pm/charts/pm-producer-json2kafka/templates/app-statefulset.yaml @@ -36,8 +36,7 @@ spec: spec: containers: - name: pm-producer-json2kafka -# image: nexus3.o-ran-sc.org:10004/o-ran-sc/nonrtric-plt-pmproducer:1.0.0 - image: nexus3.o-ran-sc.org:10003/o-ran-sc/nonrtric-plt-pmproducer:1.0.0-SNAPSHOT + image: nexus3.o-ran-sc.org:10001/o-ran-sc/nonrtric-plt-pmproducer:1.0.1 imagePullPolicy: Always ports: - name: http @@ -64,7 +63,7 @@ spec: - mountPath: /token-cache name: token-cache-volume - name: auth-token - image: nexus3.o-ran-sc.org:10004/o-ran-sc/nonrtric-plt-auth-token-fetch:1.1.1 + image: nexus3.o-ran-sc.org:10001/o-ran-sc/nonrtric-plt-auth-token-fetch:1.1.1 imagePullPolicy: Always env: - name: CREDS_GRANT_TYPE -- 2.16.6