summaryrefslogtreecommitdiffstats
path: root/kubernetes/aaf/components/aaf-hello
diff options
context:
space:
mode:
authorSylvain Desbureaux <sylvain.desbureaux@orange.com>2020-11-21 21:29:17 +0100
committerSylvain Desbureaux <sylvain.desbureaux@orange.com>2020-11-24 16:50:04 +0000
commit0dfa387b0e86d79822335ffeb652d81ca8b60564 (patch)
treeabdf033aaf84855459d0df6ded67c316c45f6b89 /kubernetes/aaf/components/aaf-hello
parent6adcaae69b01452140e20d6bf76c8cc5e17fd2c5 (diff)
[AAF] Uses new tpls for repos / images
This commit makes aaf chart to use the new generator for repositories and images. As new templates doesn't work well with "sub charts", we move also subcharts to components folder. Issue-ID: OOM-2364 Signed-off-by: Sylvain Desbureaux <sylvain.desbureaux@orange.com> Change-Id: Idcb67c5c96438efd7cee4b0fa3238d5762339b3e
Diffstat (limited to 'kubernetes/aaf/components/aaf-hello')
-rw-r--r--kubernetes/aaf/components/aaf-hello/requirements.yaml5
-rw-r--r--kubernetes/aaf/components/aaf-hello/templates/deployment.yaml2
2 files changed, 5 insertions, 2 deletions
diff --git a/kubernetes/aaf/components/aaf-hello/requirements.yaml b/kubernetes/aaf/components/aaf-hello/requirements.yaml
index 08ef7fe836..4ed52faa0a 100644
--- a/kubernetes/aaf/components/aaf-hello/requirements.yaml
+++ b/kubernetes/aaf/components/aaf-hello/requirements.yaml
@@ -12,10 +12,13 @@
# See the License for the specific language governing permissions and
# limitations under the License.
- dependencies:
+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 }}