From 3ecfd13628565ca7ecb53e3494a1f846f869506b Mon Sep 17 00:00:00 2001 From: Carlos Rodriguez Lopez Date: Thu, 31 Oct 2024 12:32:17 +0100 Subject: [PATCH 1/3] chore: fix casc --- blueprints/02-at-scale/cbci/casc/oc/items.root.yaml | 4 ++-- blueprints/02-at-scale/cbci/casc/oc/jcasc.main.yaml | 2 +- 2 files changed, 3 insertions(+), 3 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 index 6b769229..1ef57246 100644 --- 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 index b077bbba..aa52eeff 100644 --- 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 From 2afd144b55c266a369a6b08acdc00e3a5f733f5f Mon Sep 17 00:00:00 2001 From: Carlos Rodriguez Lopez Date: Thu, 31 Oct 2024 12:32:43 +0100 Subject: [PATCH 2/3] chore: moving destroy script to k8s --- .../kube-prometheus-destroy.sh => k8s/kube-prom-destroy.sh} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename blueprints/02-at-scale/{scripts/kube-prometheus-destroy.sh => k8s/kube-prom-destroy.sh} (100%) diff --git a/blueprints/02-at-scale/scripts/kube-prometheus-destroy.sh b/blueprints/02-at-scale/k8s/kube-prom-destroy.sh similarity index 100% rename from blueprints/02-at-scale/scripts/kube-prometheus-destroy.sh rename to blueprints/02-at-scale/k8s/kube-prom-destroy.sh From 6b26d0b1b2121fda5ca7700c3dde32532b3bc159 Mon Sep 17 00:00:00 2001 From: Carlos Rodriguez Lopez Date: Thu, 31 Oct 2024 12:33:20 +0100 Subject: [PATCH 3/3] chore: cas and kube prom destroy --- blueprints/helpers.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/blueprints/helpers.sh b/blueprints/helpers.sh index 202c6041..0bbba69f 100755 --- 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" }