@@ -102,10 +102,10 @@ def instance_properties(nodeset:object, model:str, placement_group:Optional[str]
102
102
props .resourcePolicies = [placement_group ]
103
103
104
104
if reservation := lookup ().nodeset_reservation (nodeset ):
105
- update_reservation_props (reservation , props , placement_group , False )
105
+ update_reservation_props (reservation , props , placement_group )
106
106
107
107
if (fr := lookup ().future_reservation (nodeset )) and fr .specific :
108
- update_reservation_props (fr .active_reservation , props , placement_group , True )
108
+ update_reservation_props (fr .active_reservation , props , placement_group )
109
109
110
110
if props .resourcePolicies :
111
111
props .scheduling .onHostMaintenance = "TERMINATE"
@@ -120,14 +120,14 @@ def instance_properties(nodeset:object, model:str, placement_group:Optional[str]
120
120
props .update (nodeset .get ("instance_properties" ) or {})
121
121
return props
122
122
123
- def update_reservation_props (reservation :object , props :object , placement_group :Optional [str ], reservation_from_fr : bool ) -> None :
123
+ def update_reservation_props (reservation :object , props :object , placement_group :Optional [str ]) -> None :
124
124
props .reservationAffinity = {
125
125
"consumeReservationType" : "SPECIFIC_RESERVATION" ,
126
126
"key" : f"compute.{ util .universe_domain ()} /reservation-name" ,
127
127
"values" : [reservation .bulk_insert_name ],
128
128
}
129
129
130
- if reservation .dense or reservation_from_fr :
130
+ if reservation .dense :
131
131
props .scheduling .provisioningModel = "RESERVATION_BOUND"
132
132
133
133
# Figure out `resourcePolicies`
0 commit comments