Merge pull request #12 from holywen/main

improve base64 command line compatibility, print admin password
cloudbees · Mar 20, 2024 · 6d360ee · 6d360ee
2 parents 5426630 + cc8935a
commit 6d360ee
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/blueprints/helpers.sh b/blueprints/helpers.sh
@@ -36,13 +36,15 @@ probes-common () {
 probes-bp01 () {
   local ROOT="01-getting-started"
   eval "$(get-tf-output "$ROOT" kubeconfig_export)"
-  INITIAL_PASS=$(eval "$(get-tf-output "$ROOT" cbcd_initial_admin_password)"); \
+  INITIAL_PASS=$(eval "$(get-tf-output "$ROOT" cbcd_password)"); \
     printf "$MSG_INFO" "Initial Admin Password: $INITIAL_PASS."
 }
 
 probes-bp02 () {
   local ROOT="02-at-scale"
   eval "$(get-tf-output "$ROOT" kubeconfig_export)"
+  INITIAL_PASS=$(eval "$(get-tf-output "$ROOT" cbcd_password)"); \
+      printf "$MSG_INFO" "Initial Admin Password: $INITIAL_PASS."
   eval "$(get-tf-output "$ROOT" velero_backup_schedule_team_cd)" && eval "$(get-tf-output "$ROOT" velero_backup_on_demand_team_cd)" > "/tmp/backup.txt" && \
 		cat "/tmp/backup.txt" | grep "Backup completed with status: Completed" && \
 		printf "$MSG_INFO" "Velero backups are working"

diff --git a/outputs.tf b/outputs.tf
@@ -17,7 +17,7 @@ output "cbcd_url" {
 
 output "cbcd_password" {
   description = "Command to get the admin password of Cloudbees CD"
-  value       = "kubectl get secret --namespace ${local.namespace} cloudbees-cd-cloudbees-flow-credentials -o jsonpath='{.data.CBF_SERVER_ADMIN_PASSWORD}' | base64 --decode; echo"
+  value       = "kubectl get secret --namespace ${local.namespace} cloudbees-cd-cloudbees-flow-credentials -o jsonpath='{.data.CBF_SERVER_ADMIN_PASSWORD}' | base64 -d; echo"
 }
 
 output "cbcd_domain_name" {