Merge pull request #207 from cloudbees/hot-fix

Chore: Casc branch fix and Moving KubeProm destroy to K8s
cloudbees-oss · Oct 31, 2024 · afa0d4d · afa0d4d
2 parents 9e83978 + 6b26d0b
commit afa0d4d
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 7 deletions.
diff --git a/blueprints/02-at-scale/cbci/casc/oc/items.root.yaml b/blueprints/02-at-scale/cbci/casc/oc/items.root.yaml
@@ -53,7 +53,7 @@ items:
               "cloudbees.prometheus": "true"
     properties:
       - configurationAsCode:
-          bundle: "casc/mc-none-ha"
+          bundle: "${cascBranch}/mc-none-ha"
   # Casc, HA
   - kind: managedController
     name: team-c-ha
@@ -101,4 +101,4 @@ items:
               "cloudbees.prometheus": "true"
     properties:
       - configurationAsCode:
-          bundle: "casc/mc-ha"
+          bundle: "${cascBranch}/mc-ha"
diff --git a/blueprints/02-at-scale/cbci/casc/oc/jcasc.main.yaml b/blueprints/02-at-scale/cbci/casc/oc/jcasc.main.yaml
@@ -46,7 +46,7 @@ unclassified:
     reloadAlwaysOnRestart: false
     skipNewVersions: false
 cloudBeesCasCServer:
-  defaultBundle: ${cascBranch}/none-ha
+  defaultBundle: "${cascBranch}/mc-none-ha"
   visibility: true
 beekeeper:
   enabled: true

diff --git a/...-scale/scripts/kube-prometheus-destroy.sh → ...ints/02-at-scale/k8s/kube-prom-destroy.sh b/...-scale/scripts/kube-prometheus-destroy.sh → ...ints/02-at-scale/k8s/kube-prom-destroy.sh
diff --git a/blueprints/helpers.sh b/blueprints/helpers.sh
@@ -105,8 +105,8 @@ tf-destroy () {
   if [ "$root" == "${BLUEPRINTS[1]}" ]; then
     eks_cluster_name=$(tf-output "$root" eks_cluster_name)
     aws_region=$(tf-output "$root" aws_region)
-    bash "$SCRIPTDIR/$root/scripts/kube-prometheus-destroy.sh" "$eks_cluster_name" "$aws_region"
-    INFO "kube-prometheus-destroy.sh completed."
+    bash "$SCRIPTDIR/$root/k8s/kube-prom-destroy.sh" "$eks_cluster_name" "$aws_region"
+    INFO "kube-prom-destroy.sh completed."
   fi
   retry 3 "terraform -chdir=$SCRIPTDIR/$root destroy -auto-approve"
   INFO "Destroy the rest completed."
@@ -228,8 +228,6 @@ set-cbci-location () {
   sed -i "s|cascBranch: .*|cascBranch: $branch|g" "$SCRIPTDIR/02-at-scale/cbci/casc/oc/variables.yaml"
   sed -i "s|sharedLibBranch: .*|sharedLibBranch: $branch|g" "$SCRIPTDIR/02-at-scale/cbci/casc/mc/mc-ha/variables.yaml"
   sed -i "s|sharedLibBranch: .*|sharedLibBranch: $branch|g" "$SCRIPTDIR/02-at-scale/cbci/casc/mc/mc-none-ha/variables.yaml"
-  sed -i "s|bundle: \".*/none-ha\"|bundle: \"$branch/none-ha\"|g" "$SCRIPTDIR/02-at-scale/cbci/casc/oc/items.root.yaml"
-  sed -i "s|bundle: \".*/ha\"|bundle: \"$branch/ha\"|g" "$SCRIPTDIR/02-at-scale/cbci/casc/oc/items.root.yaml"
   sed -i "s|https://raw.githubusercontent.com/cloudbees/terraform-aws-cloudbees-ci-eks-addon/.*/blueprints/02-at-scale/k8s/prometheus-plugin-db.json|https://raw.githubusercontent.com/cloudbees/terraform-aws-cloudbees-ci-eks-addon/$branch/blueprints/02-at-scale/k8s/prometheus-plugin-db.json|g" "$SCRIPTDIR/02-at-scale/k8s/kube-prom-stack-values.yml"
   sed -i "s|https://raw.githubusercontent.com/cloudbees/terraform-aws-cloudbees-ci-eks-addon/.*/blueprints/02-at-scale/k8s/opentelemetry-plugin-db.json|https://raw.githubusercontent.com/cloudbees/terraform-aws-cloudbees-ci-eks-addon/$branch/blueprints/02-at-scale/k8s/opentelemetry-plugin-db.json|g" "$SCRIPTDIR/02-at-scale/k8s/kube-prom-stack-values.yml"
 }