From 31ed913926bf0495bac0384419384c2a6efbeec8 Mon Sep 17 00:00:00 2001
From: Jackie Huang <jackie.huang@windriver.com>
Date: Wed, 26 Oct 2022 15:01:48 +0800
Subject: [PATCH] charts: rename orano2 to oran-o2

Rename orano2 to oran-o2 for:
- chart name
- namespace
- service account

Issue-ID: INF-322

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Change-Id: Ib41148f5a042b1fb2a53c47e570328d0d875ad04
---
 README-o2imsbuilder.md               | 4 ++--
 charts/Chart.yaml                    | 2 +-
 charts/templates/serviceaccount.yaml | 4 ++--
 charts/values.yaml                   | 4 ++--
 docs/installation-guide.rst          | 6 +++---
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/README-o2imsbuilder.md b/README-o2imsbuilder.md
index aeab693..a11a844 100644
--- a/README-o2imsbuilder.md
+++ b/README-o2imsbuilder.md
@@ -57,14 +57,14 @@ sudo docker image push registry.local:9001/admin/o2imsdms:0.1.4
 ## Deploy O2 services with helm chart over O-Cloud controller node (with auth user admin)
 
 ```sh
-export NAMESPACE=orano2
+export NAMESPACE=oran-o2
 kubectl create ns ${NAMESPACE}
 
 cd /home/sysadmin/
 source /etc/platform/openrc
 cat <<EOF>ocloud-override.yaml
 o2ims:
-  imagePullSecrets: admin-orano2-registry-secret
+  serviceaccountname: admin-oran-o2
   image:
     repository: registry.local:9001/admin/o2imsdms
     tag: 0.1.4
diff --git a/charts/Chart.yaml b/charts/Chart.yaml
index 31f4f32..ae40ca7 100644
--- a/charts/Chart.yaml
+++ b/charts/Chart.yaml
@@ -15,5 +15,5 @@
 apiVersion: v1
 appVersion: "1.0"
 description: A Helm chart to deploy O2 Services
-name: orano2
+name: oran-o2
 version: 0.1.0
diff --git a/charts/templates/serviceaccount.yaml b/charts/templates/serviceaccount.yaml
index 1cae523..2ce5705 100644
--- a/charts/templates/serviceaccount.yaml
+++ b/charts/templates/serviceaccount.yaml
@@ -4,7 +4,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ .Values.o2ims.serviceaccountname }}
-  namespace: orano2
+  namespace: oran-o2
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
@@ -12,7 +12,7 @@ metadata:
   name: {{ .Values.o2ims.serviceaccountname }}
 subjects:
 - kind: ServiceAccount
-  namespace: orano2
+  namespace: oran-o2
   name: {{ .Values.o2ims.serviceaccountname }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
diff --git a/charts/values.yaml b/charts/values.yaml
index 987f5b7..9a743d6 100644
--- a/charts/values.yaml
+++ b/charts/values.yaml
@@ -33,10 +33,10 @@ resources:
   memory: 2Gi
 
 global:
-  namespace: orano2
+  namespace: oran-o2
 
 o2ims:
-  serviceaccountname: admin-orano2
+  serviceaccountname: admin-oran-o2
   image:
     repository: registry.local:9001/admin/o2imsdms
     tag: 0.1.1
diff --git a/docs/installation-guide.rst b/docs/installation-guide.rst
index 1ef39fa..3df0015 100644
--- a/docs/installation-guide.rst
+++ b/docs/installation-guide.rst
@@ -95,7 +95,7 @@ The following instruction should be done outside of INF platform controller host
   echo "source <(helm completion bash)" >> ~/.bashrc
 
   OAM_IP=<INF OAM IP>
-  NAMESPACE=orano2
+  NAMESPACE=oran-o2
   TOKEN_DATA=<TOKEN_DATA from INF>
 
   USER="admin-user"
@@ -125,7 +125,7 @@ The following instruction should be done outside of INF platform controller host
 
 .. code:: shell
 
-  export NAMESPACE=orano2
+  export NAMESPACE=oran-o2
   kubectl create ns ${NAMESPACE}
 
   # default kube config location is ~/.kube/config
@@ -234,7 +234,7 @@ The following instruction should be done outside of INF platform controller host
 
   cat <<EOF>o2service-override.yaml
   o2ims:
-    imagePullSecrets: admin-orano2-registry-secret
+    serviceaccountname: admin-oran-o2
     image:
       repository: nexus3.o-ran-sc.org:10004/o-ran-sc/pti-o2imsdms
       tag: 1.0.0
-- 
2.16.6