From 9bb591854d973dcc6cb489374ddb545af3668424 Mon Sep 17 00:00:00 2001 From: Shaohua Wen Date: Tue, 19 Mar 2024 17:55:51 +0700 Subject: [PATCH 1/2] fix typo --- blueprints/01-getting-started/outputs.tf | 2 +- blueprints/02-at-scale/outputs.tf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/blueprints/01-getting-started/outputs.tf b/blueprints/01-getting-started/outputs.tf index 5f38667..2821708 100644 --- a/blueprints/01-getting-started/outputs.tf +++ b/blueprints/01-getting-started/outputs.tf @@ -27,7 +27,7 @@ output "cbcd_url" { output "cbcd_password" { description = "Command to get the admin password of Cloudbees CD" - value = "module.eks_blueprints_addon_cbcd.cbcd_password" + value = module.eks_blueprints_addon_cbcd.cbcd_password } output "acm_certificate_arn" { diff --git a/blueprints/02-at-scale/outputs.tf b/blueprints/02-at-scale/outputs.tf index 8248f88..3392c20 100644 --- a/blueprints/02-at-scale/outputs.tf +++ b/blueprints/02-at-scale/outputs.tf @@ -25,7 +25,7 @@ output "cbcd_url" { output "cbcd_password" { description = "command to get the admin password of Cloudbees CD" - value = "module.eks_blueprints_addon_cbcd.cbcd_password" + value = module.eks_blueprints_addon_cbcd.cbcd_password } output "acm_certificate_arn" { From 4035d2f47e825ab549ae7d00b43a593ed24bf59a Mon Sep 17 00:00:00 2001 From: Shaohua Wen Date: Wed, 20 Mar 2024 13:27:07 +0700 Subject: [PATCH 2/2] fix Makefile script --- Makefile | 1 - outputs.tf | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 4553759..a84b106 100644 --- a/Makefile +++ b/Makefile @@ -74,7 +74,6 @@ tfpreFlightChecks: ## Run preflight checks for terraform according to getting-st tfpreFlightChecks: guard-ROOT @if [ "$(shell whoami)" != "$(BP_AGENT_USER)" ]; then printf $(MSG_WARN) "$(BP_AGENT_USER) user is not detected. Note that blueprints validations use the companion Blueprint Docker Agent available via: make dRun"; fi @if [ ! -f blueprints/$(ROOT)/.auto.tfvars ]; then printf $(MSG_ERROR) "blueprints/$(ROOT)/.auto.tfvars file does not exist and it is required to store your own values"; exit 1; fi - @if ([ ! -f blueprints/$(ROOT)/k8s/flow_admin_secrets-values.yml ] && [ $(ROOT) == "02-at-scale" ]); then printf $(MSG_ERROR) "blueprints/$(ROOT)/flow_admin_secrets-values.yml file does not exist and it is required to store your secrets"; exit 1; fi @if ([ ! -f blueprints/$(ROOT)/k8s/flow_db_secrets-values.yml ] && [ $(ROOT) == "02-at-scale" ]); then printf $(MSG_ERROR) "blueprints/$(ROOT)/flow_db_secrets-values.yml file does not exist and it is required to store your secrets"; exit 1; fi $(eval USER_ID := $(shell aws sts get-caller-identity | grep UserId | cut -d"," -f 1 | xargs )) @if [ "$(USER_ID)" == "" ]; then printf $(MSG_ERROR) "AWS Authention for CLI is not configured" && exit 1; fi diff --git a/outputs.tf b/outputs.tf index 394643d..bfaf218 100644 --- a/outputs.tf +++ b/outputs.tf @@ -27,6 +27,6 @@ output "cbcd_domain_name" { output "cbcd_flowserver_pod" { description = "Flow Server Pod for CloudBees CD Add-on." - value = "kubectl get pod -n ${helm_release.cloudbees_cd.namespace} flow-server" + value = "kubectl get pods -l app=flow-server -n ${helm_release.cloudbees_cd.namespace}" }