Code Review
/
oom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Bump up version to 1.3.0-SNAPSHOT"
[oom.git]
/
kubernetes
/
common
/
mysql
/
templates
/
service.yaml
diff --git
a/kubernetes/common/mysql/templates/service.yaml
b/kubernetes/common/mysql/templates/service.yaml
index
032920c
..
e1771c6
100644
(file)
--- a/
kubernetes/common/mysql/templates/service.yaml
+++ b/
kubernetes/common/mysql/templates/service.yaml
@@
-17,7
+17,7
@@
apiVersion: v1
kind: Service
metadata:
apiVersion: v1
kind: Service
metadata:
- name: {{
.Values.service.name
}}
+ name: {{
include "common.servicename" .
}}
namespace: {{ include "common.namespace" . }}
labels:
app: {{ include "common.name" . }}
namespace: {{ include "common.namespace" . }}
labels:
app: {{ include "common.name" . }}
@@
-27,7
+27,7
@@
metadata:
spec:
ports:
- port: {{ .Values.service.internalPort }}
spec:
ports:
- port: {{ .Values.service.internalPort }}
- name: {{ .Values.service.
n
ame }}
+ name: {{ .Values.service.
portN
ame }}
selector:
app: {{ include "common.name" . }}
release: {{ .Release.Name }}
selector:
app: {{ include "common.name" . }}
release: {{ .Release.Name }}
@@
-37,10
+37,13
@@
spec:
kind: Service
apiVersion: v1
metadata:
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
namespace: {{ include "common.namespace" . }}
labels:
app: {{ .Values.nfsprovisionerPrefix }}-nfs-provisioner
+ chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+ release: {{ .Release.Name }}
+ heritage: {{ .Release.Service }}
spec:
ports:
- name: nfs
spec:
ports:
- name: nfs
@@
-61,14
+64,17
@@
spec:
apiVersion: v1
kind: Service
metadata:
apiVersion: v1
kind: Service
metadata:
- name: {{
.Values.service.name
}}-read
+ name: {{
include "common.servicename" .
}}-read
namespace: {{ include "common.namespace" . }}
labels:
app: {{ include "common.name" . }}
namespace: {{ include "common.namespace" . }}
labels:
app: {{ include "common.name" . }}
+ chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+ release: {{ .Release.Name }}
+ heritage: {{ .Release.Service }}
spec:
ports:
- port: {{ .Values.service.internalPort }}
spec:
ports:
- port: {{ .Values.service.internalPort }}
- name: {{ .Values.service.
n
ame }}
+ name: {{ .Values.service.
portN
ame }}
selector:
app: {{ include "common.name" . }}
release: {{ .Release.Name }}
selector:
app: {{ include "common.name" . }}
release: {{ .Release.Name }}
@@
-80,10
+86,13
@@
metadata:
namespace: {{ include "common.namespace" . }}
labels:
app: {{ include "common.name" . }}
namespace: {{ include "common.namespace" . }}
labels:
app: {{ include "common.name" . }}
+ chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+ release: {{ .Release.Name }}
+ heritage: {{ .Release.Service }}
spec:
ports:
- port: {{ .Values.service.internalPort }}
spec:
ports:
- port: {{ .Values.service.internalPort }}
- name: {{ .Values.service.
n
ame }}
+ name: {{ .Values.service.
portN
ame }}
selector:
app: {{ include "common.name" . }}
release: {{ .Release.Name }}
selector:
app: {{ include "common.name" . }}
release: {{ .Release.Name }}
@@
-96,10
+105,13
@@
metadata:
namespace: {{ include "common.namespace" . }}
labels:
app: {{ include "common.name" . }}
namespace: {{ include "common.namespace" . }}
labels:
app: {{ include "common.name" . }}
+ chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+ release: {{ .Release.Name }}
+ heritage: {{ .Release.Service }}
spec:
ports:
- port: {{ .Values.service.internalPort }}
spec:
ports:
- port: {{ .Values.service.internalPort }}
- name: {{ .Values.service.
n
ame }}
+ name: {{ .Values.service.
portN
ame }}
selector:
app: {{ include "common.name" . }}
release: {{ .Release.Name }}
selector:
app: {{ include "common.name" . }}
release: {{ .Release.Name }}
@@
-109,21
+121,25
@@
spec:
apiVersion: v1
kind: Service
metadata:
apiVersion: v1
kind: Service
metadata:
- name: {{
.Values.service.name
}}-nodeport
+ name: {{
include "common.servicename" .
}}-nodeport
namespace: {{ include "common.namespace" . }}
labels:
namespace: {{ include "common.namespace" . }}
labels:
+ app: {{ include "common.name" . }}
+ chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
statefulset.kubernetes.io/pod-name: {{ include "common.fullname" . }}-0
statefulset.kubernetes.io/pod-name: {{ include "common.fullname" . }}-0
+ release: {{ .Release.Name }}
+ heritage: {{ .Release.Service }}
spec:
ports:
spec:
ports:
- - name: {{ .Values.service.
internalPort }}
+ - name: {{ .Values.service.
portName | default .Values.service.name }}-1
port: {{ .Values.service.internalPort }}
targetPort: {{ .Values.service.internalPort }}
port: {{ .Values.service.internalPort }}
targetPort: {{ .Values.service.internalPort }}
- nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.
externalP
ort1 }}
- - name: {{ .Values.
xtrabackup.internalPort }}
+ nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.
nodep
ort1 }}
+ - name: {{ .Values.
service.portName | default .Values.service.name }}-2
port: {{ .Values.xtrabackup.internalPort }}
targetPort: {{ .Values.xtrabackup.internalPort }}
port: {{ .Values.xtrabackup.internalPort }}
targetPort: {{ .Values.xtrabackup.internalPort }}
- nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.
externalP
ort2 }}
- type:
NodePort
+ nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.
nodep
ort2 }}
+ type:
{{ .Values.service.type }}
selector:
statefulset.kubernetes.io/pod-name: {{ include "common.fullname" . }}-0
release: {{ .Release.Name }}
selector:
statefulset.kubernetes.io/pod-name: {{ include "common.fullname" . }}-0
release: {{ .Release.Name }}