Create chart for nf-simulator agregating avcn, netconf and ves-client

Issue-ID: INT-1869
Signed-off-by: Edyta Krukowska <edyta.krukowska@nokia.com>
Change-Id: Iadbf7c5186aedb3b9c74c2daed51eda0b67bd1a6

3 files changed, 8 insertions, 7 deletions

diff --git a/helm/avcn-manager/Chart.yaml b/helm/avcn-manager/Chart.yaml
index 6f1e851..858157f 100644
--- a/helm/avcn-manager/Chart.yaml
+++ b/helm/avcn-manager/Chart.yaml
@@ -30,3 +30,6 @@ dependencies:
   - name: kafka
     version: 12.17.2
     repository: https://charts.bitnami.com/bitnami
+  - name: repositoryGenerator
+    version: ~8.x-0
+    repository: '@local'
\ No newline at end of file
diff --git a/helm/avcn-manager/templates/deployment.yaml b/helm/avcn-manager/templates/deployment.yaml
index 5b0c472..e83ff04 100644
--- a/helm/avcn-manager/templates/deployment.yaml
+++ b/helm/avcn-manager/templates/deployment.yaml
@@ -38,7 +38,7 @@ spec:
           name: {{ .Chart.Name }}
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
+          image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
diff --git a/helm/avcn-manager/values.yaml b/helm/avcn-manager/values.yaml
index 85ccb09..3a60df8 100644
--- a/helm/avcn-manager/values.yaml
+++ b/helm/avcn-manager/values.yaml
@@ -12,12 +12,11 @@ image:
 
 config:
   vesEndpoint: http://ves:8080/eventListener/v7
-  kafkaBootstrapServer: avcn-manager-kafka:9092
+  kafkaBootstrapServer: nf-simulator-kafka:9092
   kafkaSourceTopic: config
   kafkaAplicationId: avcn-manager
   pnfsimulatorEndpoint: http://ves-client:5000/simulator/start
 
-
 imagePullSecrets: []
 nameOverride: ""
 fullnameOverride: "avcn-manager"
@@ -47,7 +46,7 @@ affinity: {}
 
 
 zookeeper:
-  fullnameOverride: "avcn-manager-zookeeper"
+  fullnameOverride: "nf-simulator-zookeeper"
   auth:
     enabled: false
   allowAnonymousLogin: true
@@ -55,11 +54,10 @@ zookeeper:
     enabled: false
 
 kafka:
-  fullnameOverride: "avcn-manager-kafka"
+  fullnameOverride: "nf-simulator-kafka"
   zookeeper:
     enabled: false
-    connect: "avcn-manager-zookeeper:2181"
   externalZookeeper:
-    servers: "avcn-manager-zookeeper"
+    servers: "nf-simulator-zookeeper"
   persistence:
     enabled: false