Unverified Commit 988243cb authored by Di Xu's avatar Di Xu Committed by Lucas Käldström

use the release-1.11 branch by default

parent ed95abe7
...@@ -39,7 +39,7 @@ const ( ...@@ -39,7 +39,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.10" DefaultKubernetesVersion = "stable-1.11"
// DefaultAPIBindPort defines default API port // DefaultAPIBindPort defines default API port
DefaultAPIBindPort = 6443 DefaultAPIBindPort = 6443
// DefaultAuthorizationModes defines default authorization modes // DefaultAuthorizationModes defines default authorization modes
......
...@@ -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.10" DefaultKubernetesVersion = "stable-1.11"
// DefaultAPIBindPort defines default API port // DefaultAPIBindPort defines default API port
DefaultAPIBindPort = 6443 DefaultAPIBindPort = 6443
// DefaultCertificatesDir defines default certificate directory // DefaultCertificatesDir defines default certificate directory
......
...@@ -55,11 +55,6 @@ func TestImagesListRunWithCustomConfigPath(t *testing.T) { ...@@ -55,11 +55,6 @@ func TestImagesListRunWithCustomConfigPath(t *testing.T) {
configContents []byte configContents []byte
}{ }{
{ {
name: "empty config contents",
expectedImageCount: defaultNumberOfImages,
configContents: []byte{},
},
{
name: "set k8s version", name: "set k8s version",
expectedImageCount: defaultNumberOfImages, expectedImageCount: defaultNumberOfImages,
expectedImageSubstrings: []string{ expectedImageSubstrings: []string{
...@@ -80,6 +75,7 @@ func TestImagesListRunWithCustomConfigPath(t *testing.T) { ...@@ -80,6 +75,7 @@ func TestImagesListRunWithCustomConfigPath(t *testing.T) {
configContents: []byte(dedent.Dedent(` configContents: []byte(dedent.Dedent(`
apiVersion: kubeadm.k8s.io/v1alpha2 apiVersion: kubeadm.k8s.io/v1alpha2
kind: MasterConfiguration kind: MasterConfiguration
kubernetesVersion: 1.11.0
featureGates: featureGates:
CoreDNS: True CoreDNS: True
`)), `)),
......
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