X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=ric-common%2FCommon-Template%2Fhelm%2Fric-common%2Ftemplates%2F_dockerregistry.tpl;fp=ric-platform%2F50-RIC-Platform%2Fhelm%2Fcommon%2Ftemplates%2F_repository.tpl;h=ac692ea6f76e1631cee2c9a82d0f0e18951f9e25;hb=948cb92657906b0c6ede9e1f82a56b95521fe0b4;hp=0796998830cd1d7707a65b29f360964943dd0658;hpb=d32ff1f486548b1a6123761055c2757c5762904f;p=it%2Fdep.git

diff --git a/ric-platform/50-RIC-Platform/helm/common/templates/_repository.tpl b/ric-common/Common-Template/helm/ric-common/templates/_dockerregistry.tpl
similarity index 87%
rename from ric-platform/50-RIC-Platform/helm/common/templates/_repository.tpl
rename to ric-common/Common-Template/helm/ric-common/templates/_dockerregistry.tpl
index 07969988..ac692ea6 100644
--- a/ric-platform/50-RIC-Platform/helm/common/templates/_repository.tpl
+++ b/ric-common/Common-Template/helm/ric-common/templates/_dockerregistry.tpl
@@ -65,14 +65,29 @@
   - .Values.repositoryCredOverride : override global and default docker registry credential
 */}}
 {{- define "common.repositoryCred" -}}
-  {{- if .Values.repositoryCredOverride -}}
-    {{- printf "%s" .Values.repositoryCredOverride -}}
+  {{- $componentname := .Chart.Name -}}
+  {{- $firsttier := (index .Values (printf "%s" $componentname)) -}}
+  {{- if $firsttier -}}
+    {{- $secondtier := (index .Values (printf "%s" $componentname) (printf "%s" "repositoryCredOverride")) -}}
+    {{- if $secondtier -}}
+      {{- printf "%s" $secondtier -}}
+    {{- else -}}
+      {{- if .Values.global -}}
+        {{- if .Values.global.repositoryCred -}}
+          {{- printf "%s" .Values.global.repositoryCred -}}
+        {{- else -}}
+          {{- printf "%s" .Values.repositoryCred -}}
+        {{- end -}}
+      {{- else -}}
+        {{- printf "%s" .Values.repositoryCred -}}
+      {{- end -}}
+    {{- end -}}
   {{- else -}}
-    {{- if  .Values.global -}}
+    {{- if .Values.global -}}
       {{- if .Values.global.repositoryCred -}}
         {{- printf "%s" .Values.global.repositoryCred -}}
       {{- else -}}
-	{{- printf "%s" .Values.repositoryCred -}}
+        {{- printf "%s" .Values.repositoryCred -}}
       {{- end -}}
     {{- else -}}
       {{- printf "%s" .Values.repositoryCred -}}
@@ -81,6 +96,18 @@
 {{- end -}}
 
 
+
+
+
+
+
+
+
+
+
+
+
+
 {{/*
   Define the golbal image pull policy.
   The value for .Values.imagePullPolicy is used by default,