summaryrefslogtreecommitdiffstats
path: root/kubernetes/vid
diff options
context:
space:
mode:
Diffstat (limited to 'kubernetes/vid')
-rw-r--r--kubernetes/vid/charts/mariadb/templates/service.yaml4
-rw-r--r--kubernetes/vid/charts/mariadb/values.yaml3
-rw-r--r--kubernetes/vid/templates/deployment.yaml4
-rw-r--r--kubernetes/vid/templates/service.yaml6
-rw-r--r--kubernetes/vid/values.yaml3
5 files changed, 11 insertions, 9 deletions
diff --git a/kubernetes/vid/charts/mariadb/templates/service.yaml b/kubernetes/vid/charts/mariadb/templates/service.yaml
index 88ed09bb45..35333c441e 100644
--- a/kubernetes/vid/charts/mariadb/templates/service.yaml
+++ b/kubernetes/vid/charts/mariadb/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" . }}
@@ -25,7 +25,7 @@ metadata:
spec:
ports:
- port: {{ .Values.service.internalPort }}
- name: {{ .Values.service.name }}
+ name: {{ .Values.service.portName }}
selector:
app: {{ include "common.name" . }}
release: {{ .Release.Name }}
diff --git a/kubernetes/vid/charts/mariadb/values.yaml b/kubernetes/vid/charts/mariadb/values.yaml
index 567109c6d4..db33b58842 100644
--- a/kubernetes/vid/charts/mariadb/values.yaml
+++ b/kubernetes/vid/charts/mariadb/values.yaml
@@ -76,7 +76,8 @@ persistence:
mountSubPath: vid/mariadb/data
service:
- name: mariadb
+ name: vid-mariadb
+ portName: vid-mariadb
internalPort: 3306
ingress:
diff --git a/kubernetes/vid/templates/deployment.yaml b/kubernetes/vid/templates/deployment.yaml
index 847e636fa8..929c260815 100644
--- a/kubernetes/vid/templates/deployment.yaml
+++ b/kubernetes/vid/templates/deployment.yaml
@@ -97,9 +97,9 @@ spec:
- name: VID_CONTACT_US_LINK
value: "{{ .Values.config.vidcontactuslink }}"
- name: VID_UEB_URL_LIST
- value: dmaap.{{ include "common.namespace" . }}
+ value: message-router.{{ include "common.namespace" . }}
- name: VID_MYSQL_HOST
- value: "{{ .Release.Name }}-{{ .Values.config.vidmysqlhost }}"
+ value: "{{ .Values.config.vidmysqlhost }}"
- name: VID_MYSQL_PORT
value: "{{ .Values.config.vidmysqlport }}"
- name: VID_MYSQL_DBNAME
diff --git a/kubernetes/vid/templates/service.yaml b/kubernetes/vid/templates/service.yaml
index 3969d2184b..3d1097f7ff 100644
--- a/kubernetes/vid/templates/service.yaml
+++ b/kubernetes/vid/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" . }}
@@ -28,11 +28,11 @@ spec:
{{if eq .Values.service.type "NodePort" -}}
- port: {{ .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" . }}
diff --git a/kubernetes/vid/values.yaml b/kubernetes/vid/values.yaml
index ac68f2e9ad..20882c5786 100644
--- a/kubernetes/vid/values.yaml
+++ b/kubernetes/vid/values.yaml
@@ -28,7 +28,7 @@ subChartsOnly:
# application image
repository: nexus3.onap.org:10001
-image: openecomp/vid:v1.1.1
+image: onap/vid:1.2.1
pullPolicy: Always
# flag to enable debugging - application support required
@@ -80,6 +80,7 @@ readiness:
service:
type: NodePort
name: vid
+ portName: vid
externalPort: "00"
nodePort: "00"
internalPort: 8080