updated default values, removed redundant code, formatting

hyder · hyder · commit 5f9699299635 · 2019-09-12T16:14:23.000+10:00
Signed-off-by: Ali Mukadam &lt;ali.mukadam@oracle.com&gt;
diff --git a/docs/terraformoptions.adoc b/docs/terraformoptions.adoc
@@ -170,17 +170,19 @@ Configuration Terraform Options:
 [source]
 ----
 newbits = {
-    "bastion" = 13
-    "lb"      = 11
-    "workers" = 2
+  "bastion" = 13
+  "lb"      = 11
+  "workers" = 2
 }
 ----
 |
 [source]
 ----
-"bastion" = 13
-"lb"      = 11
-"workers" = 2
+newbits = {
+  "bastion" = 13
+  "lb"      = 11
+  "workers" = 2
+}
 ----
 
 |subnets
@@ -189,31 +191,21 @@ newbits = {
 [source]
 ----
 subnets = {
-  "bastion"     = 32
-  "int_lb_ad1"  = 16
-  "int_lb_ad2"  = 17
-  "int_lb_ad3"  = 18
-  "pub_lb_ad1"  = 19
-  "pub_lb_ad2"  = 20
-  "pub_lb_ad3"  = 21
-  "workers_ad1" = 1
-  "workers_ad2" = 2
-  "workers_ad3" = 3
+  "bastion" = 32
+  "int_lb"  = 16
+  "pub_lb"  = 17
+  "workers" = 1
 }
 ----
 |
 [source]
 ----
-"bastion"     = 32
-"int_lb_ad1"  = 16
-"int_lb_ad2"  = 17
-"int_lb_ad3"  = 18
-"pub_lb_ad1"  = 19
-"pub_lb_ad2"  = 20
-"pub_lb_ad3"  = 21
-"workers_ad1" = 1
-"workers_ad2" = 2
-"workers_ad3" = 3
+subnets = {
+  "bastion" = 32
+  "int_lb"  = 16
+  "pub_lb"  = 17
+  "workers" = 1
+}
 ----
 
 
@@ -256,7 +248,7 @@ subnets = {
 |image_operating_system_version
 |The version of the selected Operating System to be used to provision the bastion host. Matching versions of available operating systems can be found {uri-oci-images}[here].
 |
-|7.6
+|7.7
 
 |availability_domains
 |The Availability Domain where to provision non-OKE resources e.g. bastion host. This is specified in the form of a map.
@@ -395,19 +387,6 @@ Refer to {uri-topology}[topology] for more thorough examples.
 |both, internal, public
 |public
 
-|preferred_lb_ads
-|The preferred Availability Domains where to provision the Load Balancers, specified in the form of a list of 2 elements.
-|
-[source]
-----
-preferred_lb_ads = ["ad1", "ad2"]
-----
-|
-[source]
-----
-["ad1", "ad2"]
-----
-
 |preferred_lb_subnets
 |The preferred load balancer subnets that OKE will automatically choose when creating load balancers. If 'public' is chosen, the value for lb_subnet_type must be either 'public' or 'both'. If 'private' is chosen, the value for lb_subnet_type must be either 'internal' or 'both'.
 
diff --git a/locals.tf b/locals.tf
@@ -104,11 +104,11 @@ locals {
   }
 
   node_pools = {
-    node_pools                    = var.node_pools
-    node_pool_name_prefix         = var.node_pool_name_prefix
-    node_pool_image_id            = var.node_pool_image_id
-    node_pool_os                  = var.node_pool_os
-    node_pool_os_version          = var.node_pool_os_version
+    node_pools            = var.node_pools
+    node_pool_name_prefix = var.node_pool_name_prefix
+    node_pool_image_id    = var.node_pool_image_id
+    node_pool_os          = var.node_pool_os
+    node_pool_os_version  = var.node_pool_os_version
   }
 
   lbs = {
diff --git a/main.tf b/main.tf
@@ -28,7 +28,7 @@ module "auth" {
   source = "./modules/auth"
 
   # ocir parameters
-  ocir   = local.ocir
+  ocir = local.ocir
 }
 
 # additional networking for oke
diff --git a/modules/base/bastion/iam.tf b/modules/base/bastion/iam.tf
@@ -38,4 +38,4 @@ resource "oci_identity_policy" "instance_principal" {
   name           = "${var.oci_bastion_general.label_prefix}-instance_principal"
   statements     = ["Allow dynamic-group ${oci_identity_dynamic_group.instance_principal[0].name} to manage all-resources in compartment ${data.oci_identity_compartments.compartments_name.compartments.0.name}"]
   count          = var.oci_bastion.enable_instance_principal == true ? 1 : 0
-}
+}
diff --git a/modules/base/bastion/outputs.tf b/modules/base/bastion/outputs.tf
@@ -3,4 +3,4 @@
 
 output "bastion_public_ip" {
   value = join(",", data.oci_core_vnic.bastion_vnic.*.public_ip_address)
-}
+}
diff --git a/modules/base/datasources.tf b/modules/base/datasources.tf
@@ -20,4 +20,4 @@ data "oci_identity_regions" "home_region" {
     name   = "key"
     values = [data.oci_identity_tenancy.tenancy.home_region_key]
   }
-}
+}
diff --git a/modules/base/vcn/locals.tf b/modules/base/vcn/locals.tf
@@ -3,4 +3,4 @@
 
 locals {
   anywhere = "0.0.0.0/0"
-}
+}
diff --git a/modules/base/vcn/variables.tf b/modules/base/vcn/variables.tf
@@ -13,4 +13,4 @@ variable "oci_base_vcn" {
     vcn_dns_name           = string
     vcn_name               = string
   })
