Adjust VFC modules to latest

- add nokia driver
- add workflow engine activiti
- fix workflow deps
- update versions to released ones (TB updated)

Change-Id: Ia8df5fdd1df13e4d237aa628fb2c4fceb2d033cc
Issue-ID: OOM-473
Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>

4 files changed, 148 insertions, 2 deletions

diff --git a/kubernetes/vfc/templates/all-services.yaml b/kubernetes/vfc/templates/all-services.yaml
index cd3c9c9136..98a0c4b0a1 100755
--- a/kubernetes/vfc/templates/all-services.yaml
+++ b/kubernetes/vfc/templates/all-services.yaml
@@ -119,6 +119,35 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
+    app: vfc-nokiavnfmdriver
+  name: vfc-nokiavnfmdriver
+  namespace: "{{ .Values.nsPrefix }}-vfc"
+  annotations:
+    msb.onap.org/service-info: '[
+      {
+          "serviceName": "nokiavnfmdriver",
+          "version": "v1",
+          "url": "/api/nokiavnfmdriver/v1",
+          "protocol": "REST",
+          "port": "{{.Values.nokiavnfmdriver.port}}",
+          "visualRange":"1"
+      }
+      ]'
+spec:
+  ports:
+  - name: vfc-nokiavnfmdriver
+    port: {{.Values.nokiavnfmdriver.port}}
+    nodePort: {{.Values.nokiavnfmdriver.nodePort}}
+  selector:
+    app: vfc-ztevmanagerdriver
+  type: NodePort
+#{{ end }}
+#{{ if not .Values.disableVfcNokiaVnfmDriver }}
+---
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
     app: vfc-hwvnfmdriver
   name: vfc-hwvnfmdriver
   namespace: "{{ .Values.nsPrefix }}-vfc"
@@ -345,6 +374,35 @@ spec:
     app: vfc-workflow
   type: NodePort
 #{{ end }}
+#{{ if not .Values.disableVfcVfcWorkflowEngineActiviti }}
+---
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    app: vfc-workflowengineactiviti
+  name: vfc-workflowengineactiviti
+  namespace: "{{ .Values.nsPrefix }}-vfc"
+  annotations:
+    msb.onap.org/service-info: '[
+      {
+          "serviceName": "workflow",
+          "version": "v1",
+          "url": "/activiti-rest",
+          "protocol": "REST",
+          "port": "{{.Values.workflowengineactiviti.port}}",
+          "visualRange":"1"
+      }
+      ]'
+spec:
+  ports:
+  - name: vfc-workflow
+    port: {{.Values.workflowengineactiviti.port}}
+    nodePort: {{.Values.workflowengineactiviti.nodePort}}
+  selector:
+    app: vfc-workflow
+  type: NodePort
+#{{ end }}
 #{{ if not .Values.disableVfcVfcCatalog }}
 ---
 apiVersion: v1
diff --git a/kubernetes/vfc/templates/vfc-nokiavnfmdriver-deployment.yaml b/kubernetes/vfc/templates/vfc-nokiavnfmdriver-deployment.yaml
new file mode 100755
index 0000000000..9a648ca203
--- /dev/null
+++ b/kubernetes/vfc/templates/vfc-nokiavnfmdriver-deployment.yaml
@@ -0,0 +1,36 @@
+#{{ if not .Values.disableVfcNokiaVnfmDriver }}
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  name: vfc-nokiavnfmdriver
+  namespace: "{{ .Values.nsPrefix }}-{{ .Chart.Name }}"
+spec:
+  replicas: {{ .Values.nokiavnfmdriver.replicas }}
+  selector:
+    matchLabels:
+      app: vfc-nokiavnfmdriver
+  template:
+    metadata:
+      labels:
+        app: vfc-nokiavnfmdriver
+      name: vfc-nokiavnfmdriver
+    spec:
+      hostname: vfc-nokiavnfmdriver
+      containers:
+      - args:
+        image:  {{.Values.nokiavnfmdriver.image}}
+        name: "vfc-nokiavnfmdriver"
+        env:
+        - name: MSB_ADDR
+          value: {{ .Values.msbaddr }}
+        ports:
+        - containerPort: {{ .Values.nokiavnfmdriver.port }}
+        readinessProbe:
+          tcpSocket:
+            port: {{ .Values.nokiavnfmdriver.port }}
+          initialDelaySeconds: 5
+          periodSeconds: 10
+        imagePullPolicy: "{{ .Values.pullPolicy }}"
+      imagePullSecrets:
+      - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}
\ No newline at end of file
diff --git a/kubernetes/vfc/templates/vfc-workflow-deployment.yaml b/kubernetes/vfc/templates/vfc-workflow-deployment.yaml
index 097986cdd0..f19b55fe95 100755
--- a/kubernetes/vfc/templates/vfc-workflow-deployment.yaml
+++ b/kubernetes/vfc/templates/vfc-workflow-deployment.yaml
@@ -21,8 +21,16 @@ spec:
         image:  {{.Values.workflow.image}}
         name: "vfc-workflow"
         env:
-        - name: MSB_ADDR
-          value: {{ .Values.msbaddr }}
+        - name: SERVICE_IP
+          valueFrom:
+            fieldRef:
+              fieldPath: status.podIP
+        - name: SERVICE_PORT
+          value: "{{ .Values.workflow.port }}"
+        - name: OPENPALETTE_MSB_IP
+          value: msb-iag.{{ .Values.nsPrefix }}-msb
+        - name: OPENPALETTE_MSB_PORT
+          value: "80"
         ports:
         - containerPort: {{ .Values.workflow.port }}
         readinessProbe:
diff --git a/kubernetes/vfc/templates/vfc-workflow-engine-activity.yaml b/kubernetes/vfc/templates/vfc-workflow-engine-activity.yaml
new file mode 100755
index 0000000000..cb18ada997
--- /dev/null
+++ b/kubernetes/vfc/templates/vfc-workflow-engine-activity.yaml
@@ -0,0 +1,44 @@
+#{{ if not .Values.disableVfcVfcWorkflowEngineActiviti }}
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  name: vfc-workflowengineactiviti
+  namespace: "{{ .Values.nsPrefix }}-{{ .Chart.Name }}"
+spec:
+  replicas: {{ .Values.workflowengineactiviti.replicas }}
+  selector:
+    matchLabels:
+      app: vfc-workflowengineactiviti
+  template:
+    metadata:
+      labels:
+        app: vfc-workflowengineactiviti
+      name: vfc-workflowengineactiviti
+    spec:
+      hostname: vfc-workflowengineactiviti
+      containers:
+      - args:
+        image:  {{.Values.workflowengineactiviti.image}}
+        name: "vfc-workflowengineactiviti"
+        env:
+        - name: SERVICE_IP
+          valueFrom:
+            fieldRef:
+              fieldPath: status.podIP
+        - name: SERVICE_PORT
+          value: "{{ .Values.workflow.port }}"
+        - name: OPENPALETTE_MSB_IP
+          value: msb-iag.{{ .Values.nsPrefix }}-msb
+        - name: OPENPALETTE_MSB_PORT
+          value: "80"
+        ports:
+        - containerPort: {{ .Values.workflowengineactiviti.port }}
+        readinessProbe:
+          tcpSocket:
+            port: {{ .Values.workflowengineactiviti.port }}
+          initialDelaySeconds: 5
+          periodSeconds: 10
+        imagePullPolicy: "{{ .Values.pullPolicy }}"
+      imagePullSecrets:
+      - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}
\ No newline at end of file