Merge pull request GoogleCloudPlatform#4253 from SwarnaBharathiMantena/swarnabm/update-reservation-variable

Modify reservation variable to accommodate different reservation options, in the A3 Mega, A3 Ultra, A4, A4X GKE blueprints.

Author: SwarnaBharathiMantena

examples/gke-a3-megagpu/gke-a3-megagpu-deployment.yaml

@@ -42,6 +42,6 @@ vars:
 
   # The name of the compute engine reservation in the form of
   # <reservation-name>
-  # In order to target a BLOCK_NAME, extended_reservation can be inputted as
-  # <reservation-name>/reservationBlocks/<reservation-block-name>
-  extended_reservation: RESERVATION_NAME
+  # To target a BLOCK_NAME, the name of the extended reservation
+  # can be inputted as <reservation-name>/reservationBlocks/<reservation-block-name>
+  reservation: RESERVATION_NAME

examples/gke-a3-megagpu/gke-a3-megagpu.yaml

@@ -43,9 +43,9 @@ vars:
 
   # The name of the compute engine reservation in the form of
   # <reservation-name>
-  # In order to target a BLOCK_NAME, extended_reservation can be inputted as
-  # <reservation-name>/reservationBlocks/<reservation-block-name>
-  extended_reservation:
+  # To target a BLOCK_NAME, the name of the extended reservation
+  # can be inputted as <reservation-name>/reservationBlocks/<reservation-block-name>
+  reservation:
 
   accelerator_type: nvidia-h100-mega-80gb
   version_prefix: "1.32."
@@ -130,7 +130,7 @@ deployment_groups:
       reservation_affinity:
         consume_reservation_type: SPECIFIC_RESERVATION
         specific_reservations:
-        - name: $(vars.extended_reservation)
+        - name: $(vars.reservation)
     outputs: [instructions]
 
   - id: workload_manager_install

examples/gke-a3-ultragpu/gke-a3-ultragpu-deployment.yaml

@@ -28,9 +28,9 @@ vars:
   authorized_cidr: IP_ADDRESS/SUFFIX
   # The name of the compute engine reservation in the form of
   # <reservation-name>
-  # In order to target a BLOCK_NAME, extended_reservation can be inputted as
-  # <reservation-name>/reservationBlocks/<reservation-block-name>
-  extended_reservation: RESERVATION_NAME
+  # To target a BLOCK_NAME, the name of the extended reservation
+  # can be inputted as <reservation-name>/reservationBlocks/<reservation-block-name>
+  reservation: RESERVATION_NAME
   static_node_count: NODE_COUNT
   system_node_pool_disk_size_gb: SYSTEM_NODE_POOL_DISK_SIZE_GB # the size of
   # disk for each node of the system node pool.

examples/gke-a3-ultragpu/gke-a3-ultragpu.yaml

@@ -24,9 +24,9 @@ vars:
   authorized_cidr: # add this
   # The name of the compute engine reservation in the form of
   # <reservation-name>
-  # In order to target a BLOCK_NAME, extended_reservation can be inputted as
-  # <reservation-name>/reservationBlocks/<reservation-block-name>
-  extended_reservation: # add this
+  # To target a BLOCK_NAME, the name of the extended reservation
+  # can be inputted as <reservation-name>/reservationBlocks/<reservation-block-name>
+  reservation: # add this
   kueue_configuration_path: $(ghpc_stage("./kueue-configuration.yaml.tftpl"))
   gib_installer_path: $(ghpc_stage("./nccl-installer.yaml.tftpl"))
   static_node_count: # add this
@@ -191,7 +191,7 @@ deployment_groups:
       reservation_affinity:
         consume_reservation_type: SPECIFIC_RESERVATION
         specific_reservations:
