Module upgrades

- Changes 'prod' to 'staging' in runTerraform.sh
- Bumps catalyst dashboard version to v2.0.19 (updates image tag to v1.0.15)
- Bumps IBM Cloud cluster module version to v2.0.18 (handle container registry regions better)
- Bumps Jenkins module version to v2.0.18 (create different configmap for OpenShift)
- Bumps LogDNA version to v2.0.18 (fix agent install on OpenShift)

Author: michaelsteven / seansund

terraform/runTerraform.sh

@@ -129,7 +129,7 @@ if [[ "${CLUSTER_EXISTS}" == "false" ]]; then
 else
     echo -e "  - Use an existing \033[1;33m${CLUSTER_TYPE}\033[0m cluster instance named \033[1;33m${CLUSTER_NAME}\033[0m"
     echo ""
-    echo -e "\033[1;31mBefore configuring the environment the following namespaces and their contents will be destroyed: tools, dev, test, prod\033[0m"
+    echo -e "\033[1;31mBefore configuring the environment the following namespaces and their contents will be destroyed: tools, dev, test, staging\033[0m"
 fi
 
 if [[ "crc" ==  ${CLUSTER_MANAGEMENT} ]]; then

terraform/stages-crc/stage2-argocd.tf

@@ -1,5 +1,5 @@
 module "dev_tools_argocd_release" {
-  source = "github.com/ibm-garage-cloud/garage-terraform-modules.git//generic/tools/argocd_release?ref=v2.0.13"
+  source = "github.com/ibm-garage-cloud/garage-terraform-modules.git//generic/tools/argocd_release?ref=v2.0.17"
 
   cluster_ingress_hostname = "${module.dev_cluster.ingress_hostname}"
   cluster_config_file      = "${module.dev_cluster.config_file_path}"

terraform/stages-crc/stage2-catalystdashboard.tf

@@ -1,5 +1,5 @@
 module "dev_tools_catalystdashboard_release" {
-  source = "github.com/ibm-garage-cloud/garage-terraform-modules.git//generic/tools/catalystdashboard_release?ref=v2.0.7"
+  source = "github.com/ibm-garage-cloud/garage-terraform-modules.git//generic/tools/catalystdashboard_release?ref=v2.0.19"
 
   cluster_ingress_hostname = "${module.dev_cluster.ingress_hostname}"
   cluster_config_file      = "${module.dev_cluster.config_file_path}"

terraform/stages/stage1-cluster.tf

@@ -1,5 +1,5 @@
 module "dev_cluster" {
-  source = "github.com/ibm-garage-cloud/garage-terraform-modules.git//cloud-managed/cluster/ibmcloud?ref=v2.0.15"
+  source = "github.com/ibm-garage-cloud/garage-terraform-modules.git//cloud-managed/cluster/ibmcloud?ref=v2.0.18"
 
   resource_group_name     = "${var.resource_group_name}"
   cluster_name            = "${var.cluster_name}"

terraform/stages/stage2-catalystdashboard.tf

@@ -1,5 +1,5 @@
 module "dev_tools_catalystdashboard_release" {
-  source = "github.com/ibm-garage-cloud/garage-terraform-modules.git//generic/tools/catalystdashboard_release?ref=v2.0.7"
+  source = "github.com/ibm-garage-cloud/garage-terraform-modules.git//generic/tools/catalystdashboard_release?ref=v2.0.19"
 
   cluster_ingress_hostname = "${module.dev_cluster.ingress_hostname}"
   cluster_config_file      = "${module.dev_cluster.config_file_path}"

terraform/stages/stage2-jenkins.tf

@@ -1,9 +1,10 @@
 module "dev_tools_jenkins_release" {
-  source = "github.com/ibm-garage-cloud/garage-terraform-modules.git//generic/tools/jenkins_release?ref=v2.0.14"
+  source = "github.com/ibm-garage-cloud/garage-terraform-modules.git//generic/tools/jenkins_release?ref=v2.0.18"
 
   cluster_ingress_hostname = "${module.dev_cluster.ingress_hostname}"
   cluster_config_file      = "${module.dev_cluster.config_file_path}"
   cluster_type             = "${var.cluster_type}"
   releases_namespace       = "${module.dev_cluster_namespaces.tools_namespace_name}"
   tls_secret_name          = "${module.dev_cluster.tls_secret_name}"
+  server_url               = "${module.dev_cluster.server_url}"
 }

terraform/stages/stage3-logdna.tf

@@ -1,5 +1,5 @@
 module "dev_serviceaccount_logdna-agent" {
-  source = "github.com/ibm-garage-cloud/garage-terraform-modules.git//generic/cluster/serviceaccount?ref=v2.0.7"
+  source = "github.com/ibm-garage-cloud/garage-terraform-modules.git//generic/cluster/serviceaccount?ref=v2.0.18"
 
   cluster_type             = "${var.cluster_type}"
   cluster_config_file_path = "${module.dev_cluster.config_file_path}"
@@ -9,7 +9,7 @@ module "dev_serviceaccount_logdna-agent" {
 }
 
 module "dev_infrastructure_logdna" {
-  source = "github.com/ibm-garage-cloud/garage-terraform-modules.git//cloud-managed/services/logdna?ref=v2.0.7"
+  source = "github.com/ibm-garage-cloud/garage-terraform-modules.git//cloud-managed/services/logdna?ref=v2.0.18"
 
   resource_group_name      = "${module.dev_cluster.resource_group_name}"
   resource_location        = "${module.dev_cluster.region}"