Reduces the workers to a single worker pool (#55)

* Reduces the workers to a single worker pool
* Loads jq cli using submodule

Signed-off-by: Sean Sundberg <[email protected]>

Author: Sean Sundberg

main.tf

@@ -151,6 +151,12 @@ resource null_resource print_cluster_versions {
   }
 }
 
+module setup_clis {
+  source = "github.com/cloud-native-toolkit/terraform-util-clis.git"
+
+  clis = ["jq"]
+}
+
 data ibm_is_vpc vpc {
   count = !var.exists ? 1 : 0
   depends_on = [null_resource.print_resources]
@@ -173,6 +179,7 @@ resource null_resource setup_acl_rules {
     environment = {
       IBMCLOUD_API_KEY = var.ibmcloud_api_key
       ACL_RULES = jsonencode(local.acl_rules)
+      BIN_DIR = module.setup_clis.bin_dir
     }
   }
 }
@@ -231,9 +238,13 @@ resource ibm_container_vpc_cluster cluster {
   disable_public_service_endpoint = var.disable_public_endpoint
   wait_till         = "IngressReady"
 
-  zones {
-    name      = local.vpc_subnets[0].zone
-    subnet_id = local.vpc_subnets[0].id
+  dynamic "zones" {
+    for_each = local.vpc_subnets
+
+    content {
+      name = zones.value.zone
+      subnet_id = zones.value.id
+    }
   }
 
   dynamic "kms_config" {
@@ -247,22 +258,6 @@ resource ibm_container_vpc_cluster cluster {
   }
 }
 
-resource ibm_container_vpc_worker_pool cluster_pool {
-  count             = !var.exists ? local.vpc_subnet_count - 1 : 0
-
-  cluster           = ibm_container_vpc_cluster.cluster[0].id
-  worker_pool_name  = "pool-${format("%02s", count.index + 2)}"
-  flavor            = var.flavor
-  vpc_id            = local.vpc_id
-  worker_count      = var.worker_count
-  resource_group_id = data.ibm_resource_group.resource_group.id
-
-  zones {
-    name      = local.vpc_subnets[count.index + 1].zone
-    subnet_id = local.vpc_subnets[count.index + 1].id
-  }
-}
-
 resource ibm_is_security_group_rule rule_tcp_k8s {
   count     = !var.exists ? local.vpc_subnet_count : 0
 
@@ -276,7 +271,7 @@ resource ibm_is_security_group_rule rule_tcp_k8s {
 }
 
 data ibm_container_vpc_cluster config {
-  depends_on = [ibm_container_vpc_cluster.cluster, null_resource.create_dirs, ibm_is_security_group_rule.rule_tcp_k8s, ibm_container_vpc_worker_pool.cluster_pool]
+  depends_on = [ibm_container_vpc_cluster.cluster, null_resource.create_dirs, ibm_is_security_group_rule.rule_tcp_k8s]
 
   name              = local.cluster_name
   alb_type          = var.disable_public_endpoint ? "private" : "public"
@@ -321,10 +316,9 @@ data ibm_container_cluster_config cluster {
 
 data "ibm_container_vpc_cluster_worker" "workers" {
   depends_on        = [
-    data.ibm_container_vpc_cluster.config,
-    ibm_container_vpc_worker_pool.cluster_pool
+    data.ibm_container_vpc_cluster.config
   ]
   count = var.worker_count * var.vpc_subnet_count
   worker_id       = data.ibm_container_vpc_cluster.config.workers[count.index]
   cluster_name_id = data.ibm_container_vpc_cluster.config.id
-} 
+} 

outputs.tf

@@ -51,11 +51,11 @@ output "sync" {
 output "total_worker_count" {
   description = "The total number of workers for the cluster. (subnets * number of workers)"
   value = local.total_workers
-  depends_on  = [ibm_container_vpc_worker_pool.cluster_pool]
+  depends_on  = [data.ibm_container_vpc_cluster_worker.workers]
 }
 
 output "workers" {
   description = "List of objects containing data for all workers "
   value = local.workers
-  depends_on  = [ibm_container_vpc_worker_pool.cluster_pool]
+  depends_on  = [data.ibm_container_vpc_cluster_worker.workers]
 }

scripts/setup-acl-rules.sh

@@ -50,13 +50,7 @@ if ! ibmcloud account show 1> /dev/null 2> /dev/null; then
 fi
 
 # Install jq if not available
-JQ=$(command -v jq || command -v ./bin/jq)
-
-if [[ -z "${JQ}" ]]; then
-  echo "jq missing. Installing"
-  mkdir -p ./bin && curl -Lo ./bin/jq https://github.com/stedolan/jq/releases/download/jq-1.6/jq-linux64
-  JQ="${PWD}/bin/jq"
-fi
+JQ=$(command -v jq || command -v "${BIN_DIR}/jq")
 
 ## TODO more sophisticated logic needed to 1) test for existing rules and 2) place this rule in the right order