github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-24 19:12:02 +00:00
Code Issues Projects Releases Wiki Activity

use the release-1.11 branch by default

Browse Source
This commit is contained in:
Di Xu 2018-05-16 20:53:44 +08:00 committed by Lucas Käldström
parent ed95abe72f
commit 988243cb83
No known key found for this signature in database
GPG Key ID: 3FA3783D77751514
3 changed files with 3 additions and 7 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

@ -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

2
cmd/kubeadm/app/apis/kubeadm/v1alpha2/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.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

6
cmd/kubeadm/app/cmd/config_test.go
View File

@ -54,11 +54,6 @@ func TestImagesListRunWithCustomConfigPath(t *testing.T) {
expectedImageSubstrings []string expectedImageSubstrings []string
configContents []byte configContents []byte
}{ }{
{
name: "empty config contents",
expectedImageCount: defaultNumberOfImages,
configContents: []byte{},
},
{ {
name: "set k8s version", name: "set k8s version",
expectedImageCount: defaultNumberOfImages, expectedImageCount: defaultNumberOfImages,
@ -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
`)), `)),