diff --git a/VERSION b/VERSION index bcaffe1..7deb86f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.7.0 \ No newline at end of file +0.7.1 \ No newline at end of file diff --git a/examples/apigw-fn-subnet/variables.tf b/examples/apigw-fn-subnet/variables.tf new file mode 100644 index 0000000..3732d6e --- /dev/null +++ b/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 = "" +} diff --git a/module-oci-networking.tf b/module-oci-networking.tf index bb55850..a54b338 100644 --- a/module-oci-networking.tf +++ b/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 diff --git a/module-oke-network-locals.tf b/module-oke-network-locals.tf index bc708a9..1c4fd1f 100644 --- a/module-oke-network-locals.tf +++ b/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 diff --git a/module-oke.tf b/module-oke.tf index acbb3cf..0b011c6 100644 --- a/module-oke.tf +++ b/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" diff --git a/modules/oke-node-pool/main.tf b/modules/oke-node-pool/main.tf index 7cf4723..3999fe4 100644 --- a/modules/oke-node-pool/main.tf +++ b/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 } diff --git a/modules/oke-node-pool/variables.tf b/modules/oke-node-pool/variables.tf index f9685f7..d682a93 100644 --- a/modules/oke-node-pool/variables.tf +++ b/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"