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

7 files changed, 43 insertions, 24 deletions

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: ""
diff --git a/kud/demo/firewall/templates/onap-private-net.yaml b/kud/demo/firewall/templates/onap-private-net.yaml
index 5b7e9ee7..e4079e2c 100644
--- a/kud/demo/firewall/templates/onap-private-net.yaml
+++ b/kud/demo/firewall/templates/onap-private-net.yaml
@@ -6,4 +6,4 @@ spec:
   cnitype : ovn4nfvk8s
   name: {{ .Values.global.onapPrivateNetworkName }} 
   subnet: {{ .Values.global.onapPrivateNetCidr }}
-  gateway: {{ .Values.global.protectedPrivateGateway }}
+  gateway: {{ .Values.global.onapPrivateNetGw }}
diff --git a/kud/demo/firewall/templates/protected-private-net.yaml b/kud/demo/firewall/templates/protected-private-net.yaml
index 43cb9233..33724472 100644
--- a/kud/demo/firewall/templates/protected-private-net.yaml
+++ b/kud/demo/firewall/templates/protected-private-net.yaml
@@ -6,4 +6,4 @@ spec:
   cnitype : ovn4nfvk8s
   name: {{ .Values.global.protectedNetworkName }}
   subnet: {{ .Values.global.protectedNetCidr }}
-  gateway: {{ .Values.global.protectedNetGw }}/{{ .Values.global.gatewayVariable }}
+  gateway: {{ .Values.global.protectedNetGw }}
diff --git a/kud/demo/firewall/templates/unprotected-private-net.yaml b/kud/demo/firewall/templates/unprotected-private-net.yaml
index 8f45eded..2c192598 100644
--- a/kud/demo/firewall/templates/unprotected-private-net.yaml
+++ b/kud/demo/firewall/templates/unprotected-private-net.yaml
@@ -5,5 +5,5 @@ metadata:
 spec:
   cnitype : ovn4nfvk8s
   name: {{ .Values.global.unprotectedNetworkName }}
-  subnet: {{ .Values.global.protectedNetCidr }}
-  gateway: 192.168.10.1/24
+  subnet: {{ .Values.global.protectedPrivateNetCidr }}
+  gateway: {{ .Values.global.protectedPrivateNetGw }}
diff --git a/kud/demo/firewall/values.yaml b/kud/demo/firewall/values.yaml
index 7935828f..e8ab8cdb 100644
--- a/kud/demo/firewall/values.yaml
+++ b/kud/demo/firewall/values.yaml
@@ -17,25 +17,34 @@ resources:
 
 #global vars for parent and subcharts.
 global:
-  demoArtifactsVersion: 1.5.0
+
+  #Networks
+  protectedNetworkName: protected-private-net
+  protectedNetCidr: 192.168.20.0/24
+  protectedNetGw: 192.168.20.100/24
+
+  unprotectedNetworkName: unprotected-private-net
+  protectedPrivateNetCidr: 192.168.10.0/24
+  protectedPrivateNetGw: 192.168.10.1/24
+
+  onapPrivateNetworkName: onap-private-net
+  onapPrivateNetCidr: 10.10.0.0/16
+  onapPrivateNetGw: 10.10.0.1/16
+
+  #vFirewall container
   vfwPrivateIp0: 192.168.10.3
   vfwPrivateIp1: 192.168.20.2
   vfwPrivateIp2: 10.10.100.3
+  #Packetgen container
   vpgPrivateIp0: 192.168.10.2
   vpgPrivateIp1: 10.0.100.2
+  #Sink container
   vsnPrivateIp0: 192.168.20.3
   vsnPrivateIp1: 10.10.100.4
+
+  #########
+  ovnMultusNetworkName: ovn-networkobj
+  demoArtifactsVersion: 1.5.0
   dcaeCollectorIp: 10.0.4.1
   dcaeCollectorPort: 8081
-  protectedNetGw: 192.168.20.100
-  protectedNetCidr: 192.168.20.0/24
-  protectedPrivateNetCidr: 192.168.10.0/24
-  onapPrivateNetCidr: 10.10.0.0/16
-  protectedNetGw: 192.168.20.100
-  protectedNetworkName: protected-private-net
-  unprotectedNetworkName: unprotected-private-net
-  ovnMultusNetworkName: ovn-networkobj
-  onapPrivateNetworkName: onap-private-net
-  protectedPrivateGateway: 10.10.0.1/16
-  gatewayVariable: 24