github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-22 18:16:52 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #61127 from timothysc/kubeadm-1.10

Browse Source 
Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Updates kubeadm default to use 1.10

**What this PR does / why we need it**:
In line with https://github.com/kubernetes/kubeadm/blob/master/docs/release-cycle.md, the default branch for kubeadm to deploy should be bumped right before the rc.1.
This can even be manually merged by the someone from the release team.

**Which issue(s) this PR fixes** :
Fixes #60608 

**Special notes for your reviewer**:

**Release note**:

```
Updates default deployment for kubeadm to 1.10 
```

/cc @kubernetes/sig-cluster-lifecycle-pr-reviews @kubernetes/sig-release-members  @dims @jberkus @jdumars
This commit is contained in:
Kubernetes Submit Queue 2018-03-19 15:49:03 -07:00 committed by GitHub
commit 7bcfbcd585
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -38,7 +38,7 @@ const (
// DefaultClusterDNSIP defines default DNS IP // DefaultClusterDNSIP defines default DNS IP
DefaultClusterDNSIP = "10.96.0.10" DefaultClusterDNSIP = "10.96.0.10"
// DefaultKubernetesVersion defines default kubernetes version // DefaultKubernetesVersion defines default kubernetes version
DefaultKubernetesVersion = "stable-1.9" DefaultKubernetesVersion = "stable-1.10"
// DefaultAPIBindPort defines default API port // DefaultAPIBindPort defines default API port
DefaultAPIBindPort = 6443 DefaultAPIBindPort = 6443
// DefaultAuthorizationModes defines default authorization modes // DefaultAuthorizationModes defines default authorization modes