github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #44509 from bowei/cluster-ip

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 40055, 42085, 44509, 44568, 43956)

Change the default CLUSTER_IP_RANGE used by e2e

The existing choice intersects with the range reserved for auto
subnets and cannot be used with some GCP features.

```release-note
NONE
```
This commit is contained in:
Kubernetes Submit Queue 2017-04-17 15:39:09 -07:00 committed by GitHub
commit 4c8c2aaa85
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/gce/config-test.sh
View File

@ -80,7 +80,7 @@ ETCD_QUORUM_READ="${ENABLE_ETCD_QUORUM_READ:-false}"
MASTER_TAG="${INSTANCE_PREFIX}-master" MASTER_TAG="${INSTANCE_PREFIX}-master"
NODE_TAG="${INSTANCE_PREFIX}-minion" NODE_TAG="${INSTANCE_PREFIX}-minion"
CLUSTER_IP_RANGE="${CLUSTER_IP_RANGE:-10.180.0.0/14}" CLUSTER_IP_RANGE="${CLUSTER_IP_RANGE:-10.100.0.0/14}"
MASTER_IP_RANGE="${MASTER_IP_RANGE:-10.246.0.0/24}" 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 # 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. # the subnet and is the range used for node instance IPs.

9
test/e2e/framework/firewall_util.go
View File

@ -120,12 +120,11 @@ func GetClusterName(instancePrefix string) string {
} }
// GetClusterIpRange returns the CLUSTER_IP_RANGE env we set for e2e cluster. // GetClusterIpRange returns the CLUSTER_IP_RANGE env we set for e2e cluster.
// From cluster/gce/config-test.sh, cluster ip range is set up using below command: //
// CLUSTER_IP_RANGE="${CLUSTER_IP_RANGE:-10.180.0.0/14}" // Warning: this MUST be consistent with the CLUSTER_IP_RANGE set in
// Warning: this need to be consistent with the CLUSTER_IP_RANGE in startup scripts, // gce/config-test.sh.
// which is hardcoded currently.
func GetClusterIpRange() string { func GetClusterIpRange() string {
return "10.180.0.0/14" return "10.100.0.0/14"
} }
// GetE2eFirewalls returns all firewall rules we create for an e2e cluster. // GetE2eFirewalls returns all firewall rules we create for an e2e cluster.