Skip to content

Commit 3140307

Browse files
kayla-c98Maxrovr
authored andcommitted
Added - Support for Preemptible Worker NOdes
1 parent 742e30b commit 3140307

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

internal/integrationtest/containerengine_node_pool_test.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,14 @@ var (
7575
"capacity_reservation_id": acctest.Representation{RepType: acctest.Optional, Update: `${oci_core_compute_capacity_reservation.test_compute_capacity_reservation.id}`},
7676
}
7777

78+
nodePreemptibleNodeConfigRepresentation = map[string]interface{}{
79+
"preemption_action": acctest.RepresentationGroup{RepType: acctest.Required, Group: nodePreemptibleNodeConfigPreemptionActionRepresentation},
80+
}
81+
nodePreemptibleNodeConfigPreemptionActionRepresentation = map[string]interface{}{
82+
"type": acctest.Representation{RepType: acctest.Required, Create: `TERMINATE`},
83+
"is_preserve_boot_volume": acctest.Representation{RepType: acctest.Required, Create: `false`},
84+
}
85+
7886
ContainerengineNodePoolInitialNodeLabelsRepresentation = map[string]interface{}{
7987
"key": acctest.Representation{RepType: acctest.Optional, Create: `key`, Update: `key2`},
8088
"value": acctest.Representation{RepType: acctest.Optional, Create: `value`, Update: `value2`},

internal/service/containerengine/containerengine_node_pool_resource.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1907,9 +1907,6 @@ func placementConfigsHashCodeForSets(v interface{}) int {
19071907
if capacityReservationId, ok := m["capacity_reservation_id"]; ok && capacityReservationId != "" {
19081908
buf.WriteString(fmt.Sprintf("%v-", capacityReservationId))
19091909
}
1910-
<<<<<<< ours
1911-
if faultDomains, ok := m["fault_domains"]; ok && faultDomains != "" {
1912-
}
19131910
if preemptibleNodeConfig, ok := m["preemptible_node_config"]; ok {
19141911
if tmpList := preemptibleNodeConfig.([]interface{}); len(tmpList) > 0 {
19151912
buf.WriteString("preemptible_node_config-")
@@ -1928,8 +1925,6 @@ func placementConfigsHashCodeForSets(v interface{}) int {
19281925
}
19291926
}
19301927
}
1931-
=======
1932-
>>>>>>> theirs
19331928
if subnetId, ok := m["subnet_id"]; ok && subnetId != "" {
19341929
buf.WriteString(fmt.Sprintf("%v-", subnetId))
19351930
}

0 commit comments

Comments
 (0)