🏃 Use local_hostname in cloud-init config

Signed-off-by: Vince Prignano <vincepri@vmware.com>
kubernetes-sigs · Dec 9, 2019 · 493b276 · 493b276
1 parent 9b0ce59
commit 493b276
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/examples/controlplane/controlplane.yaml b/examples/controlplane/controlplane.yaml
@@ -34,7 +34,7 @@ metadata:
 spec:
   initConfiguration:
     nodeRegistration:
-      name: "{{ ds.meta_data.hostname }}"
+      name: "{{ ds.meta_data.local_hostname }}"
       kubeletExtraArgs:
         cloud-provider: aws
   clusterConfiguration:
@@ -81,7 +81,7 @@ spec:
   joinConfiguration:
     controlPlane: {}
     nodeRegistration:
-      name: '{{ ds.meta_data.hostname }}'
+      name: '{{ ds.meta_data.local_hostname }}'
       kubeletExtraArgs:
         cloud-provider: aws
 ---
@@ -121,6 +121,6 @@ spec:
   joinConfiguration:
     controlPlane: {}
     nodeRegistration:
-      name: '{{ ds.meta_data.hostname }}'
+      name: '{{ ds.meta_data.local_hostname }}'
       kubeletExtraArgs:
         cloud-provider: aws
diff --git a/examples/machinedeployment/machinedeployment.yaml b/examples/machinedeployment/machinedeployment.yaml
@@ -47,6 +47,6 @@ spec:
     spec:
       joinConfiguration:
         nodeRegistration:
-          name: '{{ ds.meta_data.hostname }}'
+          name: '{{ ds.meta_data.local_hostname }}'
           kubeletExtraArgs:
             cloud-provider: aws
diff --git a/go.sum b/go.sum
@@ -13,6 +13,7 @@ github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbt
 github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
+github.com/MakeNowJust/heredoc v1.0.0 h1:cXCdzVdstXyiTqTvfqk9SDHpKNjxuom+DOlyEeQ4pzQ=
 github.com/MakeNowJust/heredoc v1.0.0/go.mod h1:mG5amYoWBHf8vpLOuehzbGGw0EHxpZZ6lCpQ4fNJ8LE=
 github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ=
 github.com/PuerkitoBio/purell v1.0.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=

diff --git a/test/e2e/aws_test.go b/test/e2e/aws_test.go
@@ -327,7 +327,7 @@ func makeJoinBootstrapConfigTemplate(namespace, name string) {
 				Spec: bootstrapv1.KubeadmConfigSpec{
 					JoinConfiguration: &kubeadmv1beta1.JoinConfiguration{
 						NodeRegistration: kubeadmv1beta1.NodeRegistrationOptions{
-							Name:             "{{ ds.meta_data.hostname }}",
+							Name:             "{{ ds.meta_data.local_hostname }}",
 							KubeletExtraArgs: map[string]string{"cloud-provider": "aws"},
 						},
 					},
@@ -600,7 +600,7 @@ func makeJoinBootstrapConfig(namespace, name string) {
 			JoinConfiguration: &kubeadmv1beta1.JoinConfiguration{
 				ControlPlane: &kubeadmv1beta1.JoinControlPlane{},
 				NodeRegistration: kubeadmv1beta1.NodeRegistrationOptions{
-					Name:             "{{ ds.meta_data.hostname }}",
+					Name:             "{{ ds.meta_data.local_hostname }}",
 					KubeletExtraArgs: map[string]string{"cloud-provider": "aws"},
 				},
 			},
@@ -629,7 +629,7 @@ func makeInitBootstrapConfig(namespace, name string) {
 			},
 			InitConfiguration: &kubeadmv1beta1.InitConfiguration{
 				NodeRegistration: kubeadmv1beta1.NodeRegistrationOptions{
-					Name:             "{{ ds.meta_data.hostname }}",
+					Name:             "{{ ds.meta_data.local_hostname }}",
 					KubeletExtraArgs: map[string]string{"cloud-provider": "aws"},
 				},
 			},