github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Lucas Käldström
2017-03-15 21:01:03 +02:00
parent 08e351acc8
commit b451e08e9b
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/kubeadm/app/apis/kubeadm/v1alpha1/defaults.go
View File

@@ -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 {
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 {

2
cmd/kubeadm/app/cmd/cmd.go
View File

@@ -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.

2
cmd/kubeadm/app/constants/constants.go
View File

@@ -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