-}
+}
diff --git a/modules/base/vcn/vcn.tf b/modules/base/vcn/vcn.tf
@@ -24,7 +24,7 @@ resource "oci_core_route_table" "ig_route" {
   }
 
   dynamic "route_rules" {
-    for_each = (var.oci_base_vcn.create_service_gateway == true && var.oci_base_vcn.create_nat_gateway == false)  ? list(1) : []
+    for_each = (var.oci_base_vcn.create_service_gateway == true && var.oci_base_vcn.create_nat_gateway == false) ? list(1) : []
 
     content {
       destination       = lookup(data.oci_core_services.all_oci_services[0].services[0], "cidr_block")
@@ -34,4 +34,4 @@ resource "oci_core_route_table" "ig_route" {
   }
 
   vcn_id = oci_core_vcn.vcn.id
-}
+}
diff --git a/modules/oke/activeworker.tf b/modules/oke/activeworker.tf
@@ -10,7 +10,7 @@ data "template_file" "check_worker_node_status" {
     region         = var.oke_general.region
   }
 
-  count = var.oke_bastion.create_bastion == true && var.oke_bastion.enable_instance_principal == true   ? 1 : 0
+  count = var.oke_bastion.create_bastion == true && var.oke_bastion.enable_instance_principal == true ? 1 : 0
 }
 
 resource null_resource "is_worker_active" {
@@ -19,7 +19,7 @@ resource null_resource "is_worker_active" {
     private_key = file(var.oke_ssh_keys.ssh_private_key_path)
     timeout     = "40m"
     type        = "ssh"
-    user        = var.oke_bastion.image_operating_system == "Canonical Ubuntu"   ? "ubuntu" : "opc"
+    user        = var.oke_bastion.image_operating_system == "Canonical Ubuntu" ? "ubuntu" : "opc"
   }
 
   depends_on = ["oci_containerengine_cluster.k8s_cluster"]
@@ -36,5 +36,5 @@ resource null_resource "is_worker_active" {
     ]
   }
 
-  count = var.oke_bastion.create_bastion == true  && var.oke_bastion.enable_instance_principal == true ? 1 : 0
+  count = var.oke_bastion.create_bastion == true && var.oke_bastion.enable_instance_principal == true ? 1 : 0
 }
diff --git a/modules/oke/cluster.tf b/modules/oke/cluster.tf
@@ -17,7 +17,7 @@ resource "oci_containerengine_cluster" "k8s_cluster" {
       services_cidr = var.oke_cluster.cluster_options_kubernetes_network_config_services_cidr
     }
 
