Initial node labels addition (#284)

* Initial node labels

Signed-off-by: Karthic Ravindran <[email protected]>

* two labels added in examples

Signed-off-by: Karthic Ravindran <[email protected]>

Author: karthicgit

docs/terraformoptions.adoc

@@ -565,6 +565,7 @@ a|The number, shape of node pools and node_pool_size to create. Each key and tup
 * memory defines the amount of memory in GBs that will be used if VM.Standard.E3.Flex shape is used
 * node_pool_size defines the number of worker nodes in each nodepool
 * boot_volume_size defines the custom boot volume size in GBs for the worker nodes.
+* label defines the initial node labels to use for the nodepool
 
 If an empty nodepool like np3 = {} is specified, then a nodepool will have the following default values: 
 
@@ -579,15 +580,15 @@ Refer to {uri-topology}[topology] for more thorough examples.
 [source]
 node_pools = {
   np1 = {shape="VM.Standard.E3.Flex",ocpus=2,memory=20,node_pool_size=2,boot_volume_size=150}
-  np2 = {shape="VM.Standard.E2.2",node_pool_size=2,boot_volume_size=150}
+  np2 = {shape="VM.Standard.E2.2",node_pool_size=2,boot_volume_size=150,label={app="application",name="test"}}
   np3 = {shape="VM.Standard.E2.2",node_pool_size=1} 
 }
 
 |
 [source]
 node_pools = {
   np1 = {shape="VM.Standard.E3.Flex",ocpus=2,node_pool_size=2,boot_volume_size=150}
-  np2 = {shape="VM.Standard.E2.2",node_pool_size=2,boot_volume_size=150}
+  np2 = {shape="VM.Standard.E2.2",node_pool_size=2,boot_volume_size=150,label={app="application",name="test"}}
   np3 = {shape="VM.Standard.E2.2",node_pool_size=1}
 }
 

modules/oke/nodepools.tf

@@ -32,8 +32,8 @@ resource "oci_containerengine_node_pool" "nodepools" {
   }
   node_source_details {
     boot_volume_size_in_gbs = lookup(each.value, "boot_volume_size", 50)
-    image_id = var.node_pools.node_pool_image_id == "none" ? local.node_pool_image_id : var.node_pools.node_pool_image_id
-    source_type = data.oci_containerengine_node_pool_option.node_pool_options.sources[0].source_type
+    image_id                = var.node_pools.node_pool_image_id == "none" ? local.node_pool_image_id : var.node_pools.node_pool_image_id
+    source_type             = data.oci_containerengine_node_pool_option.node_pool_options.sources[0].source_type
   }
 
   node_shape = lookup(each.value, "shape", "VM.Standard.E3.Flex")
@@ -44,8 +44,11 @@ resource "oci_containerengine_node_pool" "nodepools" {
   lifecycle {
     ignore_changes = [kubernetes_version, node_source_details[0].image_id]
   }
-  # initial_node_labels {
-  #   key   = "key"
-  #   value = "value"
-  # }
+  dynamic "initial_node_labels" {
+    for_each = lookup(each.value, "label", "") != "" ? each.value.label : {}
+    content {
+      key   = initial_node_labels.key
+      value = initial_node_labels.value
+    }
+  }
 }

modules/oke/variables.tf

@@ -62,7 +62,7 @@ variable "oke_cluster" {
 
 variable "node_pools" {
   type = object({
-    node_pools            = map(any)
+    node_pools            = any
     node_pool_name_prefix = string
     node_pool_image_id    = string
     node_pool_os          = string

terraform.tfvars.example

@@ -206,7 +206,7 @@ kubernetes_version = "v1.19.7"
 
 node_pools = {
   np1 = {shape="VM.Standard.E3.Flex",ocpus=2,memory=20,node_pool_size=2,boot_volume_size=150}
-  np2 = {shape="VM.Standard.E2.2",node_pool_size=2,boot_volume_size=150}
+  np2 = {shape="VM.Standard.E2.2",node_pool_size=2,boot_volume_size=150,label={app="application",name="test"}}
   np3 = {shape="VM.Standard.E2.2",node_pool_size=1}
 }
 

variables.tf

@@ -359,7 +359,7 @@ variable "node_pools" {
     np3 = { shape = "VM.Standard.E2.2", node_pool_size = 1 }
   }
   description = "Tuple of node pools. Each key maps to a node pool. Each value is a tuple of shape (string),ocpus(number) , node_pool_size(number) and boot_volume_size(number)"
-  type        = map(any)
+  type        = any
 }
 
 variable "node_pools_to_drain" {
@@ -402,6 +402,10 @@ variable "node_pool_os_version" {
   default     = "7.9"
   description = "The version of image Operating System to use."
   type        = string
+  validation {
+    condition     = (var.node_pool_os_version >= 7.9)
+    error_message = "Node_pool_os_version should be equal or greater than 7.9."
+  }
 }
 
 variable "pods_cidr" {