From 8dc2bc8f60e6055e32903b1b1bb66c516a85c08d Mon Sep 17 00:00:00 2001
From: Mike Danese <mikedanese@google.com>
Date: Mon, 3 Apr 2017 13:34:06 -0700
Subject: [PATCH 1/2] kubeadm: fail explicitly when using (stable,latest) in
 airgapped env

---
 .../app/apis/kubeadm/v1alpha1/defaults.go        | 16 +++++++---------
 cmd/kubeadm/app/cmd/defaults.go                  |  7 +------
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/cmd/kubeadm/app/apis/kubeadm/v1alpha1/defaults.go b/cmd/kubeadm/app/apis/kubeadm/v1alpha1/defaults.go
index c7d878cb8fd9c..f8bbac96d7618 100644
--- a/cmd/kubeadm/app/apis/kubeadm/v1alpha1/defaults.go
+++ b/cmd/kubeadm/app/apis/kubeadm/v1alpha1/defaults.go
@@ -26,14 +26,12 @@ import (
 const (
 	DefaultServiceDNSDomain  = "cluster.local"
 	DefaultServicesSubnet    = "10.96.0.0/12"
-	DefaultKubernetesVersion = "latest-1.6"
-	// This is only for clusters without internet, were the latest stable version can't be determined
-	DefaultKubernetesFallbackVersion = "v1.6.0"
-	DefaultAPIBindPort               = 6443
-	DefaultDiscoveryBindPort         = 9898
-	DefaultAuthorizationMode         = "RBAC"
-	DefaultCACertPath                = "/etc/kubernetes/pki/ca.crt"
-	DefaultCertificatesDir           = "/etc/kubernetes/pki"
+	DefaultKubernetesVersion = "stable"
+	DefaultAPIBindPort       = 6443
+	DefaultDiscoveryBindPort = 9898
+	DefaultAuthorizationMode = "RBAC"
+	DefaultCACertPath        = "/etc/kubernetes/pki/ca.crt"
+	DefaultCertificatesDir   = "/etc/kubernetes/pki"
 )
 
 func addDefaultingFuncs(scheme *runtime.Scheme) error {
@@ -46,7 +44,7 @@ func addDefaultingFuncs(scheme *runtime.Scheme) error {
 
 func SetDefaults_MasterConfiguration(obj *MasterConfiguration) {
 	if obj.KubernetesVersion == "" {
-		obj.KubernetesVersion = DefaultKubernetesFallbackVersion
+		obj.KubernetesVersion = DefaultKubernetesVersion
 	}
 
 	if obj.API.BindPort == 0 {
diff --git a/cmd/kubeadm/app/cmd/defaults.go b/cmd/kubeadm/app/cmd/defaults.go
index 49fce9299ac52..c503809cac389 100644
--- a/cmd/kubeadm/app/cmd/defaults.go
+++ b/cmd/kubeadm/app/cmd/defaults.go
@@ -22,7 +22,6 @@ import (
 
 	netutil "k8s.io/apimachinery/pkg/util/net"
 	kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm"
-	kubeadmapiext "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1alpha1"
 	kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants"
 	kubeadmutil "k8s.io/kubernetes/cmd/kubeadm/app/util"
 	tokenutil "k8s.io/kubernetes/cmd/kubeadm/app/util/token"
@@ -45,11 +44,7 @@ func setInitDynamicDefaults(cfg *kubeadmapi.MasterConfiguration) error {
 	// Validate version argument
 	ver, err := kubeadmutil.KubernetesReleaseVersion(cfg.KubernetesVersion)
 	if err != nil {
-		if cfg.KubernetesVersion != kubeadmapiext.DefaultKubernetesVersion {
-			return err
-		} else {
-			ver = kubeadmapiext.DefaultKubernetesFallbackVersion
-		}
+		return err
 	}
 	cfg.KubernetesVersion = ver
 

From 50317e40b19a6f8ad566a5dfe8690ead4a78e0bf Mon Sep 17 00:00:00 2001
From: Mike Danese <mikedanese@google.com>
Date: Wed, 5 Apr 2017 09:26:39 -0700
Subject: [PATCH 2/2] make kubeadm default to stable-1.6

---
 cmd/kubeadm/app/apis/kubeadm/v1alpha1/defaults.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmd/kubeadm/app/apis/kubeadm/v1alpha1/defaults.go b/cmd/kubeadm/app/apis/kubeadm/v1alpha1/defaults.go
index f8bbac96d7618..4ea6972399273 100644
--- a/cmd/kubeadm/app/apis/kubeadm/v1alpha1/defaults.go
+++ b/cmd/kubeadm/app/apis/kubeadm/v1alpha1/defaults.go
@@ -26,7 +26,7 @@ import (
 const (
 	DefaultServiceDNSDomain  = "cluster.local"
 	DefaultServicesSubnet    = "10.96.0.0/12"
-	DefaultKubernetesVersion = "stable"
+	DefaultKubernetesVersion = "stable-1.6"
 	DefaultAPIBindPort       = 6443
 	DefaultDiscoveryBindPort = 9898
 	DefaultAuthorizationMode = "RBAC"