From 9cebd18a18bc3075d73f4d250d19be66863f4129 Mon Sep 17 00:00:00 2001
From: Zhe Huang <zhehuang@research.att.com>
Date: Thu, 23 Jan 2020 14:38:06 -0500
Subject: [PATCH] Fix the chartmuseum cannot create dir problem, include
 release repo credential in the default charts.

Signed-off-by: Zhe Huang <zhehuang@research.att.com>
Change-Id: I54338f85d03122dbe327f97403d102fddc594104
---
 ...ber_example_recipe.yaml => example_recipe.yaml} | 26 ++++++++++++----------
 helm/appmgr/templates/deployment.yaml              |  3 +++
 helm/infrastructure/values.yaml                    |  8 ++++++-
 3 files changed, 24 insertions(+), 13 deletions(-)
 rename RECIPE_EXAMPLE/{amber_example_recipe.yaml => example_recipe.yaml} (91%)

diff --git a/RECIPE_EXAMPLE/amber_example_recipe.yaml b/RECIPE_EXAMPLE/example_recipe.yaml
similarity index 91%
rename from RECIPE_EXAMPLE/amber_example_recipe.yaml
rename to RECIPE_EXAMPLE/example_recipe.yaml
index 1c72a61..e181e00 100644
--- a/RECIPE_EXAMPLE/amber_example_recipe.yaml
+++ b/RECIPE_EXAMPLE/example_recipe.yaml
@@ -41,16 +41,18 @@ extsvcplt:
   auxip: "10.0.0.1"
 
 
-#Specify the docker registry credential using the following
-docker-credential:
-  enabled: true
-  credential:
-    oran:
-      registry: "nexus3.o-ran-sc.org:10002"
-      credential:
-        user: "docker"
-        password: "docker"
-        email: "@"
+# Specify the docker registry credential using the following
+# The release and staging LF repos' credentials have already been included.
+# Please do not create duplicated entries
+#docker-credential:
+#  enabled: true
+#  credential:
+#    SOME_KEY_NAME:
+#      registry: ""
+#      credential:
+#        user: ""
+#        password: ""
+#        email: ""
 
 
 a1mediator:
@@ -127,7 +129,7 @@ rsm:
       registry: "docker.io"
     main:
       name: ric-plt-resource-status-manager
-      tag: 3.0.1
+      tag: 3.0.3
       registry: "nexus3.o-ran-sc.org:10002/o-ran-sc"
   privilegedmode: false
 
@@ -135,7 +137,7 @@ rtmgr:
   image:
     registry: "nexus3.o-ran-sc.org:10002/o-ran-sc"
     name: ric-plt-rtmgr
-    tag: 0.3.9
+    tag: 0.4.9
   rpe: rmrpush
   sbi: nngpush
   sbiurl: 0.0.0.0
diff --git a/helm/appmgr/templates/deployment.yaml b/helm/appmgr/templates/deployment.yaml
index c3383aa..1b19211 100644
--- a/helm/appmgr/templates/deployment.yaml
+++ b/helm/appmgr/templates/deployment.yaml
@@ -91,6 +91,9 @@ spec:
           image: {{ include "common.dockerregistry.url" $newctx }}/{{ .Values.appmgr.image.chartmuseum.name }}:{{ .Values.appmgr.image.chartmuseum.tag }}
           {{- $newctx := dict "ctx" $topCtx "defaultpullpolicy" .Values.appmgr.imagePullPolicy }}
           imagePullPolicy: {{ include "common.dockerregistry.pullpolicy" $newctx }}
+          securityContext:
+            fsGroup: 0
+            runAsUser: 0
           envFrom:
             - configMapRef:
                 name: {{ include "common.configmapname.appmgr" . }}-chartmuseum-env
diff --git a/helm/infrastructure/values.yaml b/helm/infrastructure/values.yaml
index 6dddf71..537a005 100644
--- a/helm/infrastructure/values.yaml
+++ b/helm/infrastructure/values.yaml
@@ -59,12 +59,18 @@ extsvcplt:
 docker-credential:
   enabled: true
   credential:
-    oran:
+    oran-release:
       registry: "nexus3.o-ran-sc.org:10002"
       credential:
         user: "docker"
         password: "docker"
         email: "@"
+    oran-staging:
+      registry: "nexus3.o-ran-sc.org:10004"
+      credential:
+        user: "docker"
+        password: "docker"
+        email: "@"
 
 certificate-manager:
   enabled: true
-- 
2.16.6