Merge "Add default docker credential for the staging repo" into r3

diff --git a/ric-aux/RECIPE_EXAMPLE/amber_example_recipe.yaml b/ric-aux/RECIPE_EXAMPLE/example_recipe.yaml
similarity index 92%
rename from ric-aux/RECIPE_EXAMPLE/amber_example_recipe.yaml
rename to ric-aux/RECIPE_EXAMPLE/example_recipe.yaml
index 476a5c5..20eabac 100644 (file)
--- a/ric-aux/RECIPE_EXAMPLE/amber_example_recipe.yaml
+++ b/ric-aux/RECIPE_EXAMPLE/example_recipe.yaml
@@ -41,16 +41,18 @@ extsvcaux:
   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: ""
 
 
 dashboard:

diff --git a/ric-aux/helm/infrastructure/values.yaml b/ric-aux/helm/infrastructure/values.yaml
index 9a454c4..81f1807 100644 (file)
--- a/ric-aux/helm/infrastructure/values.yaml
+++ b/ric-aux/helm/infrastructure/values.yaml
@@ -23,12 +23,18 @@ extsvcaux:
 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

diff --git a/ric-dep b/ric-dep
index d68f2e9..282e7af 160000 (submodule)
--- a/ric-dep
+++ b/ric-dep
@@ -1 +1 @@
-Subproject commit d68f2e965abec2c1078a9c62a9dc27a16e1d359d
+Subproject commit 282e7af25ec053ae6d1c5a399c91c2c323f705cd