[DMAAP-MR] Correct zoo-entrance image definition in statefulset

Use RepositoryGenerator template to define the image name in
the statefulset chart

Issue-ID: DMAAP-1622

Signed-off-by: Andreas Geissler <andreas-geissler@telekom.de>
Change-Id: Icb26a34cec14cccaef4380e5eaf3f5b49f798171
(cherry picked from commit e7d568734785b8b77ec25362aa59fd4eaa5f1be3)

diff --git a/kubernetes/dmaap/components/message-router/templates/statefulset.yaml b/kubernetes/dmaap/components/message-router/templates/statefulset.yaml
index e9d890e..174eb2c 100644 (file)
--- a/kubernetes/dmaap/components/message-router/templates/statefulset.yaml
+++ b/kubernetes/dmaap/components/message-router/templates/statefulset.yaml
@@ -68,7 +68,7 @@ spec:
             mountPath: /etc/jmx-kafka
       {{- end }}
         - name: srimzi-zk-entrance
-          image: 'docker.io/scholzj/zoo-entrance:latest'
+          image: {{ include "repositoryGenerator.dockerHubRepository" . }}/{{ .Values.zookeeper.entrance.image }}
           command:
             - /opt/stunnel/stunnel_run.sh
           ports:
@@ -227,4 +227,4 @@ spec:
     - port: {{ .Values.global.zkTunnelService.internalPort }}
       protocol: TCP
   policyTypes:
-  - Ingress
\ No newline at end of file
+  - Ingress

diff --git a/kubernetes/dmaap/components/message-router/values.yaml b/kubernetes/dmaap/components/message-router/values.yaml
index 3726652..11daae0 100644 (file)
--- a/kubernetes/dmaap/components/message-router/values.yaml
+++ b/kubernetes/dmaap/components/message-router/values.yaml
@@ -71,6 +71,10 @@ certInitializer:
 image: onap/dmaap/dmaap-mr:1.3.2
 pullPolicy: Always
 
+zookeeper:
+  entrance:
+    image: scholzj/zoo-entrance:latest
+
 secrets:
   - uid: mr-kafka-admin-secret
     externalSecret: '{{ tpl (default "" .Values.config.jaasConfExternalSecret) . }}'