[AAI] Uses new tpls for repos / images

[oom.git] / kubernetes / aai / components / aai-elasticsearch / templates / deployment.yaml

diff --git a/kubernetes/aai/components/aai-elasticsearch/templates/deployment.yaml b/kubernetes/aai/components/aai-elasticsearch/templates/deployment.yaml
index 8fa165a..135d3f8 100644 (file)
--- a/kubernetes/aai/components/aai-elasticsearch/templates/deployment.yaml
+++ b/kubernetes/aai/components/aai-elasticsearch/templates/deployment.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2018 Amdocs, Bell Canada, AT&T
+# Modifications Copyright © 2020 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -53,7 +54,7 @@ spec:
               fieldPath: metadata.namespace
         securityContext:
           privileged: true
-        image: {{ .Values.global.dockerhubRepository | default .Values.dockerhubRepository }}/{{ .Values.global.busyboxImage | default .Values.busyboxImage }}
+        image: {{ include "repositoryGenerator.image.busybox" . }}
         imagePullPolicy: {{ .Values.pullPolicy | default .Values.global.pullPolicy }}
         name: init-sysctl
         volumeMounts:
@@ -61,7 +62,7 @@ spec:
           mountPath: /logroot/
       containers:
       - name: {{ include "common.name" . }}
-        image: "{{ .Values.global.loggingRepository }}/{{ .Values.image }}"
+        image: {{ include "repositoryGenerator.elasticRepository" . }}/{{ .Values.image }}
         imagePullPolicy: {{ .Values.pullPolicy | default .Values.global.pullPolicy }}
         ports:
         - containerPort: {{ .Values.service.internalPort }}