aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSatoshi Fujii <fujii-satoshi@jp.fujitsu.com>2021-06-11 17:29:42 +0000
committerSatoshi Fujii <fujii-satoshi@jp.fujitsu.com>2021-06-11 17:44:07 +0000
commita817cc5788d4d5a8b478cc0cab0cf9750d5ab836 (patch)
treead9a36ac050bd2e41264a7b444868233483a385f
parent64c2d941090b9a0ce5fe50410da2215df56ffa27 (diff)
[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
-rw-r--r--kubernetes/common/repositoryGenerator/templates/_repository.tpl2
1 files changed, 1 insertions, 1 deletions
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 }}