From 87c0ebc0024b9da0ef2f5c0cfa642fdcde6eba02 Mon Sep 17 00:00:00 2001
From: Jackie Huang <jackie.huang@windriver.com>
Date: Mon, 7 Nov 2022 20:01:49 +0800
Subject: [PATCH] charts: fix the images format

The supported multiple image formats in starlingx app:
images:
   tags: <dict>

And for the image on dockerhub, it should be started
with docker.io:
  - docker.io/library/postgres:9.6
  - docker.io/library/redis:alpine

Rename the image tags.

Issue-ID: INF-336

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Change-Id: I82c6843c569a691de7c02d7ba9ad1705253e1bf7
---
 README-o2imsbuilder.md           |  9 +++++----
 charts/templates/deployment.yaml | 12 ++++++------
 charts/values.yaml               |  9 +++++----
 docs/installation-guide.rst      |  9 +++++----
 4 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/README-o2imsbuilder.md b/README-o2imsbuilder.md
index bd4cfba..70547c8 100644
--- a/README-o2imsbuilder.md
+++ b/README-o2imsbuilder.md
@@ -68,10 +68,11 @@ imagePullSecrets:
 
 o2ims:
   serviceaccountname: admin-oran-o2
-  image:
-    img_o2: registry.local:9001/o-ran-sc/pti-o2imsdms:2.0.0
-    img_postgres: postgres:9.6
-    img_redis: redis:alpine
+  images:
+    tags:
+      o2service: registry.local:9001/o-ran-sc/pti-o2imsdms:2.0.0
+      postgres: docker.io/library/postgres:9.6
+      redis: docker.io/library/redis:alpine
     pullPolicy: IfNotPresent
   logginglevel: "DEBUG"
 
diff --git a/charts/templates/deployment.yaml b/charts/templates/deployment.yaml
index 402fe02..98dc174 100644
--- a/charts/templates/deployment.yaml
+++ b/charts/templates/deployment.yaml
@@ -43,7 +43,7 @@ spec:
 {{- end }}
       containers:
         - name: postgres
-          image: "{{ .Values.o2ims.image.img_postgres }}"
+          image: "{{ .Values.o2ims.images.tags.postgres }}"
           ports:
             - containerPort: 5432
           env:
@@ -60,11 +60,11 @@ spec:
             - name: db-pv
               mountPath: /var/lib/postgresql/data
         - name: redis
-          image: "{{ .Values.o2ims.image.img_redis }}"
+          image: "{{ .Values.o2ims.images.tags.redis }}"
           ports:
             - containerPort: 6379
         - name: o2pubsub
-          image: "{{ .Values.o2ims.image.img_o2 }}"
+          image: "{{ .Values.o2ims.images.tags.o2service }}"
           command: ["/bin/bash", "/opt/o2pubsub_start.sh"]
           env:
             - name: DB_HOST
@@ -96,7 +96,7 @@ spec:
               mountPath: /configs/smoca.crt
               subPath: config.json
         - name: watcher
-          image: "{{ .Values.o2ims.image.img_o2 }}"
+          image: "{{ .Values.o2ims.images.tags.o2service }}"
           command: ["/bin/bash", "/opt/o2watcher_start.sh"]
           env:
             - name: API_HOST_EXTERNAL_FLOATING
@@ -125,7 +125,7 @@ spec:
               subPath: config.json
               readOnly: true
         - name: o2api
-          image: "{{ .Values.o2ims.image.img_o2 }}"
+          image: "{{ .Values.o2ims.images.tags.o2service }}"
           ports:
             - containerPort: 80
           env:
@@ -172,7 +172,7 @@ spec:
               readOnly: true
         {{- if .Values.o2dms.helm_cli_enable }}
         - name: helmcli
-          image: "{{ .Values.o2ims.image.img_o2 }}"
+          image: "{{ .Values.o2ims.images.tags.o2service }}"
           ports:
             - containerPort: 22
           env:
diff --git a/charts/values.yaml b/charts/values.yaml
index 01b7f4a..aa6a487 100644
--- a/charts/values.yaml
+++ b/charts/values.yaml
@@ -49,10 +49,11 @@ imagePullSecrets:
 
 o2ims:
   serviceaccountname: admin-oran-o2
-  image:
-    img_o2: nexus3.o-ran-sc.org:10004/o-ran-sc/pti-o2imsdms:2.0.0
-    img_postgres: postgres:9.6
-    img_redis: redis:alpine
+  images:
+    tags:
+      o2service: nexus3.o-ran-sc.org:10004/o-ran-sc/pti-o2imsdms:2.0.0
+      postgres: docker.io/library/postgres:9.6
+      redis: docker.io/library/redis:alpine
     pullPolicy: IfNotPresent
   logginglevel: "WARNING"
 
diff --git a/docs/installation-guide.rst b/docs/installation-guide.rst
index 2674eac..c64535e 100644
--- a/docs/installation-guide.rst
+++ b/docs/installation-guide.rst
@@ -257,10 +257,11 @@ The following instruction should be done outside of INF platform controller host
 
   o2ims:
     serviceaccountname: admin-oran-o2
-    image:
-      img_o2: nexus3.o-ran-sc.org:10004/o-ran-sc/pti-o2imsdms:2.0.0
-      img_postgres: postgres:9.6
-      img_redis: redis:alpine
+    images:
+      tags:
+        o2service: nexus3.o-ran-sc.org:10004/o-ran-sc/pti-o2imsdms:2.0.0
+        postgres: docker.io/library/postgres:9.6
+        redis: docker.io/library/redis:alpine
       pullPolicy: IfNotPresent
     logginglevel: "DEBUG"
 
-- 
2.16.6