Skip to content

K
k3s
Commit 2106a591 authored by caleb miles's avatar caleb miles
Browse files
Options

Merge remote-tracking branch 'origin/master' into release-1.10

parents 047bcdd4 7bcfbcd5
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
cmd/kubeadm/app/apis/kubeadm/v1alpha1/defaults.go
View file @ 2106a591
...@@ -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.9" DefaultKubernetesVersion = "stable-1.10"
// DefaultAPIBindPort defines default API port // DefaultAPIBindPort defines default API port
DefaultAPIBindPort = 6443 DefaultAPIBindPort = 6443
// DefaultAuthorizationModes defines default authorization modes // DefaultAuthorizationModes defines default authorization modes
......
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