aboutsummaryrefslogtreecommitdiffstats
path: root/kubernetes
diff options
context:
space:
mode:
Diffstat (limited to 'kubernetes')
-rw-r--r--kubernetes/consul/resources/config/consul-agent-config/vfc-health.json7
-rw-r--r--kubernetes/vfc/templates/all-services.yaml31
-rw-r--r--kubernetes/vfc/templates/vfc-nokiav2vnfmdriver-deployment.yaml50
-rw-r--r--kubernetes/vfc/values.yaml5
4 files changed, 92 insertions, 1 deletions
diff --git a/kubernetes/consul/resources/config/consul-agent-config/vfc-health.json b/kubernetes/consul/resources/config/consul-agent-config/vfc-health.json
index 5ace3e4d9b..25e670c7da 100644
--- a/kubernetes/consul/resources/config/consul-agent-config/vfc-health.json
+++ b/kubernetes/consul/resources/config/consul-agent-config/vfc-health.json
@@ -45,6 +45,13 @@
"timeout": "1s"
},
{
+ "id": "vfc-nokiav2vnfmdriver.{{ .Values.nsPrefix }}",
+ "name": "VFC nokiav2vnfmdriver Health Check",
+ "tcp": "vfc-nokiav2vnfmdriver.{{ .Values.nsPrefix }}:8089",
+ "interval": "15s",
+ "timeout": "1s"
+ },
+ {
"id": "vfc-nslcm.{{ .Values.nsPrefix }}",
"name": "VFC nslcm Health Check",
"tcp": "vfc-nslcm.{{ .Values.nsPrefix }}:8403",
diff --git a/kubernetes/vfc/templates/all-services.yaml b/kubernetes/vfc/templates/all-services.yaml
index 819ecffeb8..1e8abe2ec3 100644
--- a/kubernetes/vfc/templates/all-services.yaml
+++ b/kubernetes/vfc/templates/all-services.yaml
@@ -156,6 +156,35 @@ spec:
app: vfc-nokiavnfmdriver
type: NodePort
#{{ end }}
+#{{ if not .Values.disableVfcVfcNokiav2vnfmdriver }}
+---
+apiVersion: v1
+kind: Service
+metadata:
+ labels:
+ app: vfc-nokiav2vnfmdriver
+ name: vfc-nokiav2vnfmdriver
+ namespace: "{{ .Values.nsPrefix }}"
+ annotations:
+ msb.onap.org/service-info: '[
+ {
+ "serviceName": "NokiaSVNFM",
+ "version": "v1",
+ "url": "/api/NokiaSVNFM/v1",
+ "protocol": "REST",
+ "port": "{{.Values.nokiav2vnfmdriver.port}}",
+ "visualRange":"1"
+ }
+ ]'
+spec:
+ ports:
+ - name: vfc-nokiav2vnfmdriver
+ port: {{.Values.nokiav2vnfmdriver.port}}
+ nodePort: {{.Values.nokiav2vnfmdriver.nodePort}}
+ selector:
+ app: vfc-nokiav2vnfmdriver
+ type: NodePort
+#{{ end }}
#{{ if not .Values.disableVfcVfcHwvnfmdriver }}
---
apiVersion: v1
@@ -445,4 +474,4 @@ spec:
selector:
app: vfc-catalog
type: NodePort
-#{{ end }} \ No newline at end of file
+#{{ end }}
diff --git a/kubernetes/vfc/templates/vfc-nokiav2vnfmdriver-deployment.yaml b/kubernetes/vfc/templates/vfc-nokiav2vnfmdriver-deployment.yaml
new file mode 100644
index 0000000000..7c021fddc2
--- /dev/null
+++ b/kubernetes/vfc/templates/vfc-nokiav2vnfmdriver-deployment.yaml
@@ -0,0 +1,50 @@
+# Copyright © 2017 Amdocs, Bell Canada
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+#{{ if not .Values.disableVfcNokiav2VnfmDriver }}
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+ name: vfc-nokiav2vnfmdriver
+ namespace: "{{ .Values.nsPrefix }}"
+spec:
+ replicas: {{ .Values.nokiav2vnfmdriver.replicas }}
+ selector:
+ matchLabels:
+ app: vfc-nokiav2vnfmdriver
+ template:
+ metadata:
+ labels:
+ app: vfc-nokiav2vnfmdriver
+ name: vfc-nokiav2vnfmdriver
+ spec:
+ hostname: vfc-nokiav2vnfmdriver
+ containers:
+ - args:
+ image: {{.Values.nokiav2vnfmdriver.image}}
+ name: "vfc-nokiav2vnfmdriver"
+ env:
+ - name: MSB_ADDR
+ value: {{ tpl .Values.msbaddr . }}
+ ports:
+ - containerPort: {{ .Values.nokiav2vnfmdriver.port }}
+ readinessProbe:
+ tcpSocket:
+ port: {{ .Values.nokiav2vnfmdriver.port }}
+ initialDelaySeconds: 5
+ periodSeconds: 10
+ imagePullPolicy: "{{ .Values.pullPolicy }}"
+ imagePullSecrets:
+ - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}
diff --git a/kubernetes/vfc/values.yaml b/kubernetes/vfc/values.yaml
index b301d2de4c..5bd6b09f62 100644
--- a/kubernetes/vfc/values.yaml
+++ b/kubernetes/vfc/values.yaml
@@ -50,6 +50,11 @@ nokiavnfmdriver:
port: 8486
nodePort: 30412
replicas: 1
+nokiav2vnfmdriver:
+ image: nexus3.onap.org:10001/onap/vfc/nfvo/svnfm/nokiav2:1.1.0-STAGING-latest
+ port: 8089
+ nodePort: 30413
+ replicas: 1
jujudriver:
image: nexus3.onap.org:10001/onap/vfc/jujudriver:v1.0.0
port: 8483