Merge pull request #7 from junior/zero-seven-one

Zero seven one

VERSION

@@ -1 +1 @@
-0.7.0
+0.7.1

examples/apigw-fn-subnet/variables.tf

@@ -0,0 +1,13 @@
+# OCI Provider
+variable "tenancy_ocid" {}
+variable "compartment_ocid" {}
+variable "region" {}
+variable "user_ocid" {
+  default = ""
+}
+variable "fingerprint" {
+  default = ""
+}
+variable "private_key_path" {
+  default = ""
+}

module-oci-networking.tf

@@ -2,6 +2,8 @@
 # Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
 # 
 
+# File Version: 0.7.0
+
 # Dependencies:
 #   - module-defaults.tf file
 #   - local.create_new_vcn

module-oke-network-locals.tf

@@ -2,6 +2,8 @@
 # Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
 # 
 
+# File Version: 0.7.1
+
 # Dependencies:
 #   - module-oci-networking.tf file
 #   - module-defaults.tf file

module-oke.tf

@@ -2,6 +2,8 @@
 # Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
 # 
 
+# File Version: 0.7.1
+
 module "vault" {
   source = "./modules/oci-vault-kms"
 
@@ -129,6 +131,7 @@ locals {
       existent_oke_nodepool_id_for_autoscaler   = var.existent_oke_nodepool_id_for_autoscaler_1
       image_operating_system                    = var.image_operating_system_1
       image_operating_system_version            = var.image_operating_system_version_1
+      extra_initial_node_labels                 = var.extra_initial_node_labels_1
     },
   ]
 }
@@ -221,6 +224,10 @@ variable "node_pool_name_1" {
   default     = "pool1"
   description = "Name of the node pool"
 }
+variable "extra_initial_node_labels_1" {
+  default     = {}
+  description = "Extra initial node labels to be added to the node pool"
+}
 variable "num_pool_workers_1" {
   default     = 3
   description = "The number of worker nodes in the node pool. If select Cluster Autoscaler, will assume the minimum number of nodes configured"

modules/oke-node-pool/main.tf

@@ -2,6 +2,8 @@
 # Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
 # 
 
+# File Version: 0.7.1
+
 resource "oci_containerengine_node_pool" "oke_node_pool" {
   cluster_id         = var.oke_cluster_ocid
   compartment_id     = var.oke_cluster_compartment_ocid
@@ -55,6 +57,15 @@ resource "oci_containerengine_node_pool" "oke_node_pool" {
     value = var.node_pool_name
   }
 
+  dynamic "initial_node_labels" {
+    for_each = var.extra_initial_node_labels
+
+    content {
+      key   = initial_node_labels.value.key
+      value = initial_node_labels.value.value
+    }
+  }
+
   count = var.create_new_node_pool ? 1 : 0
 }
 

modules/oke-node-pool/variables.tf

@@ -26,6 +26,10 @@ variable "node_pool_name" {
   default     = "pool1"
   description = "Name of the node pool"
 }
+variable "extra_initial_node_labels" {
+  default     = {}
+  description = "Extra initial node labels to be added to the node pool"
+}
 variable "node_pool_min_nodes" {
   default     = 3
   description = "The number of worker nodes in the node pool. If select Cluster Autoscaler, will assume the minimum number of nodes configured"