From 85b5d175bdc36cf92d6b89cfedf89ba189a3ecb4 Mon Sep 17 00:00:00 2001 From: Sean Sundberg Date: Wed, 21 Apr 2021 19:18:53 -0500 Subject: [PATCH 1/3] Disable ibmcloud cli version check prompt Signed-off-by: Sean Sundberg --- scripts/ibmcloud-login.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/ibmcloud-login.sh b/scripts/ibmcloud-login.sh index 8c91f97..34c45d3 100755 --- a/scripts/ibmcloud-login.sh +++ b/scripts/ibmcloud-login.sh @@ -8,4 +8,6 @@ if [[ -z "${APIKEY}" ]]; then exit 1 fi +ibmcloud config --check-version=false + ibmcloud login -r "${REGION}" -g "${RESOURCE_GROUP}" --apikey "${APIKEY}" From 74b38459251114acb23396e48101dd0420453504 Mon Sep 17 00:00:00 2001 From: Sean Sundberg Date: Wed, 21 Apr 2021 22:26:44 -0500 Subject: [PATCH 2/3] Cleans up capture state diff Signed-off-by: Sean Sundberg --- test/stages/stage-logdna-bind.tf | 2 +- test/stages/stage1b-capture-state.tf | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) delete mode 100644 test/stages/stage1b-capture-state.tf diff --git a/test/stages/stage-logdna-bind.tf b/test/stages/stage-logdna-bind.tf index 1f777b8..2e3b5b5 100644 --- a/test/stages/stage-logdna-bind.tf +++ b/test/stages/stage-logdna-bind.tf @@ -7,6 +7,6 @@ module "logdna-bind" { cluster_id = module.dev_cluster.id cluster_name = module.dev_cluster.name cluster_config_file_path = module.dev_cluster.config_file_path - tools_namespace = module.dev_capture_state.namespace + tools_namespace = var.namespace name = module.logdna.name } diff --git a/test/stages/stage1b-capture-state.tf b/test/stages/stage1b-capture-state.tf deleted file mode 100644 index bafa7b3..0000000 --- a/test/stages/stage1b-capture-state.tf +++ /dev/null @@ -1,8 +0,0 @@ -module "dev_capture_state" { - source = "github.com/ibm-garage-cloud/terraform-k8s-capture-state" - - cluster_type = "ocp4" - cluster_config_file_path = module.dev_cluster.config_file_path - namespace = module.dev_tools_namespace.name - output_path = "${path.cwd}/cluster-state/before" -} From ca12820186b210a81e18293975f1c8c837896d42 Mon Sep 17 00:00:00 2001 From: Sean Sundberg Date: Wed, 21 Apr 2021 22:47:37 -0500 Subject: [PATCH 3/3] Fixes variables Signed-off-by: Sean Sundberg --- test/stages/stage-logdna-bind.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/stages/stage-logdna-bind.tf b/test/stages/stage-logdna-bind.tf index 2e3b5b5..8b52e5e 100644 --- a/test/stages/stage-logdna-bind.tf +++ b/test/stages/stage-logdna-bind.tf @@ -7,6 +7,6 @@ module "logdna-bind" { cluster_id = module.dev_cluster.id cluster_name = module.dev_cluster.name cluster_config_file_path = module.dev_cluster.config_file_path - tools_namespace = var.namespace + tools_namespace = module.dev_tools_namespace.name name = module.logdna.name }