-    service_lb_subnet_ids = var.lbs.preferred_lb_subnets == "public" ? [var.oke_cluster.cluster_subnets["pub_lb"]] :[var.oke_cluster.cluster_subnets["int_lb"]]
+    service_lb_subnet_ids = var.lbs.preferred_lb_subnets == "public" ? [var.oke_cluster.cluster_subnets["pub_lb"]] : [var.oke_cluster.cluster_subnets["int_lb"]]
   }
 
   vcn_id = var.oke_cluster.vcn_id
diff --git a/modules/oke/datasources.tf b/modules/oke/datasources.tf
@@ -5,7 +5,7 @@ data "oci_core_images" "latest_images" {
   compartment_id           = var.oke_identity.compartment_ocid
   operating_system         = var.node_pools.node_pool_os
   operating_system_version = var.node_pools.node_pool_os_version
-  shape                    = element(var.node_pools.node_pools[(element(keys(var.node_pools.node_pools),count.index))],0)
+  shape                    = element(var.node_pools.node_pools[(element(keys(var.node_pools.node_pools), count.index))], 0)
   sort_by                  = "TIMECREATED"
   count                    = length(var.node_pools.node_pools)
 }
diff --git a/modules/oke/kubeconfig.tf b/modules/oke/kubeconfig.tf
@@ -31,7 +31,7 @@ data "template_file" "install_kubectl" {
   template = file("${path.module}/scripts/install_kubectl.template.sh")
 
   vars = {
-    package_manager = var.oke_bastion.image_operating_system == "ubuntu"   ? "snap" : "yum"
+    package_manager = var.oke_bastion.image_operating_system == "ubuntu" ? "snap" : "yum"
   }
 }
 
@@ -41,7 +41,7 @@ resource "null_resource" "install_kubectl_bastion" {
     private_key = file(var.oke_ssh_keys.ssh_private_key_path)
     timeout     = "40m"
     type        = "ssh"
-    user        = var.oke_bastion.image_operating_system == "Canonical Ubuntu"   ? "ubuntu" : "opc"
+    user        = var.oke_bastion.image_operating_system == "Canonical Ubuntu" ? "ubuntu" : "opc"
   }
 
   provisioner "file" {
@@ -57,7 +57,7 @@ resource "null_resource" "install_kubectl_bastion" {
     ]
   }
 
