github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #43161 from luxas/kubeadm_16_offline_version 

Automatic merge from submit-queue

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

**What this PR does / why we need it**:

In offline scenarios, kubeadm will fallback to the latest well-known version.
This PR bumps that to v1.6. We can merge now, and in the small gap between the merge of this PR and the actual v1.6 release, kubeadm devs will have to explicitely set k8s version.

**Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #

**Special notes for your reviewer**:

**Release note**:

```release-note
NONE
```
@jbeda
pull/6/head
Kubernetes Submit Queue 2017-03-19 05:16:20 -07:00 committed by GitHub
parent 082c9a8fa5 b451e08e9b
commit 8532c63c50
3 changed files with 4 additions and 4 deletions
Show Stats 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