diff options
| author |   Krzysztof Opasiak <k.opasiak@samsung.com> | 2021-11-10 20:03:42 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2021-11-10 20:03:42 +0000 |
| commit | af3d4158481aa457d21b894865536e8d5bda1826 (patch) | |
| tree | 13f4635b3eac1272ee548d0a6a7f6ec7efd48662 /kubernetes/common | |
| parent | c03c1f30a59b79e69997108be149340a15b5f855 (diff) | |
| parent | 1e99719c0224863cf26c5362243a4fa1b955c362 (diff) | |
Merge "[AAI][BABEL] Remove Hardcoded certificates"
Diffstat (limited to 'kubernetes/common')
| -rw-r--r-- | kubernetes/common/repositoryGenerator/templates/_repository.tpl | 4 | ||||
| -rw-r--r-- | kubernetes/common/repositoryGenerator/values.yaml | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/kubernetes/common/repositoryGenerator/templates/_repository.tpl b/kubernetes/common/repositoryGenerator/templates/_repository.tpl index 1662985d0a..349bb4072a 100644 --- a/kubernetes/common/repositoryGenerator/templates/_repository.tpl +++ b/kubernetes/common/repositoryGenerator/templates/_repository.tpl @@ -105,6 +105,10 @@ {{- include "repositoryGenerator.image._helper" (merge (dict "image" "htpasswdImage") .) }} {{- end -}} +{{- define "repositoryGenerator.image.jetty" -}} + {{- include "repositoryGenerator.image._helper" (merge (dict "image" "jettyImage") .) }} +{{- end -}} + {{- define "repositoryGenerator.image.jre" -}} {{- include "repositoryGenerator.image._helper" (merge (dict "image" "jreImage") .) }} {{- end -}} diff --git a/kubernetes/common/repositoryGenerator/values.yaml b/kubernetes/common/repositoryGenerator/values.yaml index f4104538f7..e2fe1ffbdb 100644 --- a/kubernetes/common/repositoryGenerator/values.yaml +++ b/kubernetes/common/repositoryGenerator/values.yaml @@ -28,6 +28,7 @@ global: envsubstImage: dibi/envsubst:1 # there's only latest image for htpasswd htpasswdImage: xmartlabs/htpasswd:latest + jettyImage: jetty:9-jdk11-slim jreImage: onap/integration-java11:7.1.0 kubectlImage: bitnami/kubectl:1.19 loggingImage: beats/filebeat:5.5.0 @@ -60,6 +61,7 @@ imageRepoMapping: curlImage: dockerHubRepository envsubstImage: dockerHubRepository htpasswdImage: dockerHubRepository + jettyImage: dockerHubRepository jreImage: repository kubectlImage: dockerHubRepository loggingImage: elasticRepository |