Bug Fix - trigger recreation while change subnet_id for endpoint config and ignore order in configurations for addons

Author: Terraform Team Automation

examples/container_engine/addons/main.tf

@@ -1,68 +1,39 @@
 // Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
 // Licensed under the Mozilla Public License v2.0
-
-variable "tenancy_ocid" {
+variable "user_ocid" {
 }
 
-variable "cluster_id" {
-
+variable "fingerprint" {
 }
 
-variable "kubernetes_version" {
-
+variable "private_key_path" {
 }
 
-variable "compartment_ocid" {
+variable "region" {
+  default = "us-ashburn-1"
 }
 
-variable "image_id" {
 
+variable "tenancy_ocid" {
 }
 
-data "oci_containerengine_addon_options" "all" {
-    #Required
-    kubernetes_version = var.kubernetes_version
-}
+variable "cluster_id" {
 
-data "oci_containerengine_addon_options" "name_filter_example" {
-    #Required
-    kubernetes_version = var.kubernetes_version
-    #Optional, a name uniquely identifies an add-on, see all supported add-on names in data.oci_containerengine_addon_options.all.addon_options
-    addon_name = "KubernetesDashboard"
 }
 
-resource "oci_containerengine_addon" "addon_resource_example" {
-    #Required, a name uniquely identifies an add-on, see all supported add-on names in data.oci_containerengine_addon_options.all.addon_options
-    addon_name = "KubernetesDashboard"
-    #Required
-    cluster_id = var.cluster_id
-    #Required, false values keeps installed resources of the addon on deletion. Set to true to fully remove resources
-    remove_addon_resources_on_delete = true
-
-    /*
-    configurations that are supported by the add-on specified by the addon_name, see all supported configurations in in data.oci_containerengine_addon_options.all.addon_options.
-    Unless required by a specific add-on, most of add-ons only have optional configurations that allow customization.
-    */
-     configurations {
+variable "kubernetes_version" {
 
-     }
-    /*
-    Optional, see all supported version in in data.oci_containerengine_addon_options.all.addon_options.
-    It is highly recommended to not set this field to let service choose and manage addon version.
-    */
-    version = "v1.0.0"
 }
 
-data "oci_containerengine_addons" "addon_addon_data_source_list_example" {
-    #Required
-    cluster_id = var.cluster_id
+variable "compartment_ocid" {
 }
 
-data "oci_containerengine_addon" "addon_data_source_singular_example" {
-    #Required
-    cluster_id = var.cluster_id
-    #Required, a name uniquely identifies an add-on, see all supported add-on names in data.oci_containerengine_addon_options.all.addon_options
-    addon_name = "KubernetesDashboard"
+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
 }
 
 /*
@@ -113,7 +84,7 @@ resource "oci_core_subnet" "nodePool_Subnet_1" {
 resource "oci_containerengine_cluster" "test_cluster" {
     #Required
     compartment_id     = var.compartment_ocid
-    kubernetes_version = var.kubernetes_version
+    kubernetes_version = reverse(data.oci_containerengine_cluster_option.test_cluster_option.kubernetes_versions)[0]
     name               = "tfTestCluster"
     vcn_id             = oci_core_vcn.test_vcn.id
     type               = "ENHANCED_CLUSTER"
@@ -126,13 +97,21 @@ resource "oci_containerengine_addon" "dashboard" {
     cluster_id = oci_containerengine_cluster.test_cluster.id
     #Required, remove the resource on addon deletion
     remove_addon_resources_on_delete = true
+    dynamic configurations {
+        for_each = local.addon_mappings
+
+        content {
+            key =configurations.value.key
+            value = configurations.value.value
+            }
+        }
 }
 
 resource "oci_containerengine_node_pool" "test_node_pool" {
     #Required
     cluster_id         = oci_containerengine_cluster.test_cluster.id
     compartment_id     = var.compartment_ocid
-    kubernetes_version = var.kubernetes_version
+    kubernetes_version = reverse(data.oci_containerengine_cluster_option.test_cluster_option.kubernetes_versions)[0]
     name               = "tfPool"
     node_shape         = "VM.Standard2.1"
 
@@ -146,7 +125,7 @@ resource "oci_containerengine_node_pool" "test_node_pool" {
 
     node_source_details {
         #Required
-        image_id    = var.image_id
+        image_id    = local.image_id
         source_type = "IMAGE"
 
         #Optional
@@ -155,4 +134,40 @@ resource "oci_containerengine_node_pool" "test_node_pool" {
 
     //use terraform depends_on to enforce cluster->add-on->node pool DAG
     depends_on = [oci_containerengine_addon.dashboard]
+}
+
+data "oci_containerengine_cluster_option" "test_cluster_option" {
+  cluster_option_id = "all"
+}
+
+data "oci_containerengine_node_pool_option" "test_node_pool_option" {
+  node_pool_option_id = "all"
+}
+
+data "oci_core_images" "shape_specific_images" {
+  #Required
+  compartment_id = var.tenancy_ocid
+  shape = "VM.Standard2.1"
+}
+
+locals {
+  all_images = "${data.oci_core_images.shape_specific_images.images}"
+  all_sources = "${data.oci_containerengine_node_pool_option.test_node_pool_option.sources}"
+
+  compartment_images = [for image in local.all_images : image.id if length(regexall("Oracle-Linux-[0-9]*.[0-9]*-20[0-9]*",image.display_name)) > 0 ]
+
+  oracle_linux_images = [for source in local.all_sources : source.image_id if length(regexall("Oracle-Linux-[0-9]*.[0-9]*-20[0-9]*",source.source_name)) > 0]
+
+  image_id = tolist(setintersection( toset(local.compartment_images), toset(local.oracle_linux_images)))[0]
+
+  addon_mappings = {
+        mapping1 = {
+            key = "numOfReplicas"
+            value = "1"
+        }
+        mapping2 = {
+            key = "nodeSelectors"
+            value = "{\"pool\":\"system\"}"
+        }
+  }
 }

examples/container_engine/main.tf

@@ -166,7 +166,7 @@ resource "oci_core_subnet" "nodePool_Subnet_2" {
 resource "oci_containerengine_cluster" "test_cluster" {
   #Required
   compartment_id     = var.compartment_ocid
-  kubernetes_version = data.oci_containerengine_cluster_option.test_cluster_option.kubernetes_versions[0]
+  kubernetes_version = reverse(data.oci_containerengine_cluster_option.test_cluster_option.kubernetes_versions)[0]
   name               = "tfTestCluster"
   vcn_id             = oci_core_vcn.test_vcn.id
 

internal/integrationtest/containerengine_cluster_test.go

@@ -131,14 +131,12 @@ func TestContainerengineClusterResource_basic(t *testing.T) {
 				resource.TestCheckResourceAttrSet(resourceName, "kubernetes_version"),
 				resource.TestCheckResourceAttr(resourceName, "name", "name"),
 				resource.TestCheckResourceAttrSet(resourceName, "vcn_id"),
-
 				func(s *terraform.State) (err error) {
 					resId, err = acctest.FromInstanceState(s, resourceName, "id")
 					return err
 				},
 			),
 		},
-
 		// delete before next Create
 		{
 			Config: config + compartmentIdVariableStr + ContainerengineClusterResourceDependencies,

internal/service/containerengine/containerengine_addon_resource.go

@@ -51,9 +51,10 @@ func ContainerengineAddonResource() *schema.Resource {
 
 			// Optional
 			"configurations": {
-				Type:     schema.TypeList,
-				Optional: true,
-				Computed: true,
+				Type:             schema.TypeList,
+				Optional:         true,
+				Computed:         true,
+				DiffSuppressFunc: tfresource.ListOfMapEqualIgnoreOrderSuppressDiff,
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{
 						// Required

internal/service/containerengine/containerengine_cluster_resource.go

@@ -96,6 +96,7 @@ func ContainerengineClusterResource() *schema.Resource {
 						"subnet_id": {
 							Type:     schema.TypeString,
 							Required: true,
+							ForceNew: true,
 						},
 
 						// Optional

internal/tfresource/crud_helpers.go

@@ -560,6 +560,52 @@ func listEqualIgnoreOrderSuppressDiff(key string, d schemaResourceData) bool {
 	return true
 }
 
+func ListOfMapEqualIgnoreOrderSuppressDiff(key string, old string, new string, d *schema.ResourceData) bool {
+	return listOfMapEqualIgnoreOrderSuppressDiff(key, d)
+}
+
+func listOfMapEqualIgnoreOrderSuppressDiff(key string, d schemaResourceData) bool {
+	// Take only the field name, key might be field.#
+	oldRaw, newRaw := d.GetChange(strings.Split(key, ".")[0])
+	if newRaw == nil || oldRaw == nil {
+		return false
+	}
+	oldList := oldRaw.([]interface{})
+	newList := newRaw.([]interface{})
+
+	if len(oldList) != len(newList) {
+		return false
+	}
+	tmp1 := make([]string, len(oldList))
+	tmp2 := make([]string, len(newList))
+
+	for i := range oldList {
+		map1 := oldList[i].(map[string]interface{})
+		jsonMap := GenericMapToJsonMap(map1)
+		s1, err := json.Marshal(jsonMap)
+		if err != nil {
+			return false
+		}
+		tmp1[i] = string(s1)
+
+		map2 := oldList[i].(map[string]interface{})
+		jsonMap2 := GenericMapToJsonMap(map2)
+		s2, err := json.Marshal(jsonMap2)
+		if err != nil {
+			return false
+		}
+		tmp2[i] = string(s2)
+	}
+	sort.Strings(tmp1)
+	sort.Strings(tmp2)
+	for i := range oldList {
+		if tmp1[i] != tmp2[i] {
+			return false
+		}
+	}
+	return true
+}
+
 func FieldDeprecatedAndAvoidReferences(deprecatedFieldName string) string {
 	return fmt.Sprintf("The '%s' field has been deprecated and may be removed in a future version. Do not use this field.", deprecatedFieldName)
 }

website/docs/d/containerengine_node_pools.html.markdown

@@ -102,24 +102,6 @@ The following attributes are exported:
 	* `boot_volume_size_in_gbs` - The size of the boot volume in GBs. Minimum value is 50 GB. See [here](https://docs.cloud.oracle.com/en-us/iaas/Content/Block/Concepts/bootvolumes.htm) for max custom boot volume sizing and OS-specific requirements.
 	* `image_id` - The OCID of the image used to boot the node.
 	* `source_type` - The source type for the node. Use `IMAGE` when specifying an OCID of an image. 
-* `nodes` - The nodes in the node pool.
-	* `availability_domain` - The name of the availability domain in which this node is placed.
-	* `defined_tags` - Defined tags for this resource. Each key is predefined and scoped to a namespace. For more information, see [Resource Tags](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/resourcetags.htm). Example: `{"Operations.CostCenter": "42"}` 
-	* `error` - An error that may be associated with the node.
-		* `code` - A short error code that defines the upstream error, meant for programmatic parsing. See [API Errors](https://docs.cloud.oracle.com/iaas/Content/API/References/apierrors.htm).
-		* `message` - A human-readable error string of the upstream error.
-		* `status` - The status of the HTTP response encountered in the upstream error.
-	* `fault_domain` - The fault domain of this node.
-	* `freeform_tags` - Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. For more information, see [Resource Tags](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/resourcetags.htm). Example: `{"Department": "Finance"}` 
-	* `id` - The OCID of the compute instance backing this node.
-	* `kubernetes_version` - The version of Kubernetes this node is running.
-	* `lifecycle_details` - Details about the state of the node.
-	* `name` - The name of the node.
-	* `node_pool_id` - The OCID of the node pool to which this node belongs.
-	* `private_ip` - The private IP address of this node.
-	* `public_ip` - The public IP address of this node.
-	* `state` - The state of the node.
-	* `subnet_id` - The OCID of the subnet in which this node is placed.
 * `quantity_per_subnet` - The number of nodes in each subnet.
 * `ssh_public_key` - The SSH public key on each node in the node pool on launch.
 * `state` - The state of the nodepool.