Add support for node metadata in OKE NodePools

Author: abhilash-av

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ### Added
 - Support for cloning of Autonomous Databases
+- Support for node metadata in container engine node pool
 
 ## 3.18.0 (March 13, 2019)
 

oci/containerengine_node_pool_data_source.go

@@ -65,6 +65,11 @@ func ContainerengineNodePoolDataSource() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+			"node_metadata": {
+				Type:     schema.TypeMap,
+				Computed: true,
+				Elem:     schema.TypeString,
+			},
 			"node_shape": {
 				Type:     schema.TypeString,
 				Computed: true,
@@ -234,6 +239,8 @@ func (s *ContainerengineNodePoolDataSourceCrud) SetData() error {
 		s.D.Set("node_image_name", *s.Res.NodeImageName)
 	}
 
+	s.D.Set("node_metadata", s.Res.NodeMetadata)
+
 	if s.Res.NodeShape != nil {
 		s.D.Set("node_shape", *s.Res.NodeShape)
 	}

oci/containerengine_node_pool_resource.go

@@ -99,6 +99,13 @@ func ContainerengineNodePoolResource() *schema.Resource {
 					},
 				},
 			},
+			"node_metadata": {
+				Type:     schema.TypeMap,
+				Optional: true,
+				Computed: true,
+				ForceNew: true,
+				Elem:     schema.TypeString,
+			},
 			"quantity_per_subnet": {
 				Type:     schema.TypeInt,
 				Optional: true,
@@ -281,6 +288,10 @@ func (s *ContainerengineNodePoolResourceCrud) Create() error {
 		request.NodeImageName = &tmp
 	}
 
+	if nodeMetadata, ok := s.D.GetOkExists("node_metadata"); ok {
+		request.NodeMetadata = objectMapToStringMap(nodeMetadata.(map[string]interface{}))
+	}
+
 	if nodeShape, ok := s.D.GetOkExists("node_shape"); ok {
 		tmp := nodeShape.(string)
 		request.NodeShape = &tmp
@@ -510,6 +521,8 @@ func (s *ContainerengineNodePoolResourceCrud) SetData() error {
 		s.D.Set("node_image_name", *s.Res.NodeImageName)
 	}
 
+	s.D.Set("node_metadata", s.Res.NodeMetadata)
+
 	if s.Res.NodeShape != nil {
 		s.D.Set("node_shape", *s.Res.NodeShape)
 	}

oci/containerengine_node_pool_test.go

@@ -57,6 +57,7 @@ var (
 		"node_shape":          Representation{repType: Required, create: `VM.Standard2.1`},
 		"subnet_ids":          Representation{repType: Required, create: []string{`${oci_core_subnet.nodePool_Subnet_1.id}`, `${oci_core_subnet.nodePool_Subnet_2.id}`}},
 		"initial_node_labels": RepresentationGroup{Optional, nodePoolInitialNodeLabelsRepresentation},
+		"node_metadata":       Representation{repType: Optional, create: map[string]string{"nodeMetadata": "nodeMetadata"}, update: map[string]string{"nodeMetadata2": "nodeMetadata2"}},
 		"quantity_per_subnet": Representation{repType: Optional, create: `1`, update: `2`},
 		"ssh_public_key":      Representation{repType: Optional, create: `ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDOuBJgh6lTmQvQJ4BA3RCJdSmxRtmiXAQEEIP68/G4gF3XuZdKEYTFeputacmRq9yO5ZnNXgO9akdUgePpf8+CfFtveQxmN5xo3HVCDKxu/70lbMgeu7+wJzrMOlzj+a4zNq2j0Ww2VWMsisJ6eV3bJTnO/9VLGCOC8M9noaOlcKcLgIYy4aDM724MxFX2lgn7o6rVADHRxkvLEXPVqYT4syvYw+8OVSnNgE4MJLxaw8/2K0qp19YlQyiriIXfQpci3ThxwLjymYRPj+kjU1xIxv6qbFQzHR7ds0pSWp1U06cIoKPfCazU9hGWW8yIe/vzfTbWrt2DK6pLwBn/G0x3 sample`},
 	}
@@ -166,6 +167,7 @@ func TestContainerengineNodePoolResource_basic(t *testing.T) {
 					resource.TestCheckResourceAttrSet(resourceName, "kubernetes_version"),
 					resource.TestCheckResourceAttr(resourceName, "name", "name"),
 					resource.TestCheckResourceAttr(resourceName, "node_image_name", "Oracle-Linux-7.4"),
+					resource.TestCheckResourceAttr(resourceName, "node_metadata.%", "1"),
 					resource.TestCheckResourceAttr(resourceName, "node_shape", "VM.Standard2.1"),
 					resource.TestCheckResourceAttr(resourceName, "quantity_per_subnet", "1"),
 					resource.TestCheckResourceAttr(resourceName, "ssh_public_key", "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDOuBJgh6lTmQvQJ4BA3RCJdSmxRtmiXAQEEIP68/G4gF3XuZdKEYTFeputacmRq9yO5ZnNXgO9akdUgePpf8+CfFtveQxmN5xo3HVCDKxu/70lbMgeu7+wJzrMOlzj+a4zNq2j0Ww2VWMsisJ6eV3bJTnO/9VLGCOC8M9noaOlcKcLgIYy4aDM724MxFX2lgn7o6rVADHRxkvLEXPVqYT4syvYw+8OVSnNgE4MJLxaw8/2K0qp19YlQyiriIXfQpci3ThxwLjymYRPj+kjU1xIxv6qbFQzHR7ds0pSWp1U06cIoKPfCazU9hGWW8yIe/vzfTbWrt2DK6pLwBn/G0x3 sample"),
@@ -196,7 +198,7 @@ func TestContainerengineNodePoolResource_basic(t *testing.T) {
 			// verify updates to updatable parameters
 			{
 				Config: config + compartmentIdVariableStr + NodePoolResourceDependencies +
-					generateResourceFromRepresentationMap("oci_containerengine_node_pool", "test_node_pool", Optional, Update, nodePoolRepresentation) +
+					generateResourceFromRepresentationMap("oci_containerengine_node_pool", "test_node_pool", Optional, Update, getUpdatedRepresentationCopy("node_metadata", Representation{repType: Optional, update: map[string]string{"nodeMetadata": "nodeMetadata"}}, nodePoolRepresentation)) +
 					generateResourceFromRepresentationMap("oci_containerengine_node_pool", "test_node_pool_imageId", Optional, Update, nodePoolRepresentationForImageId),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					//Asserting Resource created with Image Name
@@ -208,6 +210,7 @@ func TestContainerengineNodePoolResource_basic(t *testing.T) {
 					resource.TestCheckResourceAttrSet(resourceName, "kubernetes_version"),
 					resource.TestCheckResourceAttr(resourceName, "name", "name2"),
 					resource.TestCheckResourceAttr(resourceName, "node_image_name", "Oracle-Linux-7.4"),
+					resource.TestCheckResourceAttr(resourceName, "node_metadata.%", "1"),
 					resource.TestCheckResourceAttr(resourceName, "node_shape", "VM.Standard2.1"),
 					resource.TestCheckResourceAttr(resourceName, "quantity_per_subnet", "2"),
 					resource.TestCheckResourceAttr(resourceName, "ssh_public_key", "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDOuBJgh6lTmQvQJ4BA3RCJdSmxRtmiXAQEEIP68/G4gF3XuZdKEYTFeputacmRq9yO5ZnNXgO9akdUgePpf8+CfFtveQxmN5xo3HVCDKxu/70lbMgeu7+wJzrMOlzj+a4zNq2j0Ww2VWMsisJ6eV3bJTnO/9VLGCOC8M9noaOlcKcLgIYy4aDM724MxFX2lgn7o6rVADHRxkvLEXPVqYT4syvYw+8OVSnNgE4MJLxaw8/2K0qp19YlQyiriIXfQpci3ThxwLjymYRPj+kjU1xIxv6qbFQzHR7ds0pSWp1U06cIoKPfCazU9hGWW8yIe/vzfTbWrt2DK6pLwBn/G0x3 sample"),
@@ -241,6 +244,55 @@ func TestContainerengineNodePoolResource_basic(t *testing.T) {
 				),
 			},
 
+			// verify updates to node_metadata should create new resource
+			{
+				Config: config + compartmentIdVariableStr + NodePoolResourceDependencies +
+					generateResourceFromRepresentationMap("oci_containerengine_node_pool", "test_node_pool", Optional, Update, nodePoolRepresentation) +
+					generateResourceFromRepresentationMap("oci_containerengine_node_pool", "test_node_pool_imageId", Optional, Update, nodePoolRepresentationForImageId),
+				Check: resource.ComposeAggregateTestCheckFunc(
+					//Asserting Resource created with Image Name
+					resource.TestCheckResourceAttrSet(resourceName, "cluster_id"),
+					resource.TestCheckResourceAttr(resourceName, "compartment_id", compartmentId),
+					resource.TestCheckResourceAttr(resourceName, "initial_node_labels.#", "1"),
+					resource.TestCheckResourceAttr(resourceName, "initial_node_labels.0.key", "key2"),
+					resource.TestCheckResourceAttr(resourceName, "initial_node_labels.0.value", "value2"),
+					resource.TestCheckResourceAttrSet(resourceName, "kubernetes_version"),
+					resource.TestCheckResourceAttr(resourceName, "name", "name2"),
+					resource.TestCheckResourceAttr(resourceName, "node_image_name", "Oracle-Linux-7.4"),
+					resource.TestCheckResourceAttr(resourceName, "node_metadata.%", "1"),
+					resource.TestCheckResourceAttr(resourceName, "node_shape", "VM.Standard2.1"),
+					resource.TestCheckResourceAttr(resourceName, "quantity_per_subnet", "2"),
+					resource.TestCheckResourceAttr(resourceName, "ssh_public_key", "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDOuBJgh6lTmQvQJ4BA3RCJdSmxRtmiXAQEEIP68/G4gF3XuZdKEYTFeputacmRq9yO5ZnNXgO9akdUgePpf8+CfFtveQxmN5xo3HVCDKxu/70lbMgeu7+wJzrMOlzj+a4zNq2j0Ww2VWMsisJ6eV3bJTnO/9VLGCOC8M9noaOlcKcLgIYy4aDM724MxFX2lgn7o6rVADHRxkvLEXPVqYT4syvYw+8OVSnNgE4MJLxaw8/2K0qp19YlQyiriIXfQpci3ThxwLjymYRPj+kjU1xIxv6qbFQzHR7ds0pSWp1U06cIoKPfCazU9hGWW8yIe/vzfTbWrt2DK6pLwBn/G0x3 sample"),
+					resource.TestCheckResourceAttr(resourceName, "subnet_ids.#", "2"),
+					//Asserting Resource created with Image Id
+					resource.TestCheckResourceAttrSet(resourceNameForImageId, "cluster_id"),
+					resource.TestCheckResourceAttr(resourceNameForImageId, "compartment_id", compartmentId),
+					resource.TestCheckResourceAttr(resourceNameForImageId, "initial_node_labels.#", "1"),
+					resource.TestCheckResourceAttr(resourceNameForImageId, "initial_node_labels.0.key", "key2"),
+					resource.TestCheckResourceAttr(resourceNameForImageId, "initial_node_labels.0.value", "value2"),
+					resource.TestCheckResourceAttrSet(resourceNameForImageId, "kubernetes_version"),
+					resource.TestCheckResourceAttr(resourceNameForImageId, "name", "name2"),
+					resource.TestCheckResourceAttrSet(resourceNameForImageId, "node_image_name"),
+					resource.TestCheckResourceAttrSet(resourceNameForImageId, "node_image_id"),
+					resource.TestCheckResourceAttr(resourceNameForImageId, "node_shape", "VM.Standard2.1"),
+					resource.TestCheckResourceAttr(resourceNameForImageId, "quantity_per_subnet", "2"),
+					resource.TestCheckResourceAttr(resourceNameForImageId, "ssh_public_key", "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDOuBJgh6lTmQvQJ4BA3RCJdSmxRtmiXAQEEIP68/G4gF3XuZdKEYTFeputacmRq9yO5ZnNXgO9akdUgePpf8+CfFtveQxmN5xo3HVCDKxu/70lbMgeu7+wJzrMOlzj+a4zNq2j0Ww2VWMsisJ6eV3bJTnO/9VLGCOC8M9noaOlcKcLgIYy4aDM724MxFX2lgn7o6rVADHRxkvLEXPVqYT4syvYw+8OVSnNgE4MJLxaw8/2K0qp19YlQyiriIXfQpci3ThxwLjymYRPj+kjU1xIxv6qbFQzHR7ds0pSWp1U06cIoKPfCazU9hGWW8yIe/vzfTbWrt2DK6pLwBn/G0x3 sample"),
+					resource.TestCheckResourceAttr(resourceNameForImageId, "subnet_ids.#", "2"),
+
+					func(s *terraform.State) (err error) {
+						resId2, err = fromInstanceState(s, resourceName, "id")
+						if resId == resId2 {
+							return fmt.Errorf("Resource updated when it was supposed to be recreated.")
+						}
+						resId2CreatedWithImageId, err = fromInstanceState(s, resourceNameForImageId, "id")
+						if resIdCreatedWithImageId != resId2CreatedWithImageId {
+							return fmt.Errorf("Resource recreated when it was supposed to be updated.")
+						}
+						return err
+					},
+				),
+			},
+
 			// verify datasource
 			{
 				Config: config +
@@ -308,6 +360,7 @@ func TestContainerengineNodePoolResource_basic(t *testing.T) {
 					resource.TestCheckResourceAttrSet(singularDatasourceName, "kubernetes_version"),
 					resource.TestCheckResourceAttr(singularDatasourceName, "name", "name2"),
 					resource.TestCheckResourceAttr(singularDatasourceName, "node_image_name", "Oracle-Linux-7.4"),
+					resource.TestCheckResourceAttr(singularDatasourceName, "node_metadata.%", "1"),
 					resource.TestCheckResourceAttr(singularDatasourceName, "node_shape", "VM.Standard2.1"),
 					resource.TestCheckResourceAttr(singularDatasourceName, "quantity_per_subnet", "2"),
 					resource.TestCheckResourceAttr(singularDatasourceName, "ssh_public_key", "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDOuBJgh6lTmQvQJ4BA3RCJdSmxRtmiXAQEEIP68/G4gF3XuZdKEYTFeputacmRq9yO5ZnNXgO9akdUgePpf8+CfFtveQxmN5xo3HVCDKxu/70lbMgeu7+wJzrMOlzj+a4zNq2j0Ww2VWMsisJ6eV3bJTnO/9VLGCOC8M9noaOlcKcLgIYy4aDM724MxFX2lgn7o6rVADHRxkvLEXPVqYT4syvYw+8OVSnNgE4MJLxaw8/2K0qp19YlQyiriIXfQpci3ThxwLjymYRPj+kjU1xIxv6qbFQzHR7ds0pSWp1U06cIoKPfCazU9hGWW8yIe/vzfTbWrt2DK6pLwBn/G0x3 sample"),

website/docs/d/containerengine_node_pool.html.markdown

@@ -41,6 +41,7 @@ The following attributes are exported:
 * `name` - The name of the node pool.
 * `node_image_id` - The OCID of the image running on the nodes in the node pool.
 * `node_image_name` - The name of the image running on the nodes in the node pool.
+* `node_metadata` - A list of key/value pairs to add to each underlyingOracle Cloud Infrastructure instance in the node pool.
 * `node_shape` - The name of the node shape of the nodes in the node pool.
 * `nodes` - The nodes in the node pool.
 	* `availability_domain` - The name of the availability domain in which this node is placed.

website/docs/d/containerengine_node_pools.html.markdown

@@ -53,6 +53,7 @@ The following attributes are exported:
 * `name` - The name of the node pool.
 * `node_image_id` - The OCID of the image running on the nodes in the node pool.
 * `node_image_name` - The name of the image running on the nodes in the node pool.
+* `node_metadata` - A list of key/value pairs to add to each underlyingOracle Cloud Infrastructure instance in the node pool.
 * `node_shape` - The name of the node shape of the nodes in the node pool.
 * `nodes` - The nodes in the node pool.
 	* `availability_domain` - The name of the availability domain in which this node is placed.

website/docs/r/containerengine_node_pool.html.markdown

@@ -31,6 +31,7 @@ resource "oci_containerengine_node_pool" "test_node_pool" {
 		key = "${var.node_pool_initial_node_labels_key}"
 		value = "${var.node_pool_initial_node_labels_value}"
 	}
+	node_metadata = "${var.node_pool_node_metadata}"
 	quantity_per_subnet = "${var.node_pool_quantity_per_subnet}"
 	ssh_public_key = "${var.node_pool_ssh_public_key}"
 }
@@ -49,6 +50,7 @@ The following arguments are supported:
 * `name` - (Required) (Updatable) The name of the node pool. Avoid entering confidential information.
 * `node_image_name` - (Optional) The name of the image running on the nodes in the node pool. Cannot be used when `node_image_id` is specified.
 * `node_image_id` - (Optional) The OCID of the image running on the nodes in the node pool. Cannot be used when `node_image_name` is specified.
+* `node_metadata` - (Optional) A list of key/value pairs to add to each underlyingOracle Cloud Infrastructure instance in the node pool.
 * `node_shape` - (Required) The name of the node shape of the nodes in the node pool.
 * `quantity_per_subnet` - (Optional) (Updatable) The number of nodes to create in each subnet.
 * `ssh_public_key` - (Optional) The SSH public key to add to each node in the node pool.
@@ -72,6 +74,7 @@ The following attributes are exported:
 * `name` - The name of the node pool.
 * `node_image_id` - The OCID of the image running on the nodes in the node pool.
 * `node_image_name` - The name of the image running on the nodes in the node pool.
+* `node_metadata` - A list of key/value pairs to add to each underlyingOracle Cloud Infrastructure instance in the node pool.
 * `node_shape` - The name of the node shape of the nodes in the node pool.
 * `nodes` - The nodes in the node pool.
 	* `availability_domain` - The name of the availability domain in which this node is placed.