-  count = var.oke_bastion.create_bastion == true    ? 1 : 0
+  count = var.oke_bastion.create_bastion == true ? 1 : 0
 }
 
 resource "null_resource" "write_kubeconfig_bastion" {
@@ -66,10 +66,10 @@ resource "null_resource" "write_kubeconfig_bastion" {
     private_key = file(var.oke_ssh_keys.ssh_private_key_path)
     timeout     = "40m"
     type        = "ssh"
-    user        = var.oke_bastion.image_operating_system == "Canonical Ubuntu"   ? "ubuntu" : "opc"
+    user        = var.oke_bastion.image_operating_system == "Canonical Ubuntu" ? "ubuntu" : "opc"
   }
 
-  depends_on = ["local_file.kube_config_file","null_resource.install_kubectl_bastion"]
+  depends_on = ["local_file.kube_config_file", "null_resource.install_kubectl_bastion"]
 
   provisioner "remote-exec" {
     inline = [
@@ -82,5 +82,5 @@ resource "null_resource" "write_kubeconfig_bastion" {
     destination = "~/.kube/config"
   }
 
-  count = var.oke_bastion.create_bastion == true    ? 1 : 0
+  count = var.oke_bastion.create_bastion == true ? 1 : 0
 }
diff --git a/modules/oke/metricserver.tf b/modules/oke/metricserver.tf
@@ -4,7 +4,7 @@
 data "template_file" "install_metricserver" {
   template = file("${path.module}/scripts/install_metricserver.template.sh")
 
-  count = var.install_metricserver == true   ? 1 : 0
+  count = var.install_metricserver == true ? 1 : 0
 }
 
 resource null_resource "install_metricserver" {
@@ -13,7 +13,7 @@ resource null_resource "install_metricserver" {
     private_key = file(var.oke_ssh_keys.ssh_private_key_path)
     timeout     = "40m"
     type        = "ssh"
-    user        = var.oke_bastion.image_operating_system == "Canonical Ubuntu"   ? "ubuntu" : "opc"
+    user        = var.oke_bastion.image_operating_system == "Canonical Ubuntu" ? "ubuntu" : "opc"
   }
 
   depends_on = ["null_resource.install_kubectl_bastion", "null_resource.write_kubeconfig_bastion"]
@@ -24,12 +24,12 @@ resource null_resource "install_metricserver" {
   }
 
   provisioner "remote-exec" {
-        inline = [
-          "chmod +x $HOME/install_metricserver.sh",
-          "$HOME/install_metricserver.sh",
-          "rm -f $HOME/install_metricserver.sh"
-        ]
-      }
+    inline = [
+      "chmod +x $HOME/install_metricserver.sh",
+      "$HOME/install_metricserver.sh",
+      "rm -f $HOME/install_metricserver.sh"
+    ]
+  }
 
-      count = var.oke_bastion.create_bastion == true  && var.install_metricserver == true   ? 1 : 0
-    }
+  count = var.oke_bastion.create_bastion == true && var.install_metricserver == true ? 1 : 0
+}
diff --git a/modules/oke/nodepools.tf b/modules/oke/nodepools.tf
@@ -1,5 +1,5 @@
-# # Copyright 2017, 2019, Oracle Corporation and/or affiliates.  All rights reserved.
-# # Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl
+# Copyright 2017, 2019, Oracle Corporation and/or affiliates.  All rights reserved.
+# Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl
 
 resource "oci_containerengine_node_pool" "nodepools" {
   cluster_id     = oci_containerengine_cluster.k8s_cluster.id
@@ -20,7 +20,7 @@ resource "oci_containerengine_node_pool" "nodepools" {
       }
     }
     # set quantity to a minimum of 3 per subnet for single AD region to ensure 3 fault domains
-    size = max(3,element(var.node_pools.node_pools[(element(keys(var.node_pools.node_pools),count.index))],1))
+    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
diff --git a/modules/oke/ocir.tf b/modules/oke/ocir.tf
@@ -12,7 +12,7 @@ data "template_file" "create_ocir_script" {
     tiller_enabled  = var.oke_cluster.cluster_options_add_ons_is_tiller_enabled
   }
 
-  count = var.oke_ocir.create_auth_token == true   ? 1 : 0
+  count = var.oke_ocir.create_auth_token == true ? 1 : 0
 }
 
 resource null_resource "create_ocir_secret" {
@@ -25,7 +25,7 @@ resource null_resource "create_ocir_secret" {
     private_key = file(var.oke_ssh_keys.ssh_private_key_path)
     timeout     = "40m"
     type        = "ssh"
-    user        = var.oke_bastion.image_operating_system == "Canonical Ubuntu"   ? "ubuntu" : "opc"
+    user        = var.oke_bastion.image_operating_system == "Canonical Ubuntu" ? "ubuntu" : "opc"
   }
 
   depends_on = ["null_resource.write_kubeconfig_bastion"]
@@ -41,7 +41,7 @@ resource null_resource "create_ocir_secret" {
     ]
   }
 
