added output that contains a list of workers (id and zone) (#50)

Signed-off-by: Andrew Trice <[email protected]>

Author: Andrew Trice

.gitignore

@@ -1,2 +1,13 @@
 .idea/
 *.iml
+
+*.tfstate*
+.terraform.lock*
+
+.terraform
+test/stages/.terraform
+test/stages/module
+
+test/existing-cluster/.terraform
+test/existing-cluster/module
+test/existing-cluster/.kube

main.tf

@@ -48,6 +48,7 @@ locals {
   cluster_type_tag      = local.cluster_type == "kubernetes" ? "iks" : "ocp"
   cluster_version       = local.cluster_type == "openshift" ? "${var.ocp_version}_openshift" : ""
   vpc_subnet_count      = var.vpc_subnet_count
+  total_workers         = var.worker_count * var.vpc_subnet_count
   vpc_id                = !var.exists ? data.ibm_is_vpc.vpc[0].id : ""
   vpc_subnets           = !var.exists ? var.vpc_subnets : []
   security_group_id     = !var.exists ? data.ibm_is_vpc.vpc[0].default_security_group : ""
@@ -76,6 +77,12 @@ locals {
     source = "0.0.0.0/0"
     destination = "0.0.0.0/0"
   }]
+  workers = flatten([
+    for i in range(local.total_workers) : {
+      id = data.ibm_container_vpc_cluster_worker.workers[i].id
+      zone = data.ibm_container_vpc_cluster_worker.workers[i].network_interfaces[0].subnet_id
+    }
+  ])
 }
 
 resource null_resource create_dirs {
@@ -269,7 +276,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]
+  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]
 
   name              = local.cluster_name
   alb_type          = var.disable_public_endpoint ? "private" : "public"
@@ -311,3 +318,13 @@ data ibm_container_cluster_config cluster {
   resource_group_id = data.ibm_resource_group.resource_group.id
   config_dir        = local.cluster_config_dir
 }
+
+data "ibm_container_vpc_cluster_worker" "workers" {
+  depends_on        = [
+    data.ibm_container_vpc_cluster.config,
+    ibm_container_vpc_worker_pool.cluster_pool
+  ]
+  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

@@ -47,3 +47,15 @@ output "sync" {
   description = "Value used to sync downstream modules"
   depends_on  = [data.ibm_container_vpc_cluster.config]
 }
+
+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]
+}
+
+output "workers" {
+  description = "List of objects containing data for all workers "
+  value = local.workers
+  depends_on  = [ibm_container_vpc_worker_pool.cluster_pool]
+}

test/existing-cluster/provider.tf

@@ -0,0 +1,4 @@
+provider "ibm" {
+  region           = var.region
+  ibmcloud_api_key = var.ibmcloud_api_key
+}

test/existing-cluster/stage0.tf

@@ -0,0 +1,9 @@
+terraform {
+  required_version = ">= 0.13.0"
+
+  required_providers {
+    ibm = {
+      source = "ibm-cloud/ibm"
+    }
+  }
+}

test/existing-cluster/stage1-resource-group.tf

@@ -0,0 +1,6 @@
+module "resource_group" {
+  source = "github.com/cloud-native-toolkit/terraform-ibm-resource-group.git"
+
+  resource_group_name = var.resource_group_name
+  provision           = false
+}

test/existing-cluster/stage2-cluster.tf

@@ -0,0 +1,32 @@
+module "cluster" {
+  source = "./module"
+
+  resource_group_name = module.resource_group.name
+  region              = var.region
+  ibmcloud_api_key    = var.ibmcloud_api_key
+  name                = var.cluster_name
+  worker_count        = var.worker_count
+  exists              = var.cluster_exists
+  name_prefix         = var.name_prefix
+  vpc_name            = ""
+  vpc_subnets         = []
+  vpc_subnet_count    = var.vpc_subnet_count
+  cos_id              = ""
+}
+
+
+resource null_resource print_resources {
+  triggers = {
+    always_run = timestamp()
+  }
+
+  provisioner "local-exec" {
+    command = "echo 'Resource group: ${var.resource_group_name}'"
+  }
+  provisioner "local-exec" {
+    command = "echo 'Total Workers: ${module.cluster.total_worker_count}'"
+  }
+  provisioner "local-exec" {
+    command = "echo 'Workers: ${jsonencode(module.cluster.workers)}'"
+  }
+}

test/existing-cluster/variables.tf

@@ -0,0 +1,45 @@
+
+# Resource Group Variables
+variable "resource_group_name" {
+  type        = string
+  description = "Existing resource group where the IKS cluster will be provisioned."
+}
+
+variable "ibmcloud_api_key" {
+  type        = string
+  description = "The api key for IBM Cloud access"
+}
+
+variable "region" {
+  type        = string
+  description = "Region for VLANs defined in private_vlan_number and public_vlan_number."
+}
+
+variable "cluster_name" {
+  type        = string
+  description = "The name of the cluster"
+  default     = ""
+}
+
+variable "cluster_exists" {
+  type        = string
+  description = "Flag indicating if the cluster already exists (true or false)"
+  default     = "true"
+}
+
+variable "name_prefix" {
+  type        = string
+  description = "Prefix name that should be used for the cluster and services. If not provided then resource_group_name will be used"
+  default     = ""
+}
+
+variable "vpc_subnet_count" {
+  type        = number
+  description = "The number of subnets to create for the VPC instance"
+  default     = 1
+}
+
+variable "worker_count" {
+  type        = number
+  default     = 4
+}