Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Chore: Casc branch fix and Moving KubeProm destroy to K8s #207

Merged
merged 3 commits into from
Oct 31, 2024
Merged

Chore: Casc branch fix and Moving KubeProm destroy to K8s #207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3ecfd13
chore: fix casc
carlosrodlop Oct 31, 2024
2afd144
chore: moving destroy script to k8s
carlosrodlop Oct 31, 2024
6b26d0b
chore: cas and kube prom destroy
carlosrodlop Oct 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions blueprints/02-at-scale/cbci/casc/oc/items.root.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -101,4 +101,4 @@ items:
"cloudbees.prometheus": "true"
properties:
- configurationAsCode:
bundle: "casc/mc-ha"
bundle: "${cascBranch}/mc-ha"
2 changes: 1 addition & 1 deletion blueprints/02-at-scale/cbci/casc/oc/jcasc.main.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ unclassified:
reloadAlwaysOnRestart: false
skipNewVersions: false
cloudBeesCasCServer:
defaultBundle: ${cascBranch}/none-ha
defaultBundle: "${cascBranch}/mc-none-ha"
visibility: true
beekeeper:
enabled: true
Expand Down
0 ...-scale/scripts/kube-prometheus-destroy.sh → ...ints/02-at-scale/k8s/kube-prom-destroy.sh
View file
Open in desktop
File renamed without changes.
6 changes: 2 additions & 4 deletions blueprints/helpers.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down Expand Up @@ -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"
}
Expand Down
Loading