Unverified Commit 7bcfbcd5 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub

Merge pull request #61127 from timothysc/kubeadm-1.10

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
parents d0f8f418 52d6cd43
...@@ -38,7 +38,7 @@ const ( ...@@ -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
......
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