Bug Fix - allow update native pod networking, only update placement config when there is a change

Author: XinruXiao-9

examples/container_engine/main.tf

@@ -70,10 +70,8 @@ variable defined_tag_namespace_name {
 
 provider "oci" {
   region           = var.region
-  tenancy_ocid     = var.tenancy_ocid
-  user_ocid        = var.user_ocid
-  fingerprint      = var.fingerprint
-  private_key_path = var.private_key_path
+  auth = "SecurityToken"
+  config_file_profile = "terraform-federation-test"
 }
 
 resource "oci_identity_tag_namespace" "tag-namespace1" {
@@ -111,7 +109,7 @@ data "oci_kms_vault" "test_vault" {
 
 data "oci_kms_keys" "test_keys_dependency_RSA" {
   #Required
-  compartment_id = var.tenancy_ocid
+  compartment_id = var.compartment_ocid
   management_endpoint = data.oci_kms_vault.test_vault.management_endpoint
   algorithm = "RSA"
 
@@ -284,8 +282,8 @@ resource "oci_containerengine_node_pool" "test_flex_shape_node_pool" {
   compartment_id     = var.compartment_ocid
   kubernetes_version = reverse(data.oci_containerengine_cluster_option.test_cluster_option.kubernetes_versions)[0]
   name               = "flexShapePool"
-  node_shape         = "VM.Standard.E3.Flex"
-  subnet_ids         = [oci_core_subnet.nodePool_Subnet_1.id, oci_core_subnet.nodePool_Subnet_2.id]
+  node_shape         = "VM.Standard.E4.Flex"
+  subnet_ids         = [oci_core_subnet.nodePool_Subnet_1.id]
 
   node_source_details {
     #Required
@@ -344,6 +342,7 @@ data "oci_containerengine_cluster_option" "test_cluster_option" {
 
 data "oci_containerengine_node_pool_option" "test_node_pool_option" {
   node_pool_option_id = "all"
+  compartment_id = var.compartment_ocid
 }
 
 data "oci_core_images" "shape_specific_images" {

examples/container_engine/regional_subnet/variables.tf

@@ -46,7 +46,7 @@ variable "node_pool_node_shape" {
 }
 
 variable "node_pool_quantity_per_subnet" {
-  default = 2
+  default = 1
 }
 
 variable "node_pool_ssh_public_key" {

internal/integrationtest/containerengine_node_pool_option_test.go

@@ -18,7 +18,7 @@ import (
 var (
 	ContainerengineContainerengineNodePoolOptionSingularDataSourceRepresentation = map[string]interface{}{
 		"node_pool_option_id": acctest.Representation{RepType: acctest.Required, Create: `all`},
-		"compartment_id":      acctest.Representation{RepType: acctest.Optional, Create: `${var.compartment_id}`},
+		"compartment_id":      acctest.Representation{RepType: acctest.Required, Create: `${var.compartment_id}`},
 	}
 
 	ContainerengineNodePoolOptionResourceConfig = ""

internal/integrationtest/containerengine_node_pool_resource_test.go

@@ -58,6 +58,7 @@ var (
 		"placement_configs": acctest.RepresentationGroup{RepType: acctest.Required, Group: nodePoolNodeConfigDetailsPlacementConfigsRepresentation},
 		"size":              acctest.Representation{RepType: acctest.Required, Create: `2`, Update: `4`},
 	}
+
 	nodePoolNodeConfigDetailsPlacementConfigsRepresentation = map[string]interface{}{
 		"availability_domain": acctest.Representation{RepType: acctest.Required, Create: `${data.oci_identity_availability_domains.test_availability_domains.availability_domains.0.name}`, Update: `${data.oci_identity_availability_domains.test_availability_domains.availability_domains.0.name}`},
 		"subnet_id":           acctest.Representation{RepType: acctest.Required, Create: `${oci_core_subnet.node_pool_regional_subnet_1.id}`, Update: `${oci_core_subnet.node_pool_regional_subnet_2.id}`},

internal/integrationtest/containerengine_node_pool_test.go

@@ -175,7 +175,7 @@ var (
 		DefinedTagsDependencies +
 		acctest.GenerateResourceFromRepresentationMap("oci_core_compute_capacity_reservation", "test_compute_capacity_reservation", acctest.Optional, acctest.Create, acctest.RepresentationCopyWithNewProperties(CoreComputeCapacityReservationRepresentation, map[string]interface{}{
 			"compartment_id": acctest.Representation{RepType: acctest.Required, Create: `${var.tenancy_ocid}`}, "instance_reservation_configs": acctest.RepresentationGroup{RepType: acctest.Required, Group: acctest.RepresentationCopyWithNewProperties(CoreComputeCapacityReservationInstanceReservationConfigsRepresentation, map[string]interface{}{
-				"instance_shape": acctest.Representation{RepType: acctest.Required, Create: `VM.Standard2.1`}, "fault_domain": acctest.Representation{RepType: acctest.Optional, Create: `FAULT-DOMAIN-1`}, "reserved_count": acctest.Representation{RepType: acctest.Required, Create: `6`},
+				"instance_shape": acctest.Representation{RepType: acctest.Required, Create: `VM.Standard2.1`}, "fault_domain": acctest.Representation{RepType: acctest.Optional, Create: `FAULT-DOMAIN-1`}, "reserved_count": acctest.Representation{RepType: acctest.Required, Create: `6`}, "cluster_placement_group_id": acctest.Representation{RepType: acctest.Optional, Create: ``},
 			})}}))
 )
 

internal/service/containerengine/containerengine_node_pool_resource.go

@@ -240,6 +240,7 @@ func ContainerengineNodePoolResource() *schema.Resource {
 											"FLANNEL_OVERLAY",
 											"OCI_VCN_IP_NATIVE",
 										}, true),
+										ForceNew: true,
 									},
 
 									// Optional
@@ -1770,7 +1771,6 @@ func NodePoolPlacementConfigDetailsToMap(obj oci_containerengine.NodePoolPlaceme
 	if obj.SubnetId != nil {
 		result["subnet_id"] = string(*obj.SubnetId)
 	}
-
 	return result
 }
 
@@ -2044,8 +2044,6 @@ func (s *ContainerengineNodePoolResourceCrud) hasNodeConfigDetailsChange(fieldKe
 
 func (s *ContainerengineNodePoolResourceCrud) mapToUpdateNodePoolNodeConfigDetails(fieldKeyFormat string) (oci_containerengine.UpdateNodePoolNodeConfigDetails, error) {
 	result := oci_containerengine.UpdateNodePoolNodeConfigDetails{}
-
-	result.PlacementConfigs = []oci_containerengine.NodePoolPlacementConfigDetails{}
 	if placementConfigs, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "placement_configs")); ok {
 		set := placementConfigs.(*schema.Set)
 		interfaces := set.List()
@@ -2059,34 +2057,45 @@ func (s *ContainerengineNodePoolResourceCrud) mapToUpdateNodePoolNodeConfigDetai
 			}
 			tmp[i] = converted
 		}
-		if len(tmp) != 0 || s.D.HasChange(fmt.Sprintf(fieldKeyFormat, "placement_configs")) {
+		if len(tmp) != 0 && s.D.HasChange(fmt.Sprintf(fieldKeyFormat, "placement_configs")) {
 			result.PlacementConfigs = tmp
 		}
 	}
 
-	if size, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "size")); ok {
+	if nodePoolPodNetworkOptionDetails, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "node_pool_pod_network_option_details")); ok && s.D.HasChange(fmt.Sprintf(fieldKeyFormat, "node_pool_pod_network_option_details")) {
+		if tmpList := nodePoolPodNetworkOptionDetails.([]interface{}); len(tmpList) > 0 {
+			fieldKeyFormatNextLevel := fmt.Sprintf("%s.%d.%%s", fmt.Sprintf(fieldKeyFormat, "node_pool_pod_network_option_details"), 0)
+			tmp, err := s.mapToNodePoolPodNetworkOptionDetails(fieldKeyFormatNextLevel)
+			if err != nil {
+				return result, err
+			}
+			result.NodePoolPodNetworkOptionDetails = tmp
+		}
+	}
+
+	if size, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "size")); ok && s.D.HasChange(fmt.Sprintf(fieldKeyFormat, "size")) {
 		tmp := size.(int)
 		result.Size = &tmp
 	}
 
-	if isPvEncryptionInTransitEnabled, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "is_pv_encryption_in_transit_enabled")); ok {
+	if isPvEncryptionInTransitEnabled, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "is_pv_encryption_in_transit_enabled")); ok && s.D.HasChange(fmt.Sprintf(fieldKeyFormat, "is_pv_encryption_in_transit_enabled")) {
 		tmp := isPvEncryptionInTransitEnabled.(bool)
 		result.IsPvEncryptionInTransitEnabled = &tmp
 	}
 
-	if kmsKeyId, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "kms_key_id")); ok {
+	if kmsKeyId, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "kms_key_id")); ok && s.D.HasChange(fmt.Sprintf(fieldKeyFormat, "kms_key_id")) {
 		tmp := kmsKeyId.(string)
 		result.KmsKeyId = &tmp
 	}
-	if definedTags, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "defined_tags")); ok {
+	if definedTags, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "defined_tags")); ok && s.D.HasChange(fmt.Sprintf(fieldKeyFormat, "defined_tags")) {
 		tmp, err := tfresource.MapToDefinedTags(definedTags.(map[string]interface{}))
 		if err != nil {
 			return result, fmt.Errorf("unable to convert defined_tags, encountered error: %v", err)
 		}
 		result.DefinedTags = tmp
 	}
 
-	if freeformTags, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "freeform_tags")); ok {
+	if freeformTags, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "freeform_tags")); ok && s.D.HasChange(fmt.Sprintf(fieldKeyFormat, "freeform_tags")) {
 		result.FreeformTags = tfresource.ObjectMapToStringMap(freeformTags.(map[string]interface{}))
 	}