From: Satoshi Fujii <fujii-satoshi@jp.fujitsu.com>
Date: Fri, 11 Jun 2021 17:29:42 +0000 (+0000)
Subject: [COMMON] Fix docker-registry-key empty creds
X-Git-Tag: 9.0.0~231^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=a817cc5788d4d5a8b478cc0cab0cf9750d5ab836;p=oom.git

[COMMON] Fix docker-registry-key empty creds

When image repository does not allow anonymous pull, image pull
failed due to empty credentials in docker-registry-key secret.

This change fixes _repository.tpl repository generator to refer to
.global.repositoryCred in override.yaml .

Issue-ID: OOM-2767
Signed-off-by: Satoshi Fujii <fujii-satoshi@jp.fujitsu.com>
Change-Id: I3cd7eabcdda547e99e0461767a0451dc1e51132b
---

diff --git a/kubernetes/common/repositoryGenerator/templates/_repository.tpl b/kubernetes/common/repositoryGenerator/templates/_repository.tpl
index 87dd5c29e9..488db054a0 100644
--- a/kubernetes/common/repositoryGenerator/templates/_repository.tpl
+++ b/kubernetes/common/repositoryGenerator/templates/_repository.tpl
@@ -139,7 +139,7 @@
   {{/* Our version of helm doesn't support deepCopy so we need this nasty trick */}}
   {{- $subchartDot := fromJson (include "common.subChartDot" (dict "dot" $dot "initRoot" $initRoot)) }}
   {{- $repoCreds := "" }}
-  {{- if $subchartDot.Values.global.dockerHubRepositoryCred }}
+  {{- if $subchartDot.Values.global.repositoryCred }}
   {{-   $repo := $subchartDot.Values.global.repository }}
   {{-   $cred := $subchartDot.Values.global.repositoryCred }}
   {{-   $mail := default "@" $cred.mail }}