Merge pull request kubernetes-sigs#715 from MnrGreg/fix-changing-of-h…

…ostnames /etc/hosts update fixes cloudinit vmware reconcile
jayunit100 · Jan 10, 2020 · fdefa92 · fdefa92
2 parents c1870c0 + e3c0264
commit fdefa92
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 6 deletions.
diff --git a/docs/getting_started.md b/docs/getting_started.md
@@ -241,7 +241,8 @@ spec:
   preKubeadmCommands:
   - hostname "{{ ds.meta_data.hostname }}"
   - echo "::1         ipv6-localhost ipv6-loopback" >/etc/hosts
-  - echo "127.0.0.1   localhost {{ ds.meta_data.hostname }}" >>/etc/hosts
+  - echo "127.0.0.1   localhost" >>/etc/hosts
+  - echo "127.0.0.1   {{ ds.meta_data.hostname }}" >>/etc/hosts
   - echo "{{ ds.meta_data.hostname }}" >/etc/hostname
   users:
   - name: capv
@@ -312,7 +313,8 @@ spec:
       preKubeadmCommands:
       - hostname "{{ ds.meta_data.hostname }}"
       - echo "::1         ipv6-localhost ipv6-loopback" >/etc/hosts
-      - echo "127.0.0.1   localhost {{ ds.meta_data.hostname }}" >>/etc/hosts
+      - echo "127.0.0.1   localhost" >>/etc/hosts
+      - echo "127.0.0.1   {{ ds.meta_data.hostname }}" >>/etc/hosts
       - echo "{{ ds.meta_data.hostname }}" >/etc/hostname
       users:
       - name: capv

diff --git a/examples/default/controlplane/controlplane.yaml b/examples/default/controlplane/controlplane.yaml
@@ -65,5 +65,6 @@ spec:
   preKubeadmCommands:
   - hostname "{{ ds.meta_data.hostname }}"
   - echo "::1         ipv6-localhost ipv6-loopback" >/etc/hosts
-  - echo "127.0.0.1   localhost {{ ds.meta_data.hostname }}" >>/etc/hosts
+  - echo "127.0.0.1   localhost" >>/etc/hosts
+  - echo "127.0.0.1   {{ ds.meta_data.hostname }}" >>/etc/hosts
   - echo "{{ ds.meta_data.hostname }}" >/etc/hostname
diff --git a/examples/default/machinedeployment/machinedeployment.yaml b/examples/default/machinedeployment/machinedeployment.yaml
@@ -64,5 +64,6 @@ spec:
       preKubeadmCommands:
       - hostname "{{ ds.meta_data.hostname }}"
       - echo "::1         ipv6-localhost ipv6-loopback" >/etc/hosts
-      - echo "127.0.0.1   localhost {{ ds.meta_data.hostname }}" >>/etc/hosts
+      - echo "127.0.0.1   localhost" >>/etc/hosts
+      - echo "127.0.0.1   {{ ds.meta_data.hostname }}" >>/etc/hosts
       - echo "{{ ds.meta_data.hostname }}" >/etc/hostname
diff --git a/examples/pre-67u3/controlplane/controlplane.yaml b/examples/pre-67u3/controlplane/controlplane.yaml
@@ -86,5 +86,6 @@ spec:
   preKubeadmCommands:
   - hostname "{{ ds.meta_data.hostname }}"
   - echo "::1         ipv6-localhost ipv6-loopback" >/etc/hosts
-  - echo "127.0.0.1   localhost {{ ds.meta_data.hostname }}" >>/etc/hosts
+  - echo "127.0.0.1   localhost" >>/etc/hosts
+  - echo "127.0.0.1   {{ ds.meta_data.hostname }}" >>/etc/hosts
   - echo "{{ ds.meta_data.hostname }}" >/etc/hostname
diff --git a/examples/pre-67u3/machinedeployment/machinedeployment.yaml b/examples/pre-67u3/machinedeployment/machinedeployment.yaml
@@ -64,5 +64,6 @@ spec:
       preKubeadmCommands:
       - hostname "{{ ds.meta_data.hostname }}"
       - echo "::1         ipv6-localhost ipv6-loopback" >/etc/hosts
-      - echo "127.0.0.1   localhost {{ ds.meta_data.hostname }}" >>/etc/hosts
+      - echo "127.0.0.1   localhost" >>/etc/hosts
+      - echo "127.0.0.1   {{ ds.meta_data.hostname }}" >>/etc/hosts
       - echo "{{ ds.meta_data.hostname }}" >/etc/hostname