diff options
| author |   Krzysztof Opasiak <k.opasiak@samsung.com> | 2020-11-26 09:57:26 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2020-11-26 09:57:26 +0000 |
| commit | c95cb6667263e48daed36613565fb6466bce0553 (patch) | |
| tree | 226097d6245509753882bb6c7b4ad2335dbe1e3e /kubernetes/aaf/components/aaf-hello | |
| parent | 4a53ea1b30dd22b37064e5a3e94f91dae79cf99c (diff) | |
| parent | 0dfa387b0e86d79822335ffeb652d81ca8b60564 (diff) | |
Merge "[AAF] Uses new tpls for repos / images"
Diffstat (limited to 'kubernetes/aaf/components/aaf-hello')
| -rw-r--r-- | kubernetes/aaf/components/aaf-hello/requirements.yaml | 3 | ||||
| -rw-r--r-- | kubernetes/aaf/components/aaf-hello/templates/deployment.yaml | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/kubernetes/aaf/components/aaf-hello/requirements.yaml b/kubernetes/aaf/components/aaf-hello/requirements.yaml index 8c4ee7e0c3..4ed52faa0a 100644 --- a/kubernetes/aaf/components/aaf-hello/requirements.yaml +++ b/kubernetes/aaf/components/aaf-hello/requirements.yaml @@ -16,6 +16,9 @@ dependencies: - name: common version: ~6.x-0 repository: '@local' + - name: repositoryGenerator + version: ~6.x-0 + repository: '@local' - name: aaf-templates version: ~6.x-0 repository: 'file://../aaf-templates' diff --git a/kubernetes/aaf/components/aaf-hello/templates/deployment.yaml b/kubernetes/aaf/components/aaf-hello/templates/deployment.yaml index c25cc0b0b0..60e7c6bcc8 100644 --- a/kubernetes/aaf/components/aaf-hello/templates/deployment.yaml +++ b/kubernetes/aaf/components/aaf-hello/templates/deployment.yaml @@ -28,7 +28,7 @@ spec: containers: - name: {{ include "common.name" . }} command: ["bash","-c","cd /opt/app/aaf && if [ ! -d /opt/app/osaaf/etc ]; then cp -Rf etc logs /opt/app/osaaf; fi && exec bin/hello"] - image: {{ .Values.global.repository }}/{{.Values.image }} + image: {{ include "repositoryGenerator.repository" . }}/{{.Values.image }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} ports: {{ include "common.containerPorts" . | nindent 10 }} volumeMounts: {{ include "common.aaf-config-volume-mountpath" . | nindent 8 }} |