Merge pull request #409 from kinvolk/invidian/bootkube-rkt-host-etc-h…

…osts bootkube: use host's /etc/hosts entries
kinvolk · Aug 18, 2020 · 524a81d · 524a81d
2 parents 8316275 + 7c46641
commit 524a81d
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 12 deletions.
diff --git a/assets/lokomotive-kubernetes/aws/flatcar-linux/kubernetes/cl/controller.yaml.tmpl b/assets/lokomotive-kubernetes/aws/flatcar-linux/kubernetes/cl/controller.yaml.tmpl
@@ -160,6 +160,7 @@ storage:
             --insecure-options=image \
             --net=host \
             --dns=host \
+            --hosts-entry=host \
             --exec=/bootkube -- start --asset-dir=/assets "$@"
     - path: /etc/tmpfiles.d/etcd-wrapper.conf
       filesystem: root

diff --git a/assets/lokomotive-kubernetes/azure/flatcar-linux/kubernetes/cl/controller.yaml.tmpl b/assets/lokomotive-kubernetes/azure/flatcar-linux/kubernetes/cl/controller.yaml.tmpl
@@ -160,6 +160,7 @@ storage:
             --insecure-options=image \
             --net=host \
             --dns=host \
+            --hosts-entry=host \
             --exec=/bootkube -- start --asset-dir=/assets "$@"
 passwd:
   users:

diff --git a/assets/lokomotive-kubernetes/bare-metal/flatcar-linux/kubernetes/cl/controller.yaml.tmpl b/assets/lokomotive-kubernetes/bare-metal/flatcar-linux/kubernetes/cl/controller.yaml.tmpl
@@ -175,6 +175,7 @@ storage:
             --insecure-options=image \
             --net=host \
             --dns=host \
+            --hosts-entry=host \
             --exec=/bootkube -- start --asset-dir=/assets "$@"
     - path: /etc/kubernetes/configure-kubelet-cgroup-driver
       filesystem: root

diff --git a/assets/lokomotive-kubernetes/google-cloud/flatcar-linux/kubernetes/cl/controller.yaml.tmpl b/assets/lokomotive-kubernetes/google-cloud/flatcar-linux/kubernetes/cl/controller.yaml.tmpl
@@ -161,6 +161,7 @@ storage:
             --insecure-options=image \
             --net=host \
             --dns=host \
+            --hosts-entry=host \
             --exec=/bootkube -- start --asset-dir=/assets "$@"
 passwd:
   users:

diff --git a/assets/lokomotive-kubernetes/kvm-libvirt/flatcar-linux/kubernetes/cl/controller.yaml.tmpl b/assets/lokomotive-kubernetes/kvm-libvirt/flatcar-linux/kubernetes/cl/controller.yaml.tmpl
@@ -171,6 +171,7 @@ storage:
             --insecure-options=image \
             --net=host \
             --dns=host \
+            --hosts-entry=host \
             --exec=/bootkube -- start --asset-dir=/assets "$@"
     - path: /etc/kubernetes/configure-kubelet-cgroup-driver
       filesystem: root

diff --git a/assets/lokomotive-kubernetes/packet/flatcar-linux/kubernetes/cl/controller.yaml.tmpl b/assets/lokomotive-kubernetes/packet/flatcar-linux/kubernetes/cl/controller.yaml.tmpl
@@ -210,6 +210,7 @@ storage:
             --insecure-options=image \
             --net=host \
             --dns=host \
+            --hosts-entry=host \
             --exec=/bootkube -- start --asset-dir=/assets "$@"
     - path: /etc/tmpfiles.d/etcd-wrapper.conf
       filesystem: root

diff --git a/pkg/assets/generated_assets.go b/pkg/assets/generated_assets.go