Skip to content

K
k3s
Commit 4c8c2aaa authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #44509 from bowei/cluster-ip

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 ```
parents a1684fea 0e6af317
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 6 deletions
cluster/gce/config-test.sh
View file @ 4c8c2aaa
...@@ -80,7 +80,7 @@ ETCD_QUORUM_READ="${ENABLE_ETCD_QUORUM_READ:-false}" ...@@ -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.
......
test/e2e/framework/firewall_util.go
View file @ 4c8c2aaa
...@@ -120,12 +120,11 @@ func GetClusterName(instancePrefix string) string { ...@@ -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.
......
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