github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #33668 from mikedanese/private-ip 

Automatic merge from submit-queue

kubeadm: default to using a private range for service subnet

We are currently using a subnet that is reserved for ISPs. Private network administrators don't control this space. Default to a subnet that private network administrators do control.

@errordeveloper @kubernetes/sig-cluster-lifecycle
pull/6/head
Kubernetes Submit Queue 2016-09-28 18:49:46 -07:00 committed by GitHub
parent 80123cb680 3c8c71e80e
commit df0ae9f67d
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kubeadm/app/api/types.go
View File

@ -68,7 +68,7 @@ type InitFlags struct {
const (
DefaultServiceDNSDomain = "cluster.local"
DefaultServicesCIDRString = "100.64.0.0/12" // Carrier-grade NAT range (RFC 6598)
DefaultServicesCIDRString = "10.12.0.0/12"
DefaultKubernetesVersion = "v1.4.0"
)