gcve: extend dhcp range and change boskos userdata ip range

Author: chrischdi

infra/gcp/terraform/k8s-infra-gcp-gcve/vsphere/nsx-t.tf

@@ -43,7 +43,7 @@ resource "nsxt_policy_segment" "k8s-ci" {
 
   subnet {
     cidr        = "192.168.32.1/21"
-    dhcp_ranges = ["192.168.32.10-192.168.32.255"]
+    dhcp_ranges = ["192.168.32.10-192.168.33.255"]
 
     dhcp_v4_config {
       server_address = "192.168.32.2/21"

infra/gcp/terraform/k8s-infra-gcp-gcve/vsphere/scripts/boskos-userdata.sh

@@ -14,19 +14,28 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# The network used is 192.168.0.32/21
+# Usable Host IP Range:	192.168.32.1 - 192.168.39.254:
+# DHCP Range: 192.168.32.10 - 192.168.33.255
+# Used IPPool for 40 Projects having 16 IPs each: 192.168.35.0 - 192.168.37.127
 function printProjectUserData() {
   NR="${1}"
 
-  S2="$(($(($((NR-1))*16))))"
-  E2="$(($((NR*16))-1))"
+  IPS_PER_PROJECT=16
+  # Starting at 192.168.35.0 and allowing usage up to 192.168.39.254
+  # allows a maximum of 79 projects
+  RANGE_START=35
 
-  S1="$((S2/256))"
-  E1="$((E2/256))"
-  S2="$((S2%256))"
-  E2="$((E2%256))"
+  S2="$(( (NR - 1) * IPS_PER_PROJECT ))"
+  E2="$(( (NR * IPS_PER_PROJECT) - 1 ))"
 
-  START="192.168.$((33+S1)).${S2}"
-  END="192.168.$((33+E1)).${E2}"
+  S1="$(( S2 / 256 ))"
+  E1="$(( E2 / 256 ))"
+  S2="$(( S2 % 256 ))"
+  E2="$(( E2 % 256 ))"
+
+  START="192.168.$(( RANGE_START + S1 )).${S2}"
+  END="192.168.$(( RANGE_START + E1 )).${E2}"
 
   printf "k8s-infra-e2e-gcp-gcve-project-%03d:\n" "${NR}"
   printf "  folder: /Datacenter/vm/prow/k8s-infra-e2e-gcp-gcve-project-%03d\n" "${NR}"