Fallback to known good stable version in case of network errors.

Hardcoded known stable version will be returned if user didn't request specific version and kubeadm for some reason not able to fetch latest stable information from release servers. For now, fallback version is v1.4.6

Fallback to known good stable version in case of network errors.
6338b7fd · Alexander Kanevskiy · 39f55cb4 · 6338b7fd · 6338b7fd
Commit 6338b7fd authored Nov 30, 2016 by Alexander Kanevskiy
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 6 deletions

defaults.go cmd/kubeadm/app/apis/kubeadm/v1alpha1/defaults.go +6 -5

init.go cmd/kubeadm/app/cmd/init.go +5 -1

No files found.
--- a/cmd/kubeadm/app/apis/kubeadm/v1alpha1/defaults.go
+++ b/cmd/kubeadm/app/apis/kubeadm/v1alpha1/defaults.go
@@ -21,11 +21,12 @@ import (
 )

 const (
-	DefaultServiceDNSDomain  = "cluster.local"
-	DefaultServicesSubnet    = "10.96.0.0/12"
-	DefaultKubernetesVersion = "stable"
-	DefaultAPIBindPort       = 6443
-	DefaultDiscoveryBindPort = 9898
+	DefaultServiceDNSDomain          = "cluster.local"
+	DefaultServicesSubnet            = "10.96.0.0/12"
+	DefaultKubernetesVersion         = "stable"
+	DefaultKubernetesFallbackVersion = "v1.4.6"
+	DefaultAPIBindPort               = 6443
+	DefaultDiscoveryBindPort         = 9898
 )

 func addDefaultingFuncs(scheme *runtime.Scheme) error {

--- a/cmd/kubeadm/app/cmd/init.go
+++ b/cmd/kubeadm/app/cmd/init.go
@@ -196,7 +196,11 @@ func NewInit(cfgPath string, cfg *kubeadmapi.MasterConfiguration, skipPreFlight 
 	// validate version argument
 	ver, err := kubeadmutil.KubernetesReleaseVersion(cfg.KubernetesVersion)
 	if err != nil {
-		return nil, err
+		if cfg.KubernetesVersion != kubeadmapiext.DefaultKubernetesVersion {
+			return nil, err
+		} else {
+			ver = kubeadmapiext.DefaultKubernetesFallbackVersion
+		}
 	}
 	cfg.KubernetesVersion = ver
 	fmt.Println("Using Kubernetes version:", ver)