From 988243cb835bfd9beb5cadc3c5a877dc87ce816e Mon Sep 17 00:00:00 2001 From: Di Xu Date: Wed, 16 May 2018 20:53:44 +0800 Subject: [PATCH] use the release-1.11 branch by default --- cmd/kubeadm/app/apis/kubeadm/v1alpha1/defaults.go | 2 +- cmd/kubeadm/app/apis/kubeadm/v1alpha2/defaults.go | 2 +- cmd/kubeadm/app/cmd/config_test.go | 6 +----- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/cmd/kubeadm/app/apis/kubeadm/v1alpha1/defaults.go b/cmd/kubeadm/app/apis/kubeadm/v1alpha1/defaults.go index c0439cbc07a..bb30de78c39 100644 --- a/cmd/kubeadm/app/apis/kubeadm/v1alpha1/defaults.go +++ b/cmd/kubeadm/app/apis/kubeadm/v1alpha1/defaults.go @@ -39,7 +39,7 @@ const ( // DefaultClusterDNSIP defines default DNS IP DefaultClusterDNSIP = "10.96.0.10" // DefaultKubernetesVersion defines default kubernetes version - DefaultKubernetesVersion = "stable-1.10" + DefaultKubernetesVersion = "stable-1.11" // DefaultAPIBindPort defines default API port DefaultAPIBindPort = 6443 // DefaultAuthorizationModes defines default authorization modes diff --git a/cmd/kubeadm/app/apis/kubeadm/v1alpha2/defaults.go b/cmd/kubeadm/app/apis/kubeadm/v1alpha2/defaults.go index f085904efbd..c9b8980bdcd 100644 --- a/cmd/kubeadm/app/apis/kubeadm/v1alpha2/defaults.go +++ b/cmd/kubeadm/app/apis/kubeadm/v1alpha2/defaults.go @@ -38,7 +38,7 @@ const ( // DefaultClusterDNSIP defines default DNS IP DefaultClusterDNSIP = "10.96.0.10" // DefaultKubernetesVersion defines default kubernetes version - DefaultKubernetesVersion = "stable-1.10" + DefaultKubernetesVersion = "stable-1.11" // DefaultAPIBindPort defines default API port DefaultAPIBindPort = 6443 // DefaultCertificatesDir defines default certificate directory diff --git a/cmd/kubeadm/app/cmd/config_test.go b/cmd/kubeadm/app/cmd/config_test.go index 77b0ce7f7aa..5eefd71e965 100644 --- a/cmd/kubeadm/app/cmd/config_test.go +++ b/cmd/kubeadm/app/cmd/config_test.go @@ -54,11 +54,6 @@ func TestImagesListRunWithCustomConfigPath(t *testing.T) { expectedImageSubstrings []string configContents []byte }{ - { - name: "empty config contents", - expectedImageCount: defaultNumberOfImages, - configContents: []byte{}, - }, { name: "set k8s version", expectedImageCount: defaultNumberOfImages, @@ -80,6 +75,7 @@ func TestImagesListRunWithCustomConfigPath(t *testing.T) { configContents: []byte(dedent.Dedent(` apiVersion: kubeadm.k8s.io/v1alpha2 kind: MasterConfiguration + kubernetesVersion: 1.11.0 featureGates: CoreDNS: True `)),