kubeadm: Default to using token discovery.

Recent changes to support multiple methods for discovery meant that "kubeadm init" no longer was sufficient and users would need to add "--discovery token://" to achieve the same results. Instead lets assume discovery if the user does not specify anything else to maintain parity and the brevity of our original instructions.

kubeadm: Default to using token discovery.
bf69fb17 · Devan Goodwin · ad47a181 · bf69fb17 · bf69fb17
Commit bf69fb17 authored Dec 21, 2016 by Devan Goodwin
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 0 deletions

defaults.go cmd/kubeadm/app/apis/kubeadm/v1alpha1/defaults.go +4 -0

fuzzer.go pkg/api/testing/fuzzer.go +1 -0

No files found.
--- a/cmd/kubeadm/app/apis/kubeadm/v1alpha1/defaults.go
+++ b/cmd/kubeadm/app/apis/kubeadm/v1alpha1/defaults.go
@@ -52,4 +52,8 @@ func SetDefaults_MasterConfiguration(obj *MasterConfiguration) {
 	if obj.Networking.DNSDomain == "" {
 		obj.Networking.DNSDomain = DefaultServiceDNSDomain
 	}
+
+	if obj.Discovery.Token == nil && obj.Discovery.File == nil && obj.Discovery.HTTPS == nil {
+		obj.Discovery.Token = &TokenDiscovery{}
+	}
 }
--- a/pkg/api/testing/fuzzer.go
+++ b/pkg/api/testing/fuzzer.go
@@ -550,6 +550,7 @@ func FuzzerFor(t *testing.T, version schema.GroupVersion, src rand.Source) *fuzz
 			obj.API.Port = 20
 			obj.Networking.ServiceSubnet = "foo"
 			obj.Networking.DNSDomain = "foo"
+			obj.Discovery.Token = &kubeadm.TokenDiscovery{}
 		},
 		func(s *policy.PodDisruptionBudgetStatus, c fuzz.Continue) {
 			c.FuzzNoCustom(s) // fuzz self without calling this function again