Updates pipelines (#97)

* Updates notify pipeline logic to handle module version updates
* Adds region as preferred value name but keeps vlan_region for backwards compatibility
* Replaces direct references to cluster_type in stages with cluster.type_code
* Adds destroy script
* Bumps ibm container-platform to v1.11.0 to support `iks.*` for cluster_type

Author: Sean Sundberg

.github/scripts/update-modules.sh

@@ -7,7 +7,9 @@ if [[ -n "$GITHUB_USERNAME" ]] && [[ -n "$GITHUB_TOKEN" ]]; then
   GITHUB_AUTH="-u ${GITHUB_USERNAME}:${GITHUB_TOKEN}"
 fi
 
-find "${REPO_DIR}/terraform/stages" -name "*.tf" -depth 1 | while read stageFile; do
+set -e
+
+ls "${REPO_DIR}"/terraform/stages/*.tf | while read stageFile; do
   echo "Updating stage: $stageFile"
   SOURCES=$(grep -E 'source *=' "${stageFile}" | sed -E 's/.*source *= *"(.*)"/\1/g')
 

docs/VLAN.md

@@ -42,7 +42,7 @@ To make getting this information as simple as possible we have added a command t
     public_vlan_number="1849"
     public_vlan_router_hostname="fcr01a.dal10"
     vlan_datacenter="dal10"
-    vlan_region="us-south"
+    region="us-south"
     resource_group_name="catalyst-team"
     cluster_name="catalyst-team-cluster"
     ```

terraform/scripts/destroy.sh

@@ -0,0 +1,26 @@
+#! /bin/bash
+
+echo ""
+echo "Listing current state"
+terraform state list
+
+echo ""
+echo "Collecting resources to destroy"
+RESOURCE_LIST=""
+while read -r resource; do
+  echo "  Adding $resource to destroy targets"
+  RESOURCE_LIST="$RESOURCE_LIST -target=$resource"
+done < <(terraform state list)
+
+if [[ -n "$RESOURCE_LIST" ]]; then
+  echo ""
+  echo "Planning destroy"
+  terraform plan -destroy $RESOURCE_LIST -out=destroy.plan
+
+  echo ""
+  echo "Destroying resources"
+  terraform apply -auto-approve destroy.plan
+else
+  echo ""
+  echo "Nothing to destroy!!"
+fi

terraform/scripts/ibmcloud-cluster

@@ -16,9 +16,9 @@ if [[ -z "${RESOURCE_GROUP}" ]]; then
   exit 1
 fi
 
-REGION="${vlan_region}"
+REGION="${region}"
 if [[ -z "${REGION}" ]]; then
-  echo "vlan_region is required in environment.tfvars"
+  echo "region is required in environment.tfvars"
   exit 1
 fi
 

terraform/scripts/ibmcloud-login

@@ -15,9 +15,9 @@ if [[ -z "${RESOURCE_GROUP}" ]]; then
   exit 1
 fi
 
-REGION="${vlan_region}"
+REGION="${region}"
 if [[ -z "${REGION}" ]]; then
-  echo "vlan_region is required in environment.tfvars"
+  echo "region is required in environment.tfvars"
   exit 1
 fi
 

terraform/settings/environment.tfvars

@@ -21,7 +21,7 @@ vpc_cluster="false"
 cluster_name="<cluster name>"
 
 resource_group_name="<resource group>"
-vlan_region="us-east"
+region="us-east"
 
 # This flag is used to indicate that the LogDNA instance already exists. The default is "false"
 # if this value is not provided. If LogDNA is not installed this value is ignored

terraform/stages-crc/stage1-cluster.tf

@@ -6,7 +6,7 @@ module "dev_cluster" {
   private_vlan_id         = var.private_vlan_id
   public_vlan_id          = var.public_vlan_id
   vlan_datacenter         = var.vlan_datacenter
-  cluster_region          = var.vlan_region
+  cluster_region          = var.vlan_region != "" ? var.vlan_region : var.region
   kubeconfig_download_dir = var.user_home_dir
   cluster_machine_type    = var.cluster_machine_type
   cluster_worker_count    = var.cluster_worker_count

terraform/stages-crc/variables.tf

@@ -36,12 +36,18 @@ variable "vlan_datacenter" {
   default     = ""
 }
 
-variable "vlan_region" {
+variable "region" {
   type        = string
   description = "Region for VLANs defined in private_vlan_number and public_vlan_number."
   default     = ""
 }
 
+variable "vlan_region" {
+  type        = string
+  description = "(Deprecated) Region for VLANs defined in private_vlan_number and public_vlan_number."
+  default     = ""
+}
+
 # Cluster Variables
 variable "cluster_machine_type" {
   type        = string

terraform/stages/catalog/stage1-cloud_operator.tf

@@ -2,7 +2,7 @@ module "dev_software_cloud_operator" {
   source = "github.com/ibm-garage-cloud/garage-terraform-modules.git//self-managed/software/cloud_operator?ref=v2.2.0"
 
   resource_group_name = var.resource_group_name
-  resource_location   = var.vlan_region
+  resource_location   = var.vlan_region != "" ? var.vlan_region : var.region
   cluster_config_file = module.dev_cluster.config_file_path
   ibmcloud_api_key    = module.dev_cluster.ibmcloud_api_key
 }

terraform/stages/catalog/stage3-postgres.tf

@@ -2,7 +2,7 @@ module "dev_infrastructure_postgres" {
   source = "github.com/ibm-garage-cloud/garage-terraform-modules.git//cloud-managed/services/postgres?ref=v2.2.4"
 
   resource_group_name = var.resource_group_name
-  resource_location   = var.vlan_region
+  resource_location   = var.region
   server_exists       = var.postgres_server_exists
   cluster_id          = module.dev_cluster.id
   namespaces          = concat([module.dev_cluster_namespaces.tools_namespace_name], module.dev_cluster_namespaces.release_namespaces)