From b451e08e9b3d63afa3e6646a92b7969d919d4dc3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucas=20K=C3=A4ldstr=C3=B6m?=
 <lucas.kaldstrom@hotmail.co.uk>
Date: Wed, 15 Mar 2017 21:01:03 +0200
Subject: [PATCH] kubeadm: Default to v1.6.0 stable in offline scenarios in
 beforehand

---
 cmd/kubeadm/app/apis/kubeadm/v1alpha1/defaults.go | 4 ++--
 cmd/kubeadm/app/cmd/cmd.go                        | 2 +-
 cmd/kubeadm/app/constants/constants.go            | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cmd/kubeadm/app/apis/kubeadm/v1alpha1/defaults.go b/cmd/kubeadm/app/apis/kubeadm/v1alpha1/defaults.go
index 3f17a07b8a5..c7d878cb8fd 100644
--- a/cmd/kubeadm/app/apis/kubeadm/v1alpha1/defaults.go
+++ b/cmd/kubeadm/app/apis/kubeadm/v1alpha1/defaults.go
@@ -28,7 +28,7 @@ const (
 	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-beta.1"
+	DefaultKubernetesFallbackVersion = "v1.6.0"
 	DefaultAPIBindPort               = 6443
 	DefaultDiscoveryBindPort         = 9898
 	DefaultAuthorizationMode         = "RBAC"
@@ -46,7 +46,7 @@ func addDefaultingFuncs(scheme *runtime.Scheme) error {
 
 func SetDefaults_MasterConfiguration(obj *MasterConfiguration) {
 	if obj.KubernetesVersion == "" {
-		obj.KubernetesVersion = DefaultKubernetesVersion
+		obj.KubernetesVersion = DefaultKubernetesFallbackVersion
 	}
 
 	if obj.API.BindPort == 0 {
diff --git a/cmd/kubeadm/app/cmd/cmd.go b/cmd/kubeadm/app/cmd/cmd.go
index 46d855959bf..1c33ce30508 100644
--- a/cmd/kubeadm/app/cmd/cmd.go
+++ b/cmd/kubeadm/app/cmd/cmd.go
@@ -56,7 +56,7 @@ func NewKubeadmCommand(f cmdutil.Factory, in io.Reader, out, err io.Writer) *cob
 			    ┌──────────────────────────────────────────────────────────┐
 			    │ On the second machine                                    │
 			    ├──────────────────────────────────────────────────────────┤
-			    │ node# kubeadm join --token=<token> <ip-of-master>        │
+			    │ node# kubeadm join --token=<token> <ip-of-master>:<port> │
 			    └──────────────────────────────────────────────────────────┘
 
 			    You can then repeat the second step on as many other machines as you like.
diff --git a/cmd/kubeadm/app/constants/constants.go b/cmd/kubeadm/app/constants/constants.go
index a199731cff9..2cd64fbce03 100644
--- a/cmd/kubeadm/app/constants/constants.go
+++ b/cmd/kubeadm/app/constants/constants.go
@@ -57,7 +57,7 @@ const (
 	SchedulerKubeConfigFileName         = "scheduler.conf"
 
 	// Important: a "v"-prefix shouldn't exist here; semver doesn't allow that
-	MinimumControlPlaneVersion = "1.6.0-beta.1"
+	MinimumControlPlaneVersion = "1.6.0-beta.3"
 
 	// Some well-known users and groups in the core Kubernetes authorization system