tweak nat config

borg-land · Dec 30, 2023 · c197141 · c197141
1 parent 7a16491
commit c197141
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/tests/e2e/scenarios/scalability/run-test.sh b/tests/e2e/scenarios/scalability/run-test.sh
@@ -78,10 +78,10 @@ if [[ "${CLOUD_PROVIDER}" == "aws" ]]; then
 fi
 if [[ "${CLOUD_PROVIDER}" == "gce" ]]; then
   create_args+=("--zones=us-east1-b,us-east1-c,us-east1-d")
-  # create_args+=("--topology=private")
+  create_args+=("--topology=private")
   create_args+=("--node-size=e2-standard-2")
   create_args+=("--node-volume-size=30")
-  create_args+=("--master-volume-size=300")
+  create_args+=("--master-volume-size=1000")
   create_args+=("--image=${INSTANCE_IMAGE:-ubuntu-os-cloud/ubuntu-2204-jammy-v20231213a}")
   export KOPS_STATE_STORE=gs://k8s-infra-e2e-scale-project # temporary
 fi
@@ -110,7 +110,7 @@ create_args+=("--set spec.kubeAPIServer.maxRequestsInflight=800")
 create_args+=("--set spec.kubeAPIServer.maxMutatingRequestsInflight=400")
 create_args+=("--set spec.kubeAPIServer.enableProfiling=true")
 create_args+=("--set spec.kubeAPIServer.enableContentionProfiling=true")
-create_args+=("--set spec.kubeAPIServer.logLevel=3")
+create_args+=("--set spec.kubeAPIServer.logLevel=2")
 # this is required for Prometheus server to scrape metrics endpoint on APIServer
 create_args+=("--set spec.kubeAPIServer.anonymousAuth=true")
 # this is required for prometheus to scrape kube-proxy metrics endpoint
@@ -119,7 +119,7 @@ create_args+=("--node-count=${KUBE_NODE_COUNT:-101}")
 # TODO: track failures of tests (HostPort & OIDC) when using `--dns=none`
 create_args+=("--dns=none")
 create_args+=("--control-plane-count=${CONTROL_PLANE_COUNT:-1}")
-create_args+=("--master-size=${CONTROL_PLANE_SIZE:-c5.2xlarge}")
+create_args+=("--master-size=${FOO_CONTROL_PLANE_SIZE:-c3-standard-88}") # undo this
 
 
 # Enable cluster addons, this enables us to replace the built-in manifest

diff --git a/upup/pkg/fi/cloudup/gcetasks/router.go b/upup/pkg/fi/cloudup/gcetasks/router.go
@@ -158,6 +158,9 @@ func (*Router) RenderGCE(t *gce.GCEAPITarget, a, e, changes *Router) error {
 					Name:                          *e.Name,
 					NatIpAllocateOption:           *e.NATIPAllocationOption,
 					SourceSubnetworkIpRangesToNat: *e.SourceSubnetworkIPRangesToNAT,
+					EnableDynamicPortAllocation:   true,
+					MaxPortsPerVm:                 3000,
+					MinPortsPerVm:                 1024,
 				},
 			},
 		}