From 4ad464793de8b2dbef513c3962a709fd42848458 Mon Sep 17 00:00:00 2001
From: Ritu Sood <ritu.sood@intel.com>
Date: Fri, 24 May 2019 14:03:41 -0700
Subject: Update vFW Helm chart

Fixed sink containers
to use the right containers and also
fixed IP addresses. Some cleanup

Change-Id: Id7ed7fe48c9e37f5d3c52c02c0585af7511c5efe
Signed-off-by: Ritu Sood <ritu.sood@intel.com>
Issue-ID: MULTICLOUD-653
---
 kud/demo/firewall/charts/sink/templates/configmap.yaml  |  7 +++++++
 kud/demo/firewall/charts/sink/templates/deployment.yaml |  7 +++++--
 kud/demo/firewall/charts/sink/values.yaml               | 12 ++++++------
 3 files changed, 18 insertions(+), 8 deletions(-)
 create mode 100644 kud/demo/firewall/charts/sink/templates/configmap.yaml

(limited to 'kud/demo/firewall/charts/sink')

diff --git a/kud/demo/firewall/charts/sink/templates/configmap.yaml b/kud/demo/firewall/charts/sink/templates/configmap.yaml
new file mode 100644
index 00000000..3abfef26
--- /dev/null
+++ b/kud/demo/firewall/charts/sink/templates/configmap.yaml
@@ -0,0 +1,7 @@
+piVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ include "sink.name" .}}-configmap
+data:
+  protected_net_gw:  {{ .Values.global.protectedNetGw }}
+  protected_private_net_cidr: {{ .Values.global.protectedPrivateNetCidr }}
diff --git a/kud/demo/firewall/charts/sink/templates/deployment.yaml b/kud/demo/firewall/charts/sink/templates/deployment.yaml
index f5ccdae9..a988bc5d 100644
--- a/kud/demo/firewall/charts/sink/templates/deployment.yaml
+++ b/kud/demo/firewall/charts/sink/templates/deployment.yaml
@@ -26,14 +26,17 @@ spec:
     spec:
       containers:
       - name: {{ .Chart.Name }}
-        image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+        image: "{{ .Values.image.sinkrepo }}:{{ .Values.image.sinktag }}"
+        envFrom:
+        - configMapRef:
+            name: {{ include "sink.name" . }}-configmap
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         tty: true
         stdin: true
         securityContext:
           privileged: true
       - name: darkstat
-        image:  "{{ .Values.image.repo }}:{{ .Values.image.tag }}"
+        image:  "{{ .Values.image.darkstatrepo }}:{{ .Values.image.darkstattag }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         tty: true
         stdin: true
diff --git a/kud/demo/firewall/charts/sink/values.yaml b/kud/demo/firewall/charts/sink/values.yaml
index 1ac6f08d..e2608e2f 100644
--- a/kud/demo/firewall/charts/sink/values.yaml
+++ b/kud/demo/firewall/charts/sink/values.yaml
@@ -5,12 +5,12 @@
 replicaCount: 1
 
 image:
-  repository: akhilak/sink
-  tag: latest
-  pullPolicy: IfNotPresent
-  repo: akhilak/darkstat
-  tag: latest
-  pullPolicy: IfNotPresent
+  sinkrepo: rtsood/onap-vfw-demo-sink
+  sinktag: 0.2.0
+  pullPolicy: Always
+  darkstatrepo: electrocucaracha/darkstat
+  darkstattag: latest
+  pullPolicy: Always
 
 nameOverride: ""
 fullnameOverride: ""
-- 
cgit 1.2.3-korg