kubeadm config add support for more than one APIEndpoint

2018-08-27 09:00:26 +02:00
parent b2b3c36ecb
commit 7dfb3c7134
48 changed files with 506 additions and 414 deletions
--- a/cmd/kubeadm/test/util.go
+++ b/cmd/kubeadm/test/util.go
@@ -55,15 +55,15 @@ func SetupInitConfigurationFile(t *testing.T, tmpdir string, cfg *kubeadmapi.Ini
 	cfgTemplate := template.Must(template.New("init").Parse(dedent.Dedent(`
 		apiVersion: kubeadm.k8s.io/v1alpha3
 		kind: InitConfiguration
+		apiEndpoint:
+		  advertiseAddress: {{.APIEndpoint.AdvertiseAddress}}
+		  bindPort: {{.APIEndpoint.BindPort}}
 		nodeRegistration:
 		  name: {{.NodeRegistration.Name}}
 		---
 		apiVersion: kubeadm.k8s.io/v1alpha3
 		kind: ClusterConfiguration
 		certificatesDir: {{.CertificatesDir}}
-		api:
-		  advertiseAddress: {{.API.AdvertiseAddress}}
-		  bindPort: {{.API.BindPort}}
 		kubernetesVersion: v1.10.0
 		`)))