github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-26 05:03:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #68789 from timothysc/kubeadm-1.12

Browse Source 
Use the v1.12 branch by default
This commit is contained in:
k8s-ci-robot 2018-09-21 08:23:54 -07:00 committed by GitHub
commit 7568f21e60
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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.11" DefaultKubernetesVersion = "stable-1"
// DefaultAPIBindPort defines default API port // DefaultAPIBindPort defines default API port
DefaultAPIBindPort = 6443 DefaultAPIBindPort = 6443
// DefaultCertificatesDir defines default certificate directory // DefaultCertificatesDir defines default certificate directory

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

@ -33,7 +33,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.11" DefaultKubernetesVersion = "stable-1"
// DefaultAPIBindPort defines default API port // DefaultAPIBindPort defines default API port
DefaultAPIBindPort = 6443 DefaultAPIBindPort = 6443
// DefaultCertificatesDir defines default certificate directory // DefaultCertificatesDir defines default certificate directory