summaryrefslogtreecommitdiffstats
path: root/kubernetes/common
diff options
context:
space:
mode:
authorMike Elliott <mike.elliott@amdocs.com>2018-04-24 20:15:37 +0000
committerGerrit Code Review <gerrit@onap.org>2018-04-24 20:15:37 +0000
commit9b8b40b53451c9f4e77e7e46a4356a229806bca9 (patch)
tree4c876464033ba2b795db51d59765c110e98a80eb /kubernetes/common
parent50be317746ff1c96231e9a95157868322c1f3676 (diff)
parent1ffbd99a2757af8e10d0f6af46177c646364f91b (diff)
Merge "Make all services independent of helm Release.Name"
Diffstat (limited to 'kubernetes/common')
-rw-r--r--kubernetes/common/dgbuilder/templates/service.yaml8
-rw-r--r--kubernetes/common/dgbuilder/values.yaml1
-rw-r--r--kubernetes/common/mariadb-galera/templates/service.yaml6
-rw-r--r--kubernetes/common/mariadb-galera/values.yaml3
-rw-r--r--kubernetes/common/mysql/templates/nfs-provisoner.yaml4
-rw-r--r--kubernetes/common/mysql/templates/service.yaml16
-rw-r--r--kubernetes/common/mysql/values.yaml1
7 files changed, 21 insertions, 18 deletions
diff --git a/kubernetes/common/dgbuilder/templates/service.yaml b/kubernetes/common/dgbuilder/templates/service.yaml
index c61cdd549b..ffcc7112b7 100644
--- a/kubernetes/common/dgbuilder/templates/service.yaml
+++ b/kubernetes/common/dgbuilder/templates/service.yaml
@@ -1,7 +1,7 @@
apiVersion: v1
kind: Service
metadata:
- name: {{ include "common.fullname" . }}
+ name: {{ include "common.servicename" . }}
namespace: {{ include "common.namespace" . }}
labels:
app: {{ include "common.name" . }}
@@ -15,12 +15,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/common/dgbuilder/values.yaml b/kubernetes/common/dgbuilder/values.yaml
index 8b4a07a350..76cbf45050 100644
--- a/kubernetes/common/dgbuilder/values.yaml
+++ b/kubernetes/common/dgbuilder/values.yaml
@@ -69,6 +69,7 @@ readiness:
service:
type: NodePort
name: dgbuilder
+ portName: dgbuilder
externalPort: 3000
internalPort: 3100
nodePort: 28
diff --git a/kubernetes/common/mariadb-galera/templates/service.yaml b/kubernetes/common/mariadb-galera/templates/service.yaml
index f5f93ed9b6..d17d350b74 100644
--- a/kubernetes/common/mariadb-galera/templates/service.yaml
+++ b/kubernetes/common/mariadb-galera/templates/service.yaml
@@ -3,7 +3,7 @@ kind: Service
metadata:
annotations:
service.alpha.kubernetes.io/tolerate-unready-endpoints: "true"
- name: {{ include "common.fullname" . }}
+ name: {{ include "common.servicename" . }}
namespace: {{ include "common.namespace" . }}
labels:
app: {{ include "common.fullname" . }}
@@ -12,8 +12,8 @@ metadata:
heritage: "{{ .Release.Service }}"
spec:
ports:
- - name: {{ .Values.service.name }}
+ - name: {{ .Values.service.portName }}
port: {{ .Values.service.internalPort }}
clusterIP: None
selector:
- app: {{ include "common.fullname" . }} \ No newline at end of file
+ app: {{ include "common.fullname" . }}
diff --git a/kubernetes/common/mariadb-galera/values.yaml b/kubernetes/common/mariadb-galera/values.yaml
index f65a8a57e6..bf51443ff9 100644
--- a/kubernetes/common/mariadb-galera/values.yaml
+++ b/kubernetes/common/mariadb-galera/values.yaml
@@ -70,6 +70,7 @@ persistence:
service:
internalPort: 3306
name: mariadb-galera
+ portName: mariadb-galera
sstPort: 4444
sstName: sst
replicationPort: 4567
@@ -112,4 +113,4 @@ resources:
nameOverride: mariadb-galera
# DNS name for mariadb-galera cluster - should be unique accross all projects other clusters
-#dnsnameOverride: mariadb-galera \ No newline at end of file
+#dnsnameOverride: mariadb-galera
diff --git a/kubernetes/common/mysql/templates/nfs-provisoner.yaml b/kubernetes/common/mysql/templates/nfs-provisoner.yaml
index 35894df7a7..d6c6e8ccbd 100644
--- a/kubernetes/common/mysql/templates/nfs-provisoner.yaml
+++ b/kubernetes/common/mysql/templates/nfs-provisoner.yaml
@@ -18,7 +18,7 @@
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
- name: {{ .Release.Name }}-{{ .Values.nfsprovisionerPrefix }}-nfs-provisioner
+ name: {{ .Values.nfsprovisionerPrefix }}-nfs-provisioner
namespace: {{ include "common.namespace" . }}
labels:
app: {{ include "common.name" . }}
@@ -62,7 +62,7 @@ spec:
fieldRef:
fieldPath: status.podIP
- name: SERVICE_NAME
- value: {{ .Release.Name }}-{{ .Values.nfsprovisionerPrefix }}-nfs-provisioner
+ value: {{ .Values.nfsprovisionerPrefix }}-nfs-provisioner
- name: POD_NAMESPACE
valueFrom:
fieldRef:
diff --git a/kubernetes/common/mysql/templates/service.yaml b/kubernetes/common/mysql/templates/service.yaml
index 032920c760..ed4f72adc5 100644
--- a/kubernetes/common/mysql/templates/service.yaml
+++ b/kubernetes/common/mysql/templates/service.yaml
@@ -17,7 +17,7 @@
apiVersion: v1
kind: Service
metadata:
- name: {{ .Values.service.name }}
+ name: {{ include "common.servicename" . }}
namespace: {{ include "common.namespace" . }}
labels:
app: {{ include "common.name" . }}
@@ -27,7 +27,7 @@ metadata:
spec:
ports:
- port: {{ .Values.service.internalPort }}
- name: {{ .Values.service.name }}
+ name: {{ .Values.service.portName }}
selector:
app: {{ include "common.name" . }}
release: {{ .Release.Name }}
@@ -37,7 +37,7 @@ spec:
kind: Service
apiVersion: v1
metadata:
- name: {{ .Release.Name }}-{{ .Values.nfsprovisionerPrefix }}-nfs-provisioner
+ name: {{ .Values.nfsprovisionerPrefix }}-nfs-provisioner
namespace: {{ include "common.namespace" . }}
labels:
app: {{ .Values.nfsprovisionerPrefix }}-nfs-provisioner
@@ -61,14 +61,14 @@ spec:
apiVersion: v1
kind: Service
metadata:
- name: {{ .Values.service.name }}-read
+ name: {{ include "common.servicename" . }}-read
namespace: {{ include "common.namespace" . }}
labels:
app: {{ include "common.name" . }}
spec:
ports:
- port: {{ .Values.service.internalPort }}
- name: {{ .Values.service.name }}
+ name: {{ .Values.service.portName }}
selector:
app: {{ include "common.name" . }}
release: {{ .Release.Name }}
@@ -83,7 +83,7 @@ metadata:
spec:
ports:
- port: {{ .Values.service.internalPort }}
- name: {{ .Values.service.name }}
+ name: {{ .Values.service.portName }}
selector:
app: {{ include "common.name" . }}
release: {{ .Release.Name }}
@@ -99,7 +99,7 @@ metadata:
spec:
ports:
- port: {{ .Values.service.internalPort }}
- name: {{ .Values.service.name }}
+ name: {{ .Values.service.portName }}
selector:
app: {{ include "common.name" . }}
release: {{ .Release.Name }}
@@ -109,7 +109,7 @@ spec:
apiVersion: v1
kind: Service
metadata:
- name: {{ .Values.service.name }}-nodeport
+ name: {{ include "common.servicename" . }}-nodeport
namespace: {{ include "common.namespace" . }}
labels:
statefulset.kubernetes.io/pod-name: {{ include "common.fullname" . }}-0
diff --git a/kubernetes/common/mysql/values.yaml b/kubernetes/common/mysql/values.yaml
index 40310a89d7..028a440c01 100644
--- a/kubernetes/common/mysql/values.yaml
+++ b/kubernetes/common/mysql/values.yaml
@@ -80,6 +80,7 @@ persistence:
service:
name: mysql
+ portName: mysql
internalPort: 3306
# nfs provisioner ports
nfsPort: 2049