Merge "[COMMON][ES] Simplify cert retrieval script"

[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 f5592bd..48c8b6d 100644 (file)
--- a/kubernetes/common/etcd/templates/statefulset.yaml
+++ b/kubernetes/common/etcd/templates/statefulset.yaml
@@ -49,7 +49,7 @@ spec:
 {{ toYaml .Values.tolerations | indent 8 }}
 {{- end }}
       containers:
-      - name: {{ include "common.fullname" .  }}
+      - name: {{ include "common.name" .  }}
         image: {{ include "repositoryGenerator.googleK8sRepository" . }}/{{ .Values.image }}
         imagePullPolicy: "{{ .Values.pullPolicy }}"
         ports:
@@ -133,6 +133,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
+                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
@@ -180,7 +184,7 @@ spec:
                 fi
 
                 cat /var/run/etcd/new_member_envs
-                source /var/run/etcd/new_member_envs
+                . /var/run/etcd/new_member_envs
 
                 collect_member &