summaryrefslogtreecommitdiffstats
path: root/kubernetes/vfc
diff options
context:
space:
mode:
authorAlexis de Talhouët <adetalhouet89@gmail.com>2017-11-28 14:59:30 -0500
committerAlexis de Talhouët <alexis.de_talhouet@bell.ca>2017-11-28 20:06:41 +0000
commited6bd736451173e7cd86003061b160348e4cd7dc (patch)
tree74f1ddaec77278890b5b7b41795dc36c1645b88f /kubernetes/vfc
parentc00c687517d3d764378f54775f0b6a664c1ca221 (diff)
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>
Diffstat (limited to 'kubernetes/vfc')
-rwxr-xr-xkubernetes/vfc/templates/all-services.yaml58
-rwxr-xr-xkubernetes/vfc/templates/vfc-nokiavnfmdriver-deployment.yaml36
-rwxr-xr-xkubernetes/vfc/templates/vfc-workflow-deployment.yaml12
-rwxr-xr-xkubernetes/vfc/templates/vfc-workflow-engine-activity.yaml44
-rw-r--r--kubernetes/vfc/values.yaml38
5 files changed, 172 insertions, 16 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
diff --git a/kubernetes/vfc/values.yaml b/kubernetes/vfc/values.yaml
index 94fcef8374..fe5acd634e 100644
--- a/kubernetes/vfc/values.yaml
+++ b/kubernetes/vfc/values.yaml
@@ -2,67 +2,77 @@ nsPrefix: onap
pullPolicy: IfNotPresent
msbaddr: msb-iag.onap-msb:80
nslcm:
- image: nexus3.onap.org:10001/onap/vfc/nslcm:latest
+ image: nexus3.onap.org:10001/onap/vfc/nslcm:v1.0.2
port: 8403
nodePort: 30403
replicas: 1
resmgr:
- image: nexus3.onap.org:10001/onap/vfc/resmanagement:latest
+ image: nexus3.onap.org:10001/onap/vfc/resmanagement:v1.0.0
port: 8480
nodePort: 30480
replicas: 1
gvnfmdriver:
- image: nexus3.onap.org:10001/onap/vfc/gvnfmdriver:latest
+ image: nexus3.onap.org:10001/onap/vfc/gvnfmdriver:v1.0.1
port: 8484
nodePort: 30484
replicas: 1
ztevmanagerdriver:
- image: nexus3.onap.org:10001/onap/vfc/ztevmanagerdriver:latest
+ image: nexus3.onap.org:10001/onap/vfc/ztevmanagerdriver:v1.0.2
port: 8410
nodePort: 30410
replicas: 1
hwvnfmdriver:
- image: nexus3.onap.org:10001/onap/vfc/nfvo/svnfm/huawei:latest
+ image: nexus3.onap.org:10001/onap/vfc/nfvo/svnfm/huawei:v1.0.2
port: 8482
nodePort: 30482
replicas: 1
ztesdncdriver:
- image: nexus3.onap.org:10001/onap/vfc/ztesdncdriver:latest
+ image: nexus3.onap.org:10001/onap/vfc/ztesdncdriver:v1.0.0
port: 8411
nodePort: 30411
replicas: 1
+nokiavnfmdriver:
+ image: nexus3.onap.org:10001/onap/vfc/nfvo/svnfm/nokia:v1.0.2
+ port: 8486
+ nodePort: 30412
+ replicas: 1
jujudriver:
- image: nexus3.onap.org:10001/onap/vfc/jujudriver:latest
+ image: nexus3.onap.org:10001/onap/vfc/jujudriver:v1.0.0
port: 8483
nodePort: 30483
replicas: 1
vnflcm:
- image: nexus3.onap.org:10001/onap/vfc/vnflcm:latest
+ image: nexus3.onap.org:10001/onap/vfc/vnflcm:v1.0.1
port: 8801
nodePort: 30801
replicas: 1
vnfres:
- image: nexus3.onap.org:10001/onap/vfc/vnfres:latest
+ image: nexus3.onap.org:10001/onap/vfc/vnfres:v1.0.1
port: 8802
nodePort: 30802
replicas: 1
vnfmgr:
- image: nexus3.onap.org:10001/onap/vfc/vnfmgr:latest
+ image: nexus3.onap.org:10001/onap/vfc/vnfmgr:v1.0.1
port: 8803
nodePort: 30803
replicas: 1
emsdriver:
- image: nexus3.onap.org:10001/onap/vfc/emsdriver:latest
+ image: nexus3.onap.org:10001/onap/vfc/emsdriver:v1.0.1
port: 8206
nodePort: 30296
replicas: 1
workflow:
- image: nexus3.onap.org:10001/onap/vfc/wfenginemgrservice:latest
- port: 8805
+ image: nexus3.onap.org:10001/onap/vfc/wfengine-mgrservice:v1.0.0
+ port: 10550
nodePort: 30805
replicas: 1
+workflowengineactiviti:
+ image: nexus3.onap.org:10001/onap/vfc/wfengine-activiti:v1.0.0
+ port: 8080
+ nodePort: 30807
+ replicas: 1
catalog:
- image: nexus3.onap.org:10001/onap/vfc/catalog:latest
+ image: nexus3.onap.org:10001/onap/vfc/catalog:v1.0.2
port: 8806
nodePort: 30806
replicas: 1 \ No newline at end of file