summaryrefslogtreecommitdiffstats
path: root/kubernetes/common/repositoryGenerator
diff options
context:
space:
mode:
authorSylvain Desbureaux <sylvain.desbureaux@orange.com>2020-11-19 16:48:39 +0100
committerSylvain Desbureaux <sylvain.desbureaux@orange.com>2020-12-17 14:05:06 +0100
commit145140b968430f5ac62ec72499b36d40f708054a (patch)
treee7e29d95eef2405a650559e4c740e7497a809f9e /kubernetes/common/repositoryGenerator
parent79185b609b107b7e626973a026d2898c9d5534c8 (diff)
[COMMON][CertInit] Uses new tpls for repos / images
This commit makes CertInitializer template to use the new generator for repositories and images. Issue-ID: OOM-2364 Signed-off-by: Sylvain Desbureaux <sylvain.desbureaux@orange.com> Change-Id: I5efa37225bfe05e2c7be7b8d2420ccaeb10afe62
Diffstat (limited to 'kubernetes/common/repositoryGenerator')
-rw-r--r--kubernetes/common/repositoryGenerator/templates/_repository.tpl4
-rw-r--r--kubernetes/common/repositoryGenerator/values.yaml2
2 files changed, 6 insertions, 0 deletions
diff --git a/kubernetes/common/repositoryGenerator/templates/_repository.tpl b/kubernetes/common/repositoryGenerator/templates/_repository.tpl
index c351db1ba0..ba22bfbd60 100644
--- a/kubernetes/common/repositoryGenerator/templates/_repository.tpl
+++ b/kubernetes/common/repositoryGenerator/templates/_repository.tpl
@@ -90,6 +90,10 @@
{{- include "repositoryGenerator.image._helper" (merge (dict "image" "htpasswdImage") .) }}
{{- end -}}
+{{- define "repositoryGenerator.image.jre" -}}
+ {{- include "repositoryGenerator.image._helper" (merge (dict "image" "jreImage") .) }}
+{{- end -}}
+
{{- define "repositoryGenerator.image.kubectl" -}}
{{- include "repositoryGenerator.image._helper" (merge (dict "image" "kubectlImage") .) }}
{{- end -}}
diff --git a/kubernetes/common/repositoryGenerator/values.yaml b/kubernetes/common/repositoryGenerator/values.yaml
index 003782ded1..def7381e46 100644
--- a/kubernetes/common/repositoryGenerator/values.yaml
+++ b/kubernetes/common/repositoryGenerator/values.yaml
@@ -25,6 +25,7 @@ global:
envsubstImage: dibi/envsubst:1
# there's only latest image for htpasswd
htpasswdImage: xmartlabs/htpasswd:latest
+ jreImage: onap/integration-java11:7.1.0
kubectlImage: bitnami/kubectl:1.19
loggingImage: beats/filebeat:5.5.0
mariadbImage: bitnami/mariadb:10.5.8
@@ -54,6 +55,7 @@ imageRepoMapping:
curlImage: dockerHubRepository
envsubstImage: dockerHubRepository
htpasswdImage: dockerHubRepository
+ jreImage: repository
kubectlImage: dockerHubRepository
loggingImage: elasticRepository
mariadbImage: dockerHubRepository