-        - name: $(vars.extended_reservation)
+        - name: $(vars.reservation)
       additional_networks:
         $(concat(
           [{

examples/gke-a4/gke-a4-deployment.yaml

@@ -42,9 +42,9 @@ vars:
 
   # The name of the compute engine reservation in the form of
   # <reservation-name>
-  # In order to target a BLOCK_NAME, extended_reservation can be inputted as
-  # <reservation-name>/reservationBlocks/<reservation-block-name>
-  extended_reservation:
+  # To target a BLOCK_NAME, the name of the extended reservation
+  # can be inputted as <reservation-name>/reservationBlocks/<reservation-block-name>
+  reservation:
 
   # The disk size of system node pool for this deployment.
   system_node_pool_disk_size_gb:

examples/gke-a4/gke-a4.yaml

@@ -39,9 +39,9 @@ vars:
 
   # The name of the compute engine reservation in the form of
   # <reservation-name>
-  # In order to target a BLOCK_NAME, extended_reservation can be inputted as
-  # <reservation-name>/reservationBlocks/<reservation-block-name>
-  extended_reservation:
+  # To target a BLOCK_NAME, the name of the extended reservation
+  # can be inputted as <reservation-name>/reservationBlocks/<reservation-block-name>
+  reservation:
 
   kueue_configuration_path: $(ghpc_stage("./kueue-configuration.yaml.tftpl"))
   gib_installer_path: $(ghpc_stage("./nccl-installer.yaml.tftpl"))
@@ -207,7 +207,7 @@ deployment_groups:
       reservation_affinity:
         consume_reservation_type: SPECIFIC_RESERVATION
         specific_reservations:
-        - name: $(vars.extended_reservation)
+        - name: $(vars.reservation)
       additional_networks:
         $(concat(
           [{

examples/gke-a4x/gke-a4x-deployment.yaml

@@ -42,9 +42,9 @@ vars:
 
   # The name of the compute engine reservation in the form of
   # <reservation-name>
-  # In order to target a BLOCK_NAME, extended_reservation can be inputted as
-  # <reservation-name>/reservationBlocks/<reservation-block-name>
-  extended_reservation:
+  # To target a BLOCK_NAME, the name of the extended reservation
+  # can be inputted as <reservation-name>/reservationBlocks/<reservation-block-name>
+  reservation:
 
   # The disk size of system node pool for this deployment.
   system_node_pool_disk_size_gb:

examples/gke-a4x/gke-a4x.yaml

@@ -44,9 +44,9 @@ vars:
 
   # The name of the compute engine reservation of A4X nodes in the form of
   # <project>/<reservation-name>
-  # In order to target a BLOCK_NAME, extended_reservation can be inputted as
-  # <project>/<reservation-name>/reservationBlocks/<reservation-block-name>
-  extended_reservation:
+  # To target a BLOCK_NAME, the name of the extended reservation
+  # can be inputted as <reservation-name>/reservationBlocks/<reservation-block-name>
+  reservation:
   compute_nodepool_machine_type: a4x-highgpu-4g-nolssd
   system_nodepool_machine_type: e2-standard-16
 
@@ -233,7 +233,7 @@ deployment_groups:
       reservation_affinity:
         consume_reservation_type: SPECIFIC_RESERVATION
         specific_reservations:
-        - name: $(vars.extended_reservation)
+        - name: $(vars.reservation)
       additional_networks:
         $(concat(
           [{

tools/cloud-build/daily-tests/tests/gke-a3-megagpu.yml

@@ -33,7 +33,7 @@ cli_deployment_vars:
   region: "{{ region }}"
   zone: "{{ zone }}"
   static_node_count: "{{ static_node_count }}"
-  extended_reservation: "{{ extended_reservation }}"
+  reservation: "{{ extended_reservation }}"
   authorized_cidr: "{{ build_ip.stdout }}/32"
   network_name: "{{ network }}"
   local_ssd_count_nvme_block: 16

tools/cloud-build/daily-tests/tests/gke-a3-ultragpu.yml

@@ -33,7 +33,7 @@ cli_deployment_vars:
   region: "{{ region }}"
   zone: "{{ zone }}"
   static_node_count: "{{ static_node_count }}"
-  extended_reservation: "{{ extended_reservation }}"
+  reservation: "{{ extended_reservation }}"
   authorized_cidr: "{{ build_ip.stdout }}/32"
   gcp_public_cidrs_access_enabled: true
 custom_vars: