kubeadm: Default to v1.6.0 stable in offline scenarios in beforehand

parent 08e351ac
...@@ -28,7 +28,7 @@ const ( ...@@ -28,7 +28,7 @@ const (
DefaultServicesSubnet = "10.96.0.0/12" DefaultServicesSubnet = "10.96.0.0/12"
DefaultKubernetesVersion = "latest-1.6" DefaultKubernetesVersion = "latest-1.6"
// This is only for clusters without internet, were the latest stable version can't be determined // 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 DefaultAPIBindPort = 6443
DefaultDiscoveryBindPort = 9898 DefaultDiscoveryBindPort = 9898
DefaultAuthorizationMode = "RBAC" DefaultAuthorizationMode = "RBAC"
...@@ -46,7 +46,7 @@ func addDefaultingFuncs(scheme *runtime.Scheme) error { ...@@ -46,7 +46,7 @@ func addDefaultingFuncs(scheme *runtime.Scheme) error {
func SetDefaults_MasterConfiguration(obj *MasterConfiguration) { func SetDefaults_MasterConfiguration(obj *MasterConfiguration) {
if obj.KubernetesVersion == "" { if obj.KubernetesVersion == "" {
obj.KubernetesVersion = DefaultKubernetesVersion obj.KubernetesVersion = DefaultKubernetesFallbackVersion
} }
if obj.API.BindPort == 0 { if obj.API.BindPort == 0 {
......
...@@ -56,7 +56,7 @@ func NewKubeadmCommand(f cmdutil.Factory, in io.Reader, out, err io.Writer) *cob ...@@ -56,7 +56,7 @@ func NewKubeadmCommand(f cmdutil.Factory, in io.Reader, out, err io.Writer) *cob
┌──────────────────────────────────────────────────────────┐ ┌──────────────────────────────────────────────────────────┐
│ On the second machine │ │ 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. You can then repeat the second step on as many other machines as you like.
......
...@@ -57,7 +57,7 @@ const ( ...@@ -57,7 +57,7 @@ const (
SchedulerKubeConfigFileName = "scheduler.conf" SchedulerKubeConfigFileName = "scheduler.conf"
// Important: a "v"-prefix shouldn't exist here; semver doesn't allow that // 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 // Some well-known users and groups in the core Kubernetes authorization system
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment