Merge pull request #145 from cloudbees/s3

[Blueprints, 02-at-scale]: Use Secrets to pass terraform variables to Casc (part II)
cloudbees · May 21, 2024 · 73f8459 · 73f8459
2 parents 0b5f98b + 4677212
commit 73f8459
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/blueprints/02-at-scale/README.md b/blueprints/02-at-scale/README.md
@@ -105,7 +105,13 @@ Once you have familiarized yourself with [CloudBees CI blueprint add-on: Get sta
 
 ## Deploy
 
-In addition to the minimum required settings explained in [Get started - Deploy](../01-getting-started/README.md#deploy), when preparing to deploy, you must [create the secrets file](#create-the-secrets-file) and [update Amazon S3 bucket settings](#update-amazon-s3-bucket-settings)
+When preparing to deploy, you must complete the following steps:
+
+1. Customize your Terraform values by copying `.auto.tfvars.example` to `.auto.tfvars`.
+2. Initialize the root module and any associated configuration for providers.
+3. Create the resources and deploy CloudBees CI to an EKS cluster. Refer to [Amazon EKS Blueprints for Terraform - Deploy](https://aws-ia.github.io/terraform-aws-eks-blueprints/getting-started/#deploy).
+
+For more information, refer to [The Core Terraform Workflow](https://www.terraform.io/intro/core-workflow) documentation.
 
 > [!TIP]
 > The `deploy` phase can be orchestrated via the companion [Makefile](../../Makefile).

diff --git a/blueprints/02-at-scale/casc/oc/items/items-root.yaml b/blueprints/02-at-scale/casc/oc/items/items-root.yaml
@@ -53,7 +53,7 @@ items:
               "cloudbees.prometheus": "true"
     properties:
       - configurationAsCode:
-          bundle: "s3/none-ha"
+          bundle: "develop/none-ha"
   # Casc, HA
   - kind: managedController
     name: team-c-ha
@@ -100,4 +100,4 @@ items:
               "cloudbees.prometheus": "true"
     properties:
       - configurationAsCode:
-          bundle: "s3/ha"
+          bundle: "develop/ha"
diff --git a/blueprints/02-at-scale/casc/oc/variables/variables.yaml b/blueprints/02-at-scale/casc/oc/variables/variables.yaml
@@ -1,7 +1,7 @@
 variables:
   - message: "Welcome to the CloudBees CI blueprint add-on: At scale!"
   - scmCascMmStore: "https://github.com/cloudbees/terraform-aws-cloudbees-ci-eks-addon.git"
-  - cascBranch: s3
+  - cascBranch: develop
   - ldapManagerDN: "cn=admin,dc=acme,dc=org"
   - ldapRootDN: "dc=acme,dc=org"
   - ldapServer: "openldap-stack.auth.svc.cluster.local"

diff --git a/blueprints/02-at-scale/k8s/cbci-values.yml b/blueprints/02-at-scale/k8s/cbci-values.yml
@@ -19,7 +19,7 @@ OperationsCenter:
     Retriever:
       Enabled: true
       scmRepo: https://github.com/cloudbees/terraform-aws-cloudbees-ci-eks-addon.git
-      scmBranch: s3
+      scmBranch: develop
       scmBundlePath: blueprints/02-at-scale/casc/oc
       scmPollingInterval: PT20M
 Persistence: