Code Review
/
oom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
[COMMON][ETCD] Skip startup self-discovery for etcd nodes
[oom.git]
/
kubernetes
/
common
/
etcd
/
templates
/
statefulset.yaml
diff --git
a/kubernetes/common/etcd/templates/statefulset.yaml
b/kubernetes/common/etcd/templates/statefulset.yaml
index
7190c5b
..
b09e7c6
100644
(file)
--- a/
kubernetes/common/etcd/templates/statefulset.yaml
+++ b/
kubernetes/common/etcd/templates/statefulset.yaml
@@
-17,7
+17,7
@@
metadata:
name: {{ include "common.fullname" . }}
labels:
heritage: "{{ .Release.Service }}"
name: {{ include "common.fullname" . }}
labels:
heritage: "{{ .Release.Service }}"
- release: "{{
.Release.Name
}}"
+ release: "{{
include "common.release" .
}}"
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
app: {{ include "common.name" . }}
spec:
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
app: {{ include "common.name" . }}
spec:
@@
-27,7
+27,7
@@
spec:
metadata:
labels:
heritage: "{{ .Release.Service }}"
metadata:
labels:
heritage: "{{ .Release.Service }}"
- release: "{{
.Release.Name
}}"
+ release: "{{
include "common.release" .
}}"
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
app: {{ include "common.name" . }}
spec:
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
app: {{ include "common.name" . }}
spec:
@@
-128,6
+128,10
@@
spec:
# we should wait for other pods to be up before trying to join
# otherwise we got "no such host" errors when trying to resolve other members
for i in $(seq 0 $((${INITIAL_CLUSTER_SIZE} - 1))); do
# we should wait for other pods to be up before trying to join
# otherwise we got "no such host" errors when trying to resolve other members
for i in $(seq 0 $((${INITIAL_CLUSTER_SIZE} - 1))); do
+ if [ "${SET_NAME}-${i}" == "${HOSTNAME}" ]; then
+ echo "Skipping self-checking"
+ continue
+ fi
while true; do
echo "Waiting for ${SET_NAME}-${i}.${SERVICE_NAME} to come up"
ping -W 1 -c 1 ${SET_NAME}-${i}.${SERVICE_NAME} > /dev/null && break
while true; do
echo "Waiting for ${SET_NAME}-${i}.${SERVICE_NAME} to come up"
ping -W 1 -c 1 ${SET_NAME}-${i}.${SERVICE_NAME} > /dev/null && break
@@
-213,14
+217,19
@@
spec:
volumeClaimTemplates:
- metadata:
name: {{ include "common.fullname" . }}-data
volumeClaimTemplates:
- metadata:
name: {{ include "common.fullname" . }}-data
+ labels:
+ name: {{ include "common.fullname" . }}
+ chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+ release: "{{ include "common.release" . }}"
+ heritage: "{{ .Release.Service }}"
spec:
accessModes:
spec:
accessModes:
- - "{{ .Values.persistence.accessMode }}"
+ - "{{ .Values.persistence.accessMode }}"
+ storageClassName: {{ include "common.storageClass" . }}
resources:
requests:
# upstream recommended max is 700M
storage: "{{ .Values.persistence.storage }}"
resources:
requests:
# upstream recommended max is 700M
storage: "{{ .Values.persistence.storage }}"
- storageClassName: {{ include "common.fullname" . }}-data
{{- else }}
volumes:
- name: {{ include "common.fullname" . }}-data
{{- else }}
volumes:
- name: {{ include "common.fullname" . }}-data
@@
-231,4
+240,3
@@
spec:
emptyDir: {}
{{- end }}
{{- end }}
emptyDir: {}
{{- end }}
{{- end }}
-