Skip to content

K
k3s
Commit d5055d49 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #38649 from luxas/bump_kubeadm_base_k8s_version

Automatic merge from submit-queue Bump default kubernetes version when no internet is present to v1.5 @mikedanese Please lgtm as soon as possible It's a noop, when no internet is present so the latest version can't be determined, this version is used.
parents 9ec68995 5222bd3e
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
cmd/kubeadm/app/apis/kubeadm/v1alpha1/defaults.go
View file @ d5055d49
...@@ -24,7 +24,7 @@ const ( ...@@ -24,7 +24,7 @@ const (
DefaultServiceDNSDomain = "cluster.local" DefaultServiceDNSDomain = "cluster.local"
DefaultServicesSubnet = "10.96.0.0/12" DefaultServicesSubnet = "10.96.0.0/12"
DefaultKubernetesVersion = "stable" DefaultKubernetesVersion = "stable"
DefaultKubernetesFallbackVersion = "v1.4.6" DefaultKubernetesFallbackVersion = "v1.5.0"
DefaultAPIBindPort = 6443 DefaultAPIBindPort = 6443
DefaultDiscoveryBindPort = 9898 DefaultDiscoveryBindPort = 9898
) )
......
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