Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update default cluster-ip-range to 10.64.0.0/14 #51613

Merged
merged 1 commit into from Aug 30, 2017
Merged

Update default cluster-ip-range to 10.64.0.0/14 #51613

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion cluster/gce/config-test.sh
View file
Open in desktop
Expand Up @@ -87,7 +87,7 @@ ETCD_QUORUM_READ="${ENABLE_ETCD_QUORUM_READ:-false}"
MASTER_TAG="${INSTANCE_PREFIX}-master"
NODE_TAG="${INSTANCE_PREFIX}-minion"

CLUSTER_IP_RANGE="${CLUSTER_IP_RANGE:-10.100.0.0/14}"
CLUSTER_IP_RANGE="${CLUSTER_IP_RANGE:-10.64.0.0/14}"
MASTER_IP_RANGE="${MASTER_IP_RANGE:-10.246.0.0/24}"
# NODE_IP_RANGE is used when ENABLE_IP_ALIASES=true. It is the primary range in
# the subnet and is the range used for node instance IPs.
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/framework/firewall_util.go
View file
Open in desktop
Expand Up @@ -154,7 +154,7 @@ func GetClusterName(instancePrefix string) string {
// Warning: this MUST be consistent with the CLUSTER_IP_RANGE set in
// gce/config-test.sh.
func GetClusterIpRange() string {
return "10.100.0.0/14"
return "10.64.0.0/14"
}

// GetE2eFirewalls returns all firewall rules we create for an e2e cluster.
Expand Down
2 changes: 1 addition & 1 deletion test/e2e_node/conformance/run_test.sh
View file
Open in desktop
Expand Up @@ -153,7 +153,7 @@ allow_privileged=true
serialize_image_pulls=false
config_dir=`mktemp -d`
file_check_frequency=10s
pod_cidr=10.100.0.0/24
pod_cidr=10.64.0.0/24
log_level=4
start_kubelet --api-servers $apiserver \
--volume-stats-agg-period $volume_stats_agg_period \
Expand Down
2 changes: 1 addition & 1 deletion test/e2e_node/services/kubelet.go
View file
Open in desktop
Expand Up @@ -142,7 +142,7 @@ func (e *E2EServices) startKubelet() (*server, error) {
// Note: this MUST be in sync with with the IP in
// - cluster/gce/config-test.sh and
// - test/e2e_node/conformance/run_test.sh.
"--pod-cidr", "10.100.0.0/24",
"--pod-cidr", "10.64.0.0/24",
"--eviction-pressure-transition-period", "30s",
// Apply test framework feature gates by default. This could also be overridden
// by kubelet-flags.
Expand Down