From 673151e22a6ec4114971516193c9663de5f161a0 Mon Sep 17 00:00:00 2001 From: Carlos Rodriguez Lopez Date: Sat, 12 Oct 2024 16:57:49 +0200 Subject: [PATCH] chore: set location to main --- .../02-at-scale/cbci/casc/mc/ha/variables/variables.yaml | 2 +- .../02-at-scale/cbci/casc/mc/none-ha/variables/variables.yaml | 2 +- blueprints/02-at-scale/cbci/casc/oc/items/root.yaml | 4 ++-- blueprints/02-at-scale/cbci/casc/oc/variables/variables.yaml | 2 +- blueprints/02-at-scale/k8s/cbci-values.yml | 2 +- blueprints/02-at-scale/k8s/kube-prom-stack-values.yml | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/blueprints/02-at-scale/cbci/casc/mc/ha/variables/variables.yaml b/blueprints/02-at-scale/cbci/casc/mc/ha/variables/variables.yaml index 4930abbf..93814965 100644 --- a/blueprints/02-at-scale/cbci/casc/mc/ha/variables/variables.yaml +++ b/blueprints/02-at-scale/cbci/casc/mc/ha/variables/variables.yaml @@ -1,4 +1,4 @@ variables: - sharedLibRepo: "https://github.com/cloudbees/terraform-aws-cloudbees-ci-eks-addon.git" - - sharedLibBranch: develop + - sharedLibBranch: main - sharedLibPath: "blueprints/02-at-scale/cbci/shared-lib" diff --git a/blueprints/02-at-scale/cbci/casc/mc/none-ha/variables/variables.yaml b/blueprints/02-at-scale/cbci/casc/mc/none-ha/variables/variables.yaml index 4930abbf..93814965 100644 --- a/blueprints/02-at-scale/cbci/casc/mc/none-ha/variables/variables.yaml +++ b/blueprints/02-at-scale/cbci/casc/mc/none-ha/variables/variables.yaml @@ -1,4 +1,4 @@ variables: - sharedLibRepo: "https://github.com/cloudbees/terraform-aws-cloudbees-ci-eks-addon.git" - - sharedLibBranch: develop + - sharedLibBranch: main - sharedLibPath: "blueprints/02-at-scale/cbci/shared-lib" 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 9f2f4646..eb165925 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: "develop/none-ha" + bundle: "main/none-ha" # Casc, HA - kind: managedController name: team-c-ha @@ -101,4 +101,4 @@ items: "cloudbees.prometheus": "true" properties: - configurationAsCode: - bundle: "develop/ha" + bundle: "main/ha" diff --git a/blueprints/02-at-scale/cbci/casc/oc/variables/variables.yaml b/blueprints/02-at-scale/cbci/casc/oc/variables/variables.yaml index 82f69637..5d887643 100644 --- a/blueprints/02-at-scale/cbci/casc/oc/variables/variables.yaml +++ b/blueprints/02-at-scale/cbci/casc/oc/variables/variables.yaml @@ -1,7 +1,7 @@ variables: - message: "Welcome to the CloudBees CI blueprint add-on: At scale!" - cascRepo: "https://github.com/cloudbees/terraform-aws-cloudbees-ci-eks-addon.git" - - cascBranch: develop + - cascBranch: main - cascPathController: "/blueprints/02-at-scale/cbci/casc/mc/" - ldapManagerDN: "cn=admin,dc=acme,dc=org" - ldapRootDN: "dc=acme,dc=org" diff --git a/blueprints/02-at-scale/k8s/cbci-values.yml b/blueprints/02-at-scale/k8s/cbci-values.yml index bb00c96e..a8c75733 100644 --- a/blueprints/02-at-scale/k8s/cbci-values.yml +++ b/blueprints/02-at-scale/k8s/cbci-values.yml @@ -16,7 +16,7 @@ OperationsCenter: Retriever: Enabled: true scmRepo: "https://github.com/cloudbees/terraform-aws-cloudbees-ci-eks-addon.git" - scmBranch: develop + scmBranch: main scmBundlePath: blueprints/02-at-scale/cbci/casc/oc scmPollingInterval: PT20M Persistence: diff --git a/blueprints/02-at-scale/k8s/kube-prom-stack-values.yml b/blueprints/02-at-scale/k8s/kube-prom-stack-values.yml index c6f22753..cb815e15 100644 --- a/blueprints/02-at-scale/k8s/kube-prom-stack-values.yml +++ b/blueprints/02-at-scale/k8s/kube-prom-stack-values.yml @@ -197,8 +197,8 @@ grafana: token: "" grafana-dashboards-cloudbees: prometheus-plugin: - url: https://raw.githubusercontent.com/cloudbees/terraform-aws-cloudbees-ci-eks-addon/develop/blueprints/02-at-scale/k8s/prometheus-plugin-db.json + url: https://raw.githubusercontent.com/cloudbees/terraform-aws-cloudbees-ci-eks-addon/main/blueprints/02-at-scale/k8s/prometheus-plugin-db.json token: "" otel-plugin: - url: https://raw.githubusercontent.com/cloudbees/terraform-aws-cloudbees-ci-eks-addon/develop/blueprints/02-at-scale/k8s/opentelemetry-plugin-db.json + url: https://raw.githubusercontent.com/cloudbees/terraform-aws-cloudbees-ci-eks-addon/main/blueprints/02-at-scale/k8s/opentelemetry-plugin-db.json token: ""