changed nodepools image specs from node_image_id to node_source_details. added new ocir urls (#125)

Author: hyder

CHANGELOG.adoc

@@ -7,12 +7,17 @@ All notable changes to this project are documented in this file.
 
 The format is based on {uri-changelog}[Keep a Changelog].
 
-== v2.1.0 (January 17, 2019)
+== 2.1.1 (February 06, 2020)
+* Install latest version of kubectl into admin host (#119)
+* Added OCIR support for new regions (#122)
+* Changed nodepools image specs from node_image_id to node_source_details (#124)
+
+== v2.1.0 (January 17, 2020)
 * Base module now pointing directly to https://github.com/oracle-terraform-modules/terraform-oci-base v1.1.0
 * Local copy of base module removed
 * Disabled Kubernetes dashboard by default (#117)
 
-== v2.0.1 (January 16, 2019)
+== v2.0.1 (January 16, 2020)
 * fixed issue with compartment id when using KMS #112
 * added ServiceAccount for CI/CD #113
 

modules/oke/nodepools.tf

@@ -23,7 +23,12 @@ resource "oci_containerengine_node_pool" "nodepools" {
     size = max(3, element(var.node_pools.node_pools[(element(keys(var.node_pools.node_pools), count.index))], 1))
   }
 
-  node_image_id = var.node_pools.node_pool_image_id == "NONE" ? data.oci_core_images.latest_images[count.index].images[0].id : var.node_pools.node_pool_image_id
+  node_source_details {
+    image_id    = var.node_pools.node_pool_image_id == "NONE" ? data.oci_core_images.latest_images[count.index].images[0].id : var.node_pools.node_pool_image_id
+    source_type = "IMAGE"
+  }
+
+  # node_image_id = var.node_pools.node_pool_image_id == "NONE" ? data.oci_core_images.latest_images[count.index].images[0].id : var.node_pools.node_pool_image_id
   node_shape    = element(var.node_pools.node_pools[(element(keys(var.node_pools.node_pools), count.index))], 0)
 
   ssh_public_key = file(var.oke_ssh_keys.ssh_public_key_path)

variables.tf

@@ -359,12 +359,16 @@ variable "ocir_urls" {
   description = "urls of ocir"
   default = {
     ap-sydney-1    = "syd.ocir.io"
+    ap-melbourne-1 = "mel.ocir.io"
     ap-mumbai-1    = "bom.ocir.io"
+    ap-osaka-1     = "kix.ocir.io"
     ap-seoul-1     = "icn.ocir.io"
     ap-tokyo-1     = "nrt.ocir.io"
     ca-toronto-1   = "yyz.ocir.io"
+    eu-amsterdam-1 = "ams.ocir.io"
     eu-frankfurt-1 = "fra.ocir.io"
     eu-zurich-1    = "zrh.ocir.io"
+    me-jeddah-1    = "jed.ocir.io"
     sa-saopaulo-1  = "gru.ocir.io"
     uk-london-1    = "lhr.ocir.io"
     us-ashburn-1   = "iad.ocir.io"
@@ -473,4 +477,4 @@ variable "service_account_cluster_role_binding" {
   description = "cluster role binding name"
   default     = ""
   type        = string
-}
+}