From ce49a93d5d82b4b59863ee1ce05698c14fd0efe1 Mon Sep 17 00:00:00 2001 From: Vincent Palmer Date: Mon, 4 Dec 2017 09:04:31 +0100 Subject: [PATCH] Fix issue with etcd-member failing to resolve peers * When restarting masters, `etcd-member.service` may fail to lookup peers if /etc/resolv.conf hasn't been populated yet. Require the wait-for-dns.service. --- aws/container-linux/kubernetes/cl/controller.yaml.tmpl | 1 + bare-metal/container-linux/kubernetes/cl/controller.yaml.tmpl | 1 + digital-ocean/container-linux/kubernetes/cl/controller.yaml.tmpl | 1 + .../kubernetes/controllers/cl/controller.yaml.tmpl | 1 + 4 files changed, 4 insertions(+) diff --git a/aws/container-linux/kubernetes/cl/controller.yaml.tmpl b/aws/container-linux/kubernetes/cl/controller.yaml.tmpl index 90bba337..090c7fed 100644 --- a/aws/container-linux/kubernetes/cl/controller.yaml.tmpl +++ b/aws/container-linux/kubernetes/cl/controller.yaml.tmpl @@ -41,6 +41,7 @@ systemd: ExecStart=/bin/sh -c 'while ! /usr/bin/grep '^[^#[:space:]]' /etc/resolv.conf > /dev/null; do sleep 1; done' [Install] RequiredBy=kubelet.service + RequiredBy=etcd-member.service - name: kubelet.service enable: true contents: | diff --git a/bare-metal/container-linux/kubernetes/cl/controller.yaml.tmpl b/bare-metal/container-linux/kubernetes/cl/controller.yaml.tmpl index 579fbc00..da6b464a 100644 --- a/bare-metal/container-linux/kubernetes/cl/controller.yaml.tmpl +++ b/bare-metal/container-linux/kubernetes/cl/controller.yaml.tmpl @@ -50,6 +50,7 @@ systemd: ExecStart=/bin/sh -c 'while ! /usr/bin/grep '^[^#[:space:]]' /etc/resolv.conf > /dev/null; do sleep 1; done' [Install] RequiredBy=kubelet.service + RequiredBy=etcd-member.service - name: kubelet.service contents: | [Unit] diff --git a/digital-ocean/container-linux/kubernetes/cl/controller.yaml.tmpl b/digital-ocean/container-linux/kubernetes/cl/controller.yaml.tmpl index 20d8e565..1cbfad2a 100644 --- a/digital-ocean/container-linux/kubernetes/cl/controller.yaml.tmpl +++ b/digital-ocean/container-linux/kubernetes/cl/controller.yaml.tmpl @@ -50,6 +50,7 @@ systemd: ExecStart=/bin/sh -c 'while ! /usr/bin/grep '^[^#[:space:]]' /etc/resolv.conf > /dev/null; do sleep 1; done' [Install] RequiredBy=kubelet.service + RequiredBy=etcd-member.service - name: kubelet.service contents: | [Unit] diff --git a/google-cloud/container-linux/kubernetes/controllers/cl/controller.yaml.tmpl b/google-cloud/container-linux/kubernetes/controllers/cl/controller.yaml.tmpl index 611adc09..b4be0d50 100644 --- a/google-cloud/container-linux/kubernetes/controllers/cl/controller.yaml.tmpl +++ b/google-cloud/container-linux/kubernetes/controllers/cl/controller.yaml.tmpl @@ -41,6 +41,7 @@ systemd: ExecStart=/bin/sh -c 'while ! /usr/bin/grep '^[^#[:space:]]' /etc/resolv.conf > /dev/null; do sleep 1; done' [Install] RequiredBy=kubelet.service + RequiredBy=etcd-member.service - name: kubelet.service enable: true contents: |