aboutsummaryrefslogtreecommitdiffstats
path: root/kubernetes/vfc
diff options
context:
space:
mode:
authorBorislavG <Borislav.Glozman@amdocs.com>2018-04-24 07:56:27 +0000
committerBorislavG <Borislav.Glozman@amdocs.com>2018-04-24 13:23:19 +0000
commit1ffbd99a2757af8e10d0f6af46177c646364f91b (patch)
treeceb97b36e0e6ae50349f6495dc585b4ebd61d3f6 /kubernetes/vfc
parent23a95a751a002163f61cb7eafb4dc84465415daa (diff)
Make all services independent of helm Release.Name
Issue-ID: OOM-906 Change-Id: Ic65127d3981cb0a696c784392cab59fbf06b1e66 Signed-off-by: BorislavG <Borislav.Glozman@amdocs.com>
Diffstat (limited to 'kubernetes/vfc')
-rw-r--r--kubernetes/vfc/charts/vfc-catalog/templates/service.yaml8
-rw-r--r--kubernetes/vfc/charts/vfc-catalog/values.yaml1
-rw-r--r--kubernetes/vfc/charts/vfc-ems-driver/templates/service.yaml8
-rw-r--r--kubernetes/vfc/charts/vfc-ems-driver/values.yaml1
-rw-r--r--kubernetes/vfc/charts/vfc-generic-vnfm-driver/templates/service.yaml8
-rw-r--r--kubernetes/vfc/charts/vfc-generic-vnfm-driver/values.yaml1
-rw-r--r--kubernetes/vfc/charts/vfc-huawei-vnfm-driver/templates/service.yaml12
-rw-r--r--kubernetes/vfc/charts/vfc-huawei-vnfm-driver/values.yaml1
-rw-r--r--kubernetes/vfc/charts/vfc-juju-vnfm-driver/templates/service.yaml8
-rw-r--r--kubernetes/vfc/charts/vfc-juju-vnfm-driver/values.yaml1
-rw-r--r--kubernetes/vfc/charts/vfc-multivim-proxy/templates/service.yaml8
-rw-r--r--kubernetes/vfc/charts/vfc-multivim-proxy/values.yaml1
-rw-r--r--kubernetes/vfc/charts/vfc-nokia-v2vnfm-driver/templates/service.yaml8
-rw-r--r--kubernetes/vfc/charts/vfc-nokia-v2vnfm-driver/values.yaml1
-rw-r--r--kubernetes/vfc/charts/vfc-nokia-vnfm-driver/templates/service.yaml8
-rw-r--r--kubernetes/vfc/charts/vfc-nokia-vnfm-driver/values.yaml1
-rw-r--r--kubernetes/vfc/charts/vfc-nslcm/templates/service.yaml8
-rw-r--r--kubernetes/vfc/charts/vfc-nslcm/values.yaml1
-rw-r--r--kubernetes/vfc/charts/vfc-resmgr/templates/service.yaml8
-rw-r--r--kubernetes/vfc/charts/vfc-resmgr/values.yaml1
-rw-r--r--kubernetes/vfc/charts/vfc-vnflcm/templates/service.yaml8
-rw-r--r--kubernetes/vfc/charts/vfc-vnflcm/values.yaml1
-rw-r--r--kubernetes/vfc/charts/vfc-vnfmgr/templates/service.yaml8
-rw-r--r--kubernetes/vfc/charts/vfc-vnfmgr/values.yaml1
-rw-r--r--kubernetes/vfc/charts/vfc-vnfres/templates/service.yaml8
-rw-r--r--kubernetes/vfc/charts/vfc-vnfres/values.yaml1
-rw-r--r--kubernetes/vfc/charts/vfc-workflow-engine/templates/service.yaml8
-rw-r--r--kubernetes/vfc/charts/vfc-workflow-engine/values.yaml1
-rw-r--r--kubernetes/vfc/charts/vfc-workflow/templates/service.yaml8
-rw-r--r--kubernetes/vfc/charts/vfc-workflow/values.yaml1
-rw-r--r--kubernetes/vfc/charts/vfc-zte-sdnc-driver/templates/service.yaml8
-rw-r--r--kubernetes/vfc/charts/vfc-zte-sdnc-driver/values.yaml1
-rw-r--r--kubernetes/vfc/charts/vfc-zte-vnfm-driver/templates/service.yaml8
-rw-r--r--kubernetes/vfc/charts/vfc-zte-vnfm-driver/values.yaml1
34 files changed, 87 insertions, 70 deletions
diff --git a/kubernetes/vfc/charts/vfc-catalog/templates/service.yaml b/kubernetes/vfc/charts/vfc-catalog/templates/service.yaml
index 7d3390e761..9fa3e4f12c 100644
--- a/kubernetes/vfc/charts/vfc-catalog/templates/service.yaml
+++ b/kubernetes/vfc/charts/vfc-catalog/templates/service.yaml
@@ -15,7 +15,7 @@
apiVersion: v1
kind: Service
metadata:
- name: {{ include "common.fullname" . }}
+ name: {{ include "common.servicename" . }}
namespace: {{ include "common.namespace" . }}
labels:
app: {{ include "common.name" . }}
@@ -40,12 +40,12 @@ spec:
- port: {{ .Values.service.externalPort }}
targetPort: {{ .Values.service.internalPort }}
nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }}
- name: {{ .Values.service.name }}
+ name: {{ .Values.service.portName }}
{{- else -}}
- port: {{ .Values.service.externalPort }}
targetPort: {{ .Values.service.internalPort }}
- name: {{ .Values.service.name }}
+ name: {{ .Values.service.portName }}
{{- end}}
selector:
app: {{ include "common.name" . }}
- release: {{ .Release.Name }} \ No newline at end of file
+ release: {{ .Release.Name }}
diff --git a/kubernetes/vfc/charts/vfc-catalog/values.yaml b/kubernetes/vfc/charts/vfc-catalog/values.yaml
index 0485b57890..77b96139cb 100644
--- a/kubernetes/vfc/charts/vfc-catalog/values.yaml
+++ b/kubernetes/vfc/charts/vfc-catalog/values.yaml
@@ -59,6 +59,7 @@ readiness:
service:
type: ClusterIP
name: vfc-catalog
+ portName: vfc-catalog
externalPort: 8806
internalPort: 8806
# nodePort: 30806
diff --git a/kubernetes/vfc/charts/vfc-ems-driver/templates/service.yaml b/kubernetes/vfc/charts/vfc-ems-driver/templates/service.yaml
index 16eee99872..6a5ef8b668 100644
--- a/kubernetes/vfc/charts/vfc-ems-driver/templates/service.yaml
+++ b/kubernetes/vfc/charts/vfc-ems-driver/templates/service.yaml
@@ -15,7 +15,7 @@
apiVersion: v1
kind: Service
metadata:
- name: {{ include "common.fullname" . }}
+ name: {{ include "common.servicename" . }}
namespace: {{ include "common.namespace" . }}
labels:
app: {{ include "common.name" . }}
@@ -40,12 +40,12 @@ spec:
- port: {{ .Values.service.externalPort }}
targetPort: {{ .Values.service.internalPort }}
nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }}
- name: {{ .Values.service.name }}
+ name: {{ .Values.service.portName }}
{{- else -}}
- port: {{ .Values.service.externalPort }}
targetPort: {{ .Values.service.internalPort }}
- name: {{ .Values.service.name }}
+ name: {{ .Values.service.portName }}
{{- end}}
selector:
app: {{ include "common.name" . }}
- release: {{ .Release.Name }} \ No newline at end of file
+ release: {{ .Release.Name }}
diff --git a/kubernetes/vfc/charts/vfc-ems-driver/values.yaml b/kubernetes/vfc/charts/vfc-ems-driver/values.yaml
index a8fd22eac5..f732eac42b 100644
--- a/kubernetes/vfc/charts/vfc-ems-driver/values.yaml
+++ b/kubernetes/vfc/charts/vfc-ems-driver/values.yaml
@@ -63,6 +63,7 @@ readiness:
service:
type: ClusterIP
name: vfc-ems-driver
+ portName: vfc-ems-driver
externalPort: 8206
internalPort: 8206
# nodePort: 30296
diff --git a/kubernetes/vfc/charts/vfc-generic-vnfm-driver/templates/service.yaml b/kubernetes/vfc/charts/vfc-generic-vnfm-driver/templates/service.yaml
index 0e2f1a12e7..0495fadb53 100644
--- a/kubernetes/vfc/charts/vfc-generic-vnfm-driver/templates/service.yaml
+++ b/kubernetes/vfc/charts/vfc-generic-vnfm-driver/templates/service.yaml
@@ -15,7 +15,7 @@
apiVersion: v1
kind: Service
metadata:
- name: {{ include "common.fullname" . }}
+ name: {{ include "common.servicename" . }}
namespace: {{ include "common.namespace" . }}
labels:
app: {{ include "common.name" . }}
@@ -40,12 +40,12 @@ spec:
- port: {{ .Values.service.externalPort }}
targetPort: {{ .Values.service.internalPort }}
nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }}
- name: {{ .Values.service.name }}
+ name: {{ .Values.service.portName }}
{{- else -}}
- port: {{ .Values.service.externalPort }}
targetPort: {{ .Values.service.internalPort }}
- name: {{ .Values.service.name }}
+ name: {{ .Values.service.portName }}
{{- end}}
selector:
app: {{ include "common.name" . }}
- release: {{ .Release.Name }} \ No newline at end of file
+ release: {{ .Release.Name }}
diff --git a/kubernetes/vfc/charts/vfc-generic-vnfm-driver/values.yaml b/kubernetes/vfc/charts/vfc-generic-vnfm-driver/values.yaml
index 119a12cfea..1f6deaef73 100644
--- a/kubernetes/vfc/charts/vfc-generic-vnfm-driver/values.yaml
+++ b/kubernetes/vfc/charts/vfc-generic-vnfm-driver/values.yaml
@@ -59,6 +59,7 @@ readiness:
service:
type: ClusterIP
name: vfc-generic-vnfm-driver
+ portName: vfc-generic-vnfm-driver
externalPort: 8484
internalPort: 8484
# nodePort: 30484
diff --git a/kubernetes/vfc/charts/vfc-huawei-vnfm-driver/templates/service.yaml b/kubernetes/vfc/charts/vfc-huawei-vnfm-driver/templates/service.yaml
index 60bad3ed21..362656eccd 100644
--- a/kubernetes/vfc/charts/vfc-huawei-vnfm-driver/templates/service.yaml
+++ b/kubernetes/vfc/charts/vfc-huawei-vnfm-driver/templates/service.yaml
@@ -15,7 +15,7 @@
apiVersion: v1
kind: Service
metadata:
- name: {{ include "common.fullname" . }}
+ name: {{ include "common.servicename" . }}
namespace: {{ include "common.namespace" . }}
labels:
app: {{ include "common.name" . }}
@@ -37,22 +37,22 @@ spec:
type: {{ .Values.service.type }}
ports:
{{if eq .Values.service.type "NodePort" -}}
- - name: {{ .Values.service.name }}
+ - name: {{ .Values.service.portName }}
port: {{ .Values.service.internalPort }}
targetPort: {{ .Values.service.internalPort }}
nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }}
- - name: {{ .Values.service.name }}2
+ - name: {{ .Values.service.portName }}2
port: {{ .Values.service.internalPort2 }}
targetPort: {{ .Values.service.internalPort2 }}
nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort2 }}
{{- else -}}
- port: {{ .Values.service.externalPort }}
targetPort: {{ .Values.service.internalPort }}
- name: {{ .Values.service.name }}
+ name: {{ .Values.service.portName }}
- port: {{ .Values.service.externalPort2 }}
targetPort: {{ .Values.service.internalPort2 }}
- name: {{ .Values.service.name }}2
+ name: {{ .Values.service.portName }}2
{{- end}}
selector:
app: {{ include "common.name" . }}
- release: {{ .Release.Name }} \ No newline at end of file
+ release: {{ .Release.Name }}
diff --git a/kubernetes/vfc/charts/vfc-huawei-vnfm-driver/values.yaml b/kubernetes/vfc/charts/vfc-huawei-vnfm-driver/values.yaml
index 988b80c4c7..073d9d0b43 100644
--- a/kubernetes/vfc/charts/vfc-huawei-vnfm-driver/values.yaml
+++ b/kubernetes/vfc/charts/vfc-huawei-vnfm-driver/values.yaml
@@ -59,6 +59,7 @@ readiness:
service:
type: ClusterIP
name: vfc-huawei-vnfm-driver
+ portName: vfc-huawei-vnfm-driver
externalPort: 8482
internalPort: 8482
externalPort2: 8483
diff --git a/kubernetes/vfc/charts/vfc-juju-vnfm-driver/templates/service.yaml b/kubernetes/vfc/charts/vfc-juju-vnfm-driver/templates/service.yaml
index 3376ea9e91..52f9dad9bc 100644
--- a/kubernetes/vfc/charts/vfc-juju-vnfm-driver/templates/service.yaml
+++ b/kubernetes/vfc/charts/vfc-juju-vnfm-driver/templates/service.yaml
@@ -15,7 +15,7 @@
apiVersion: v1
kind: Service
metadata:
- name: {{ include "common.fullname" . }}
+ name: {{ include "common.servicename" . }}
namespace: {{ include "common.namespace" . }}
labels:
app: {{ include "common.name" . }}
@@ -40,12 +40,12 @@ spec:
- port: {{ .Values.service.externalPort }}
targetPort: {{ .Values.service.internalPort }}
nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }}
- name: {{ .Values.service.name }}
+ name: {{ .Values.service.portName }}
{{- else -}}
- port: {{ .Values.service.externalPort }}
targetPort: {{ .Values.service.internalPort }}
- name: {{ .Values.service.name }}
+ name: {{ .Values.service.portName }}
{{- end}}
selector:
app: {{ include "common.name" . }}
- release: {{ .Release.Name }} \ No newline at end of file
+ release: {{ .Release.Name }}
diff --git a/kubernetes/vfc/charts/vfc-juju-vnfm-driver/values.yaml b/kubernetes/vfc/charts/vfc-juju-vnfm-driver/values.yaml
index 1f4c5ac9a1..af058afde9 100644
--- a/kubernetes/vfc/charts/vfc-juju-vnfm-driver/values.yaml
+++ b/kubernetes/vfc/charts/vfc-juju-vnfm-driver/values.yaml
@@ -59,6 +59,7 @@ readiness:
service:
type: ClusterIP
name: vfc-juju-vnfm-driver
+ portName: vfc-juju-vnfm-driver
externalPort: 8483
internalPort: 8483
# nodePort: 30483
diff --git a/kubernetes/vfc/charts/vfc-multivim-proxy/templates/service.yaml b/kubernetes/vfc/charts/vfc-multivim-proxy/templates/service.yaml
index 268cf0c768..3464cdd5c6 100644
--- a/kubernetes/vfc/charts/vfc-multivim-proxy/templates/service.yaml
+++ b/kubernetes/vfc/charts/vfc-multivim-proxy/templates/service.yaml
@@ -15,7 +15,7 @@
apiVersion: v1
kind: Service
metadata:
- name: {{ include "common.fullname" . }}
+ name: {{ include "common.servicename" . }}
namespace: {{ include "common.namespace" . }}
labels:
app: {{ include "common.name" . }}
@@ -40,12 +40,12 @@ spec:
- port: {{ .Values.service.externalPort }}
targetPort: {{ .Values.service.internalPort }}
nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }}
- name: {{ .Values.service.name }}
+ name: {{ .Values.service.portName }}
{{- else -}}
- port: {{ .Values.service.externalPort }}
targetPort: {{ .Values.service.internalPort }}
- name: {{ .Values.service.name }}
+ name: {{ .Values.service.portName }}
{{- end}}
selector:
app: {{ include "common.name" . }}
- release: {{ .Release.Name }} \ No newline at end of file
+ release: {{ .Release.Name }}
diff --git a/kubernetes/vfc/charts/vfc-multivim-proxy/values.yaml b/kubernetes/vfc/charts/vfc-multivim-proxy/values.yaml
index 4c1711af3b..fbd144d830 100644
--- a/kubernetes/vfc/charts/vfc-multivim-proxy/values.yaml
+++ b/kubernetes/vfc/charts/vfc-multivim-proxy/values.yaml
@@ -59,6 +59,7 @@ readiness:
service:
type: ClusterIP
name: vfc-multivim-proxy
+ portName: vfc-multivim-proxy
externalPort: 8481
internalPort: 8481
diff --git a/kubernetes/vfc/charts/vfc-nokia-v2vnfm-driver/templates/service.yaml b/kubernetes/vfc/charts/vfc-nokia-v2vnfm-driver/templates/service.yaml
index b722e2471e..4a33e49990 100644
--- a/kubernetes/vfc/charts/vfc-nokia-v2vnfm-driver/templates/service.yaml
+++ b/kubernetes/vfc/charts/vfc-nokia-v2vnfm-driver/templates/service.yaml
@@ -15,7 +15,7 @@
apiVersion: v1
kind: Service
metadata:
- name: {{ include "common.fullname" . }}
+ name: {{ include "common.servicename" . }}
namespace: {{ include "common.namespace" . }}
labels:
app: {{ include "common.name" . }}
@@ -40,12 +40,12 @@ spec:
- port: {{ .Values.service.externalPort }}
targetPort: {{ .Values.service.internalPort }}
nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }}
- name: {{ .Values.service.name }}
+ name: {{ .Values.service.portName }}
{{- else -}}
- port: {{ .Values.service.externalPort }}
targetPort: {{ .Values.service.internalPort }}
- name: {{ .Values.service.name }}
+ name: {{ .Values.service.portName }}
{{- end}}
selector:
app: {{ include "common.name" . }}
- release: {{ .Release.Name }} \ No newline at end of file
+ release: {{ .Release.Name }}
diff --git a/kubernetes/vfc/charts/vfc-nokia-v2vnfm-driver/values.yaml b/kubernetes/vfc/charts/vfc-nokia-v2vnfm-driver/values.yaml
index 2c5504c1ac..98197b065a 100644
--- a/kubernetes/vfc/charts/vfc-nokia-v2vnfm-driver/values.yaml
+++ b/kubernetes/vfc/charts/vfc-nokia-v2vnfm-driver/values.yaml
@@ -60,6 +60,7 @@ readiness:
service:
type: ClusterIP
name: vfc-nokia-v2vnfm-driver
+ portName: vfc-nokia-v2vnfm-driver
externalPort: 8089
internalPort: 8089
# nodePort: 13
diff --git a/kubernetes/vfc/charts/vfc-nokia-vnfm-driver/templates/service.yaml b/kubernetes/vfc/charts/vfc-nokia-vnfm-driver/templates/service.yaml
index e55b1b2fb0..48c0d80670 100644
--- a/kubernetes/vfc/charts/vfc-nokia-vnfm-driver/templates/service.yaml
+++ b/kubernetes/vfc/charts/vfc-nokia-vnfm-driver/templates/service.yaml
@@ -15,7 +15,7 @@
apiVersion: v1
kind: Service
metadata:
- name: {{ include "common.fullname" . }}
+ name: {{ include "common.servicename" . }}
namespace: {{ include "common.namespace" . }}
labels:
app: {{ include "common.name" . }}
@@ -40,12 +40,12 @@ spec:
- port: {{ .Values.service.externalPort }}
targetPort: {{ .Values.service.internalPort }}
nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }}
- name: {{ .Values.service.name }}
+ name: {{ .Values.service.portName }}
{{- else -}}
- port: {{ .Values.service.externalPort }}
targetPort: {{ .Values.service.internalPort }}
- name: {{ .Values.service.name }}
+ name: {{ .Values.service.portName }}
{{- end}}
selector:
app: {{ include "common.name" . }}
- release: {{ .Release.Name }} \ No newline at end of file
+ release: {{ .Release.Name }}
diff --git a/kubernetes/vfc/charts/vfc-nokia-vnfm-driver/values.yaml b/kubernetes/vfc/charts/vfc-nokia-vnfm-driver/values.yaml
index c3db239833..3bc8d8f26b 100644
--- a/kubernetes/vfc/charts/vfc-nokia-vnfm-driver/values.yaml
+++ b/kubernetes/vfc/charts/vfc-nokia-vnfm-driver/values.yaml
@@ -59,6 +59,7 @@ readiness:
service:
type: ClusterIP
name: vfc-nokia-vnfm-driver
+ portName: vfc-nokia-vnfm-driver
externalPort: 8486
internalPort: 8486
# nodePort: 12
diff --git a/kubernetes/vfc/charts/vfc-nslcm/templates/service.yaml b/kubernetes/vfc/charts/vfc-nslcm/templates/service.yaml
index c854684cea..09475ca458 100644
--- a/kubernetes/vfc/charts/vfc-nslcm/templates/service.yaml
+++ b/kubernetes/vfc/charts/vfc-nslcm/templates/service.yaml
@@ -15,7 +15,7 @@
apiVersion: v1
kind: Service
metadata:
- name: {{ include "common.fullname" . }}
+ name: {{ include "common.servicename" . }}
namespace: {{ include "common.namespace" . }}
labels:
app: {{ include "common.name" . }}
@@ -40,12 +40,12 @@ spec:
- port: {{ .Values.service.externalPort }}
targetPort: {{ .Values.service.internalPort }}
nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }}
- name: {{ .Values.service.name }}
+ name: {{ .Values.service.portName }}
{{- else -}}
- port: {{ .Values.service.externalPort }}
targetPort: {{ .Values.service.internalPort }}
- name: {{ .Values.service.name }}
+ name: {{ .Values.service.portName }}
{{- end}}
selector:
app: {{ include "common.name" . }}
- release: {{ .Release.Name }} \ No newline at end of file
+ release: {{ .Release.Name }}
diff --git a/kubernetes/vfc/charts/vfc-nslcm/values.yaml b/kubernetes/vfc/charts/vfc-nslcm/values.yaml
index ab54b4d07f..ee360d58e8 100644
--- a/kubernetes/vfc/charts/vfc-nslcm/values.yaml
+++ b/kubernetes/vfc/charts/vfc-nslcm/values.yaml
@@ -59,6 +59,7 @@ readiness:
service:
type: ClusterIP
name: vfc-nslcm
+ portName: vfc-nslcm
externalPort: 8403
internalPort: 8403
# nodePort: 30403
diff --git a/kubernetes/vfc/charts/vfc-resmgr/templates/service.yaml b/kubernetes/vfc/charts/vfc-resmgr/templates/service.yaml
index 993d4787e9..e803b657d4 100644
--- a/kubernetes/vfc/charts/vfc-resmgr/templates/service.yaml
+++ b/kubernetes/vfc/charts/vfc-resmgr/templates/service.yaml
@@ -15,7 +15,7 @@
apiVersion: v1
kind: Service
metadata:
- name: {{ include "common.fullname" . }}
+ name: {{ include "common.servicename" . }}
namespace: {{ include "common.namespace" . }}
labels:
app: {{ include "common.name" . }}
@@ -40,12 +40,12 @@ spec:
- port: {{ .Values.service.externalPort }}
targetPort: {{ .Values.service.internalPort }}
nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }}
- name: {{ .Values.service.name }}
+ name: {{ .Values.service.portName }}
{{- else -}}
- port: {{ .Values.service.externalPort }}
targetPort: {{ .Values.service.internalPort }}
- name: {{ .Values.service.name }}
+ name: {{ .Values.service.portName }}
{{- end}}
selector:
app: {{ include "common.name" . }}
- release: {{ .Release.Name }} \ No newline at end of file
+ release: {{ .Release.Name }}
diff --git a/kubernetes/vfc/charts/vfc-resmgr/values.yaml b/kubernetes/vfc/charts/vfc-resmgr/values.yaml
index a6ea0464b9..ba2b01dc7e 100644
--- a/kubernetes/vfc/charts/vfc-resmgr/values.yaml
+++ b/kubernetes/vfc/charts/vfc-resmgr/values.yaml
@@ -59,6 +59,7 @@ readiness:
service:
type: ClusterIP
name: vfc-resmgr
+ portName: vfc-resmgr
externalPort: 8480
internalPort: 8480
# nodePort: 30480
diff --git a/kubernetes/vfc/charts/vfc-vnflcm/templates/service.yaml b/kubernetes/vfc/charts/vfc-vnflcm/templates/service.yaml
index ad4f716781..066e75b1ae 100644
--- a/kubernetes/vfc/charts/vfc-vnflcm/templates/service.yaml
+++ b/kubernetes/vfc/charts/vfc-vnflcm/templates/service.yaml
@@ -15,7 +15,7 @@
apiVersion: v1
kind: Service
metadata:
- name: {{ include "common.fullname" . }}
+ name: {{ include "common.servicename" . }}
namespace: {{ include "common.namespace" . }}
labels:
app: {{ include "common.name" . }}
@@ -40,12 +40,12 @@ spec:
- port: {{ .Values.service.externalPort }}
targetPort: {{ .Values.service.internalPort }}
nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }}
- name: {{ .Values.service.name }}
+ name: {{ .Values.service.portName }}
{{- else -}}
- port: {{ .Values.service.externalPort }}
targetPort: {{ .Values.service.internalPort }}
- name: {{ .Values.service.name }}
+ name: {{ .Values.service.portName }}
{{- end}}
selector:
app: {{ include "common.name" . }}
- release: {{ .Release.Name }} \ No newline at end of file
+ release: {{ .Release.Name }}
diff --git a/kubernetes/vfc/charts/vfc-vnflcm/values.yaml b/kubernetes/vfc/charts/vfc-vnflcm/values.yaml
index 09ff8a4a8e..e7cdc6392a 100644
--- a/kubernetes/vfc/charts/vfc-vnflcm/values.yaml
+++ b/kubernetes/vfc/charts/vfc-vnflcm/values.yaml
@@ -59,6 +59,7 @@ readiness:
service:
type: ClusterIP
name: vfc-vnflcm
+ portName: vfc-vnflcm
externalPort: 8801
internalPort: 8801
# nodePort: 30801
diff --git a/kubernetes/vfc/charts/vfc-vnfmgr/templates/service.yaml b/kubernetes/vfc/charts/vfc-vnfmgr/templates/service.yaml
index df6ca313e4..53a195d676 100644
--- a/kubernetes/vfc/charts/vfc-vnfmgr/templates/service.yaml
+++ b/kubernetes/vfc/charts/vfc-vnfmgr/templates/service.yaml
@@ -15,7 +15,7 @@
apiVersion: v1
kind: Service
metadata:
- name: {{ include "common.fullname" . }}
+ name: {{ include "common.servicename" . }}
namespace: {{ include "common.namespace" . }}
labels:
app: {{ include "common.name" . }}
@@ -40,12 +40,12 @@ spec:
- port: {{ .Values.service.externalPort }}
targetPort: {{ .Values.service.internalPort }}
nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }}
- name: {{ .Values.service.name }}
+ name: {{ .Values.service.portName }}
{{- else -}}
- port: {{ .Values.service.externalPort }}
targetPort: {{ .Values.service.internalPort }}
- name: {{ .Values.service.name }}
+ name: {{ .Values.service.portName }}
{{- end}}
selector:
app: {{ include "common.name" . }}
- release: {{ .Release.Name }} \ No newline at end of file
+ release: {{ .Release.Name }}
diff --git a/kubernetes/vfc/charts/vfc-vnfmgr/values.yaml b/kubernetes/vfc/charts/vfc-vnfmgr/values.yaml
index d308fe8ae3..0ee3dd6f35 100644
--- a/kubernetes/vfc/charts/vfc-vnfmgr/values.yaml
+++ b/kubernetes/vfc/charts/vfc-vnfmgr/values.yaml
@@ -59,6 +59,7 @@ readiness:
service:
type: ClusterIP
name: vfc-vnfmgr
+ portName: vfc-vnfmgr
externalPort: 8803
internalPort: 8803
# nodePort: 30803
diff --git a/kubernetes/vfc/charts/vfc-vnfres/templates/service.yaml b/kubernetes/vfc/charts/vfc-vnfres/templates/service.yaml
index d3a3dc980c..83b4891d52 100644
--- a/kubernetes/vfc/charts/vfc-vnfres/templates/service.yaml
+++ b/kubernetes/vfc/charts/vfc-vnfres/templates/service.yaml
@@ -15,7 +15,7 @@
apiVersion: v1
kind: Service
metadata:
- name: {{ include "common.fullname" . }}
+ name: {{ include "common.servicename" . }}
namespace: {{ include "common.namespace" . }}
labels:
app: {{ include "common.name" . }}
@@ -40,12 +40,12 @@ spec:
- port: {{ .Values.service.externalPort }}
targetPort: {{ .Values.service.internalPort }}
nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }}
- name: {{ .Values.service.name }}
+ name: {{ .Values.service.portName }}
{{- else -}}
- port: {{ .Values.service.externalPort }}
targetPort: {{ .Values.service.internalPort }}
- name: {{ .Values.service.name }}
+ name: {{ .Values.service.portName }}
{{- end}}
selector:
app: {{ include "common.name" . }}
- release: {{ .Release.Name }} \ No newline at end of file
+ release: {{ .Release.Name }}
diff --git a/kubernetes/vfc/charts/vfc-vnfres/values.yaml b/kubernetes/vfc/charts/vfc-vnfres/values.yaml
index 2b0651a3f2..eb9ff31a93 100644
--- a/kubernetes/vfc/charts/vfc-vnfres/values.yaml
+++ b/kubernetes/vfc/charts/vfc-vnfres/values.yaml
@@ -59,6 +59,7 @@ readiness:
service:
type: ClusterIP
name: vfc-vnfres
+ portName: vfc-vnfres
externalPort: 8802
internalPort: 8802
# nodePort: 30802
diff --git a/kubernetes/vfc/charts/vfc-workflow-engine/templates/service.yaml b/kubernetes/vfc/charts/vfc-workflow-engine/templates/service.yaml
index 4a4ae0e402..1432b04943 100644
--- a/kubernetes/vfc/charts/vfc-workflow-engine/templates/service.yaml
+++ b/kubernetes/vfc/charts/vfc-workflow-engine/templates/service.yaml
@@ -15,7 +15,7 @@
apiVersion: v1
kind: Service
metadata:
- name: {{ include "common.fullname" . }}
+ name: {{ include "common.servicename" . }}
namespace: {{ include "common.namespace" . }}
labels:
app: {{ include "common.name" . }}
@@ -40,12 +40,12 @@ spec:
- port: {{ .Values.service.externalPort }}
targetPort: {{ .Values.service.internalPort }}
nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }}
- name: {{ .Values.service.name }}
+ name: {{ .Values.service.portName }}
{{- else -}}
- port: {{ .Values.service.externalPort }}
targetPort: {{ .Values.service.internalPort }}
- name: {{ .Values.service.name }}
+ name: {{ .Values.service.portName }}
{{- end}}
selector:
app: {{ include "common.name" . }}
- release: {{ .Release.Name }} \ No newline at end of file
+ release: {{ .Release.Name }}
diff --git a/kubernetes/vfc/charts/vfc-workflow-engine/values.yaml b/kubernetes/vfc/charts/vfc-workflow-engine/values.yaml
index 84daca3695..10dbea8de2 100644
--- a/kubernetes/vfc/charts/vfc-workflow-engine/values.yaml
+++ b/kubernetes/vfc/charts/vfc-workflow-engine/values.yaml
@@ -59,6 +59,7 @@ readiness:
service:
type: ClusterIP
name: vfc-workflow-engine
+ portName: vfc-workflow-engine
externalPort: 8080
internalPort: 8080
# nodePort: 30807
diff --git a/kubernetes/vfc/charts/vfc-workflow/templates/service.yaml b/kubernetes/vfc/charts/vfc-workflow/templates/service.yaml
index 73e2c2c5b9..079f3cbba1 100644
--- a/kubernetes/vfc/charts/vfc-workflow/templates/service.yaml
+++ b/kubernetes/vfc/charts/vfc-workflow/templates/service.yaml
@@ -15,7 +15,7 @@
apiVersion: v1
kind: Service
metadata:
- name: {{ include "common.fullname" . }}
+ name: {{ include "common.servicename" . }}
namespace: {{ include "common.namespace" . }}
labels:
app: {{ include "common.name" . }}
@@ -40,12 +40,12 @@ spec:
- port: {{ .Values.service.externalPort }}
targetPort: {{ .Values.service.internalPort }}
nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }}
- name: {{ .Values.service.name }}
+ name: {{ .Values.service.portName }}
{{- else -}}
- port: {{ .Values.service.externalPort }}
targetPort: {{ .Values.service.internalPort }}
- name: {{ .Values.service.name }}
+ name: {{ .Values.service.portName }}
{{- end}}
selector:
app: {{ include "common.name" . }}
- release: {{ .Release.Name }} \ No newline at end of file
+ release: {{ .Release.Name }}
diff --git a/kubernetes/vfc/charts/vfc-workflow/values.yaml b/kubernetes/vfc/charts/vfc-workflow/values.yaml
index 2c844414d0..37c36d318b 100644
--- a/kubernetes/vfc/charts/vfc-workflow/values.yaml
+++ b/kubernetes/vfc/charts/vfc-workflow/values.yaml
@@ -59,6 +59,7 @@ readiness:
service:
type: ClusterIP
name: vfc-workflow
+ portName: vfc-workflow
externalPort: 10550
internalPort: 10550
# nodePort: 30805
diff --git a/kubernetes/vfc/charts/vfc-zte-sdnc-driver/templates/service.yaml b/kubernetes/vfc/charts/vfc-zte-sdnc-driver/templates/service.yaml
index 532f648716..63f41a5bcc 100644
--- a/kubernetes/vfc/charts/vfc-zte-sdnc-driver/templates/service.yaml
+++ b/kubernetes/vfc/charts/vfc-zte-sdnc-driver/templates/service.yaml
@@ -15,7 +15,7 @@
apiVersion: v1
kind: Service
metadata:
- name: {{ include "common.fullname" . }}
+ name: {{ include "common.servicename" . }}
namespace: {{ include "common.namespace" . }}
labels:
app: {{ include "common.name" . }}
@@ -40,12 +40,12 @@ spec:
- port: {{ .Values.service.externalPort }}
targetPort: {{ .Values.service.internalPort }}
nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }}
- name: {{ .Values.service.name }}
+ name: {{ .Values.service.portName }}
{{- else -}}
- port: {{ .Values.service.externalPort }}
targetPort: {{ .Values.service.internalPort }}
- name: {{ .Values.service.name }}
+ name: {{ .Values.service.portName }}
{{- end}}
selector:
app: {{ include "common.name" . }}
- release: {{ .Release.Name }} \ No newline at end of file
+ release: {{ .Release.Name }}
diff --git a/kubernetes/vfc/charts/vfc-zte-sdnc-driver/values.yaml b/kubernetes/vfc/charts/vfc-zte-sdnc-driver/values.yaml
index 19e480b8d9..b1f006a29d 100644
--- a/kubernetes/vfc/charts/vfc-zte-sdnc-driver/values.yaml
+++ b/kubernetes/vfc/charts/vfc-zte-sdnc-driver/values.yaml
@@ -59,6 +59,7 @@ readiness:
service:
type: ClusterIP
name: vfc-zte-sdnc-driver
+ portName: vfc-zte-sdnc-drive
externalPort: 8411
internalPort: 8411
# nodePort: 30411
diff --git a/kubernetes/vfc/charts/vfc-zte-vnfm-driver/templates/service.yaml b/kubernetes/vfc/charts/vfc-zte-vnfm-driver/templates/service.yaml
index 7ee544520d..2a48721949 100644
--- a/kubernetes/vfc/charts/vfc-zte-vnfm-driver/templates/service.yaml
+++ b/kubernetes/vfc/charts/vfc-zte-vnfm-driver/templates/service.yaml
@@ -15,7 +15,7 @@
apiVersion: v1
kind: Service
metadata:
- name: {{ include "common.fullname" . }}
+ name: {{ include "common.servicename" . }}
namespace: {{ include "common.namespace" . }}
labels:
app: {{ include "common.name" . }}
@@ -40,12 +40,12 @@ spec:
- port: {{ .Values.service.externalPort }}
targetPort: {{ .Values.service.internalPort }}
nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }}
- name: {{ .Values.service.name }}
+ name: {{ .Values.service.portName }}
{{- else -}}
- port: {{ .Values.service.externalPort }}
targetPort: {{ .Values.service.internalPort }}
- name: {{ .Values.service.name }}
+ name: {{ .Values.service.portName }}
{{- end}}
selector:
app: {{ include "common.name" . }}
- release: {{ .Release.Name }} \ No newline at end of file
+ release: {{ .Release.Name }}
diff --git a/kubernetes/vfc/charts/vfc-zte-vnfm-driver/values.yaml b/kubernetes/vfc/charts/vfc-zte-vnfm-driver/values.yaml
index d94e5da22f..e6f8ecca3b 100644
--- a/kubernetes/vfc/charts/vfc-zte-vnfm-driver/values.yaml
+++ b/kubernetes/vfc/charts/vfc-zte-vnfm-driver/values.yaml
@@ -59,6 +59,7 @@ readiness:
service:
type: ClusterIP
name: vfc-zte-vnfm-driver
+ portName: vfc-zte-vnfm-driver
externalPort: 8410
internalPort: 8410