-  count = var.oke_bastion.create_bastion == true  && var.oke_ocir.create_auth_token == true ? 1 : 0
+  count = var.oke_bastion.create_bastion == true && var.oke_ocir.create_auth_token == true ? 1 : 0
 }
 
 resource null_resource "delete_ocir_script" {
@@ -52,7 +52,7 @@ resource null_resource "delete_ocir_script" {
     private_key = file(var.oke_ssh_keys.ssh_private_key_path)
     timeout     = "40m"
     type        = "ssh"
-    user        = var.oke_bastion.image_operating_system == "Canonical Ubuntu"   ? "ubuntu" : "opc"
+    user        = var.oke_bastion.image_operating_system == "Canonical Ubuntu" ? "ubuntu" : "opc"
   }
 
   provisioner "remote-exec" {
diff --git a/modules/oke/variables.tf b/modules/oke/variables.tf
@@ -57,11 +57,11 @@ variable "oke_cluster" {
 
 variable "node_pools" {
   type = object({
-    node_pools                    = map(any)
-    node_pool_name_prefix         = string
-    node_pool_image_id            = string
-    node_pool_os                  = string
-    node_pool_os_version          = string
+    node_pools            = map(any)
+    node_pool_name_prefix = string
+    node_pool_image_id    = string
+    node_pool_os          = string
+    node_pool_os_version  = string
   })
 }
 
@@ -114,4 +114,4 @@ variable "calico" {
 
 variable "install_metricserver" {
   default = false
-}
+}
diff --git a/modules/okenetwork/outputs.tf b/modules/okenetwork/outputs.tf
diff --git a/modules/okenetwork/subnets.tf b/modules/okenetwork/subnets.tf
diff --git a/outputs.tf b/outputs.tf
diff --git a/terraform.tfvars.example b/terraform.tfvars.example
diff --git a/variables.tf b/variables.tf

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ module "auth" {`
`28`	`28`	`source = "./modules/auth"`
`29`	`29`
`30`	`30`	`# ocir parameters`
`31`		`- ocir = local.ocir`
	`31`	`+ ocir = local.ocir`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`# additional networking for oke`
Original file line number	Diff line number	Diff line change
`@@ -20,4 +20,4 @@ data "oci_identity_regions" "home_region" {`
`20`	`20`	`name = "key"`
`21`	`21`	`values = [data.oci_identity_tenancy.tenancy.home_region_key]`
`22`	`22`	`}`
`23`		`-}`
	`23`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ resource "oci_core_route_table" "ig_route" {`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`dynamic "route_rules" {`
`27`		`- for_each = (var.oci_base_vcn.create_service_gateway == true && var.oci_base_vcn.create_nat_gateway == false) ? list(1) : []`
	`27`	`+ for_each = (var.oci_base_vcn.create_service_gateway == true && var.oci_base_vcn.create_nat_gateway == false) ? list(1) : []`
`28`	`28`
`29`	`29`	`content {`
`30`	`30`	`destination = lookup(data.oci_core_services.all_oci_services[0].services[0], "cidr_block")`
`@@ -34,4 +34,4 @@ resource "oci_core_route_table" "ig_route" {`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`vcn_id = oci_core_vcn.vcn.id`
`37`		`-}`
	`37`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ data "template_file" "check_worker_node_status" {`
`10`	`10`	`region = var.oke_general.region`
`11`	`11`	`}`
`12`	`12`
`13`		`- count = var.oke_bastion.create_bastion == true && var.oke_bastion.enable_instance_principal == true ? 1 : 0`
	`13`	`+ count = var.oke_bastion.create_bastion == true && var.oke_bastion.enable_instance_principal == true ? 1 : 0`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`resource null_resource "is_worker_active" {`
`@@ -19,7 +19,7 @@ resource null_resource "is_worker_active" {`
`19`	`19`	`private_key = file(var.oke_ssh_keys.ssh_private_key_path)`
`20`	`20`	`timeout = "40m"`
`21`	`21`	`type = "ssh"`
`22`		`- user = var.oke_bastion.image_operating_system == "Canonical Ubuntu" ? "ubuntu" : "opc"`
	`22`	`+ user = var.oke_bastion.image_operating_system == "Canonical Ubuntu" ? "ubuntu" : "opc"`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`depends_on = ["oci_containerengine_cluster.k8s_cluster"]`
`@@ -36,5 +36,5 @@ resource null_resource "is_worker_active" {`
`36`	`36`	`]`
`37`	`37`	`}`
`38`	`38`
`39`		`- count = var.oke_bastion.create_bastion == true && var.oke_bastion.enable_instance_principal == true ? 1 : 0`
	`39`	`+ count = var.oke_bastion.create_bastion == true && var.oke_bastion.enable_instance_principal == true ? 1 : 0`
`40`	`40`	`}`