summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kubernetes/config/docker/init/src/config/consul/consul-agent-config/sdnc-portal-health.json21
-rwxr-xr-xkubernetes/vfc/templates/all-services.yaml28
-rwxr-xr-xkubernetes/vfc/templates/vfc-ztevmanagerdriver-deployment.yaml22
-rw-r--r--kubernetes/vfc/values.yaml4
4 files changed, 48 insertions, 27 deletions
diff --git a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/sdnc-portal-health.json b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/sdnc-portal-health.json
new file mode 100644
index 0000000000..3ecc1b3f53
--- /dev/null
+++ b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/sdnc-portal-health.json
@@ -0,0 +1,21 @@
+{
+ "service": {
+ "name": "Health Check: SDNC Portal",
+ "checks": [
+ {
+ "id": "sdnc-portal",
+ "name": "SDNC Portal Health Check",
+ "http": "http://sdnc-portal.onap-sdnc:8843/login",
+ "method": "HEAD",
+ "header": {
+ "Cache-Control": ["no-cache"],
+ "Content-Type": ["application/json"],
+ "Accept": ["application/json"]
+ },
+ "tls_skip_verify": true,
+ "interval": "15s",
+ "timeout": "1s"
+ }
+ ]
+ }
+}
diff --git a/kubernetes/vfc/templates/all-services.yaml b/kubernetes/vfc/templates/all-services.yaml
index 98a0c4b0a1..ff9eea4587 100755
--- a/kubernetes/vfc/templates/all-services.yaml
+++ b/kubernetes/vfc/templates/all-services.yaml
@@ -84,36 +84,36 @@ spec:
app: vfc-gvnfmdriver
type: NodePort
#{{ end }}
-#{{ if not .Values.disableVfcVfcZtevmanagerdriver }}
+#{{ if not .Values.disableVfcVfcztevnfmdriver }}
---
apiVersion: v1
kind: Service
metadata:
labels:
- app: vfc-ztevmanagerdriver
- name: vfc-ztevmanagerdriver
+ app: vfc-ztevnfmdriver
+ name: vfc-ztevnfmdriver
namespace: "{{ .Values.nsPrefix }}-vfc"
annotations:
msb.onap.org/service-info: '[
{
- "serviceName": "ztevmanagerdriver",
+ "serviceName": "ztevnfmdriver",
"version": "v1",
- "url": "/api/ztevmanagerdriver/v1",
+ "url": "/api/ztevnfmdriver/v1",
"protocol": "REST",
- "port": "{{.Values.ztevmanagerdriver.port}}",
+ "port": "{{.Values.ztevnfmdriver.port}}",
"visualRange":"1"
}
]'
spec:
ports:
- - name: vfc-ztevmanagerdriver
- port: {{.Values.ztevmanagerdriver.port}}
- nodePort: {{.Values.ztevmanagerdriver.nodePort}}
+ - name: vfc-ztevnfmdriver
+ port: {{.Values.ztevnfmdriver.port}}
+ nodePort: {{.Values.ztevnfmdriver.nodePort}}
selector:
- app: vfc-ztevmanagerdriver
+ app: vfc-ztevnfmdriver
type: NodePort
#{{ end }}
-#{{ if not .Values.disableVfcVfcHwvnfmdriver }}
+#{{ if not .Values.disableVfcVfcNokiavnfmdriver }}
---
apiVersion: v1
kind: Service
@@ -139,10 +139,10 @@ spec:
port: {{.Values.nokiavnfmdriver.port}}
nodePort: {{.Values.nokiavnfmdriver.nodePort}}
selector:
- app: vfc-ztevmanagerdriver
+ app: vfc-nokiavnfmdriver
type: NodePort
#{{ end }}
-#{{ if not .Values.disableVfcNokiaVnfmDriver }}
+#{{ if not .Values.disableVfcVfcHwvnfmdriver }}
---
apiVersion: v1
kind: Service
@@ -164,7 +164,7 @@ metadata:
]'
spec:
ports:
- - name: vfc-ztevmanagerdriver
+ - name: vfc-hwvnfmdriver
port: {{.Values.hwvnfmdriver.port}}
nodePort: {{.Values.hwvnfmdriver.nodePort}}
selector:
diff --git a/kubernetes/vfc/templates/vfc-ztevmanagerdriver-deployment.yaml b/kubernetes/vfc/templates/vfc-ztevmanagerdriver-deployment.yaml
index 5559cd05ac..aed359eceb 100755
--- a/kubernetes/vfc/templates/vfc-ztevmanagerdriver-deployment.yaml
+++ b/kubernetes/vfc/templates/vfc-ztevmanagerdriver-deployment.yaml
@@ -1,33 +1,33 @@
-#{{ if not .Values.disableVfcVfcZtevmanagerdriver }}
+#{{ if not .Values.disableVfcVfcztevnfmdriver }}
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
- name: vfc-ztevmanagerdriver
+ name: vfc-ztevnfmdriver
namespace: "{{ .Values.nsPrefix }}-{{ .Chart.Name }}"
spec:
- replicas: {{ .Values.ztevmanagerdriver.replicas }}
+ replicas: {{ .Values.ztevnfmdriver.replicas }}
selector:
matchLabels:
- app: vfc-ztevmanagerdriver
+ app: vfc-ztevnfmdriver
template:
metadata:
labels:
- app: vfc-ztevmanagerdriver
- name: vfc-ztevmanagerdriver
+ app: vfc-ztevnfmdriver
+ name: vfc-ztevnfmdriver
spec:
- hostname: vfc-ztevmanagerdriver
+ hostname: vfc-ztevnfmdriver
containers:
- args:
- image: {{.Values.ztevmanagerdriver.image}}
- name: "vfc-ztevmanagerdriver"
+ image: {{.Values.ztevnfmdriver.image}}
+ name: "vfc-ztevnfmdriver"
env:
- name: MSB_ADDR
value: {{ .Values.msbaddr }}
ports:
- - containerPort: {{ .Values.ztevmanagerdriver.port }}
+ - containerPort: {{ .Values.ztevnfmdriver.port }}
readinessProbe:
tcpSocket:
- port: {{ .Values.ztevmanagerdriver.port }}
+ port: {{ .Values.ztevnfmdriver.port }}
initialDelaySeconds: 5
periodSeconds: 10
imagePullPolicy: "{{ .Values.pullPolicy }}"
diff --git a/kubernetes/vfc/values.yaml b/kubernetes/vfc/values.yaml
index fe5acd634e..46aa9b71f8 100644
--- a/kubernetes/vfc/values.yaml
+++ b/kubernetes/vfc/values.yaml
@@ -16,8 +16,8 @@ gvnfmdriver:
port: 8484
nodePort: 30484
replicas: 1
-ztevmanagerdriver:
- image: nexus3.onap.org:10001/onap/vfc/ztevmanagerdriver:v1.0.2
+ztevnfmdriver:
+ image: nexus3.onap.org:10001/onap/vfc/ztevnfmdriver:v1.0.2
port: 8410
nodePort: 30410
replicas: 1