From fbbd326c2dc7017b428d1959a1c73fb72e7e3014 Mon Sep 17 00:00:00 2001
From: Shyam Jeedigunta <shyamjvs@google.com>
Date: Wed, 30 Aug 2017 12:21:44 +0200
Subject: [PATCH] Update default cluster-ip-range to 10.64.0.0/14

---
 cluster/gce/config-test.sh            | 2 +-
 test/e2e/framework/firewall_util.go   | 2 +-
 test/e2e_node/conformance/run_test.sh | 2 +-
 test/e2e_node/services/kubelet.go     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cluster/gce/config-test.sh b/cluster/gce/config-test.sh
index fda8dbd53c63..35e7f1a69e21 100755
--- a/cluster/gce/config-test.sh
+++ b/cluster/gce/config-test.sh
@@ -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.
diff --git a/test/e2e/framework/firewall_util.go b/test/e2e/framework/firewall_util.go
index 2de5860777a8..dfca1e4f91f9 100644
--- a/test/e2e/framework/firewall_util.go
+++ b/test/e2e/framework/firewall_util.go
@@ -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.
diff --git a/test/e2e_node/conformance/run_test.sh b/test/e2e_node/conformance/run_test.sh
index 3bc57d5fd5b8..95a1df2a35fa 100755
--- a/test/e2e_node/conformance/run_test.sh
+++ b/test/e2e_node/conformance/run_test.sh
@@ -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 \
diff --git a/test/e2e_node/services/kubelet.go b/test/e2e_node/services/kubelet.go
index 477155db190b..ea36add7df3d 100644
--- a/test/e2e_node/services/kubelet.go
+++ b/test/e2e_node/services/kubelet.go
@@ -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.