From 61adf739f8a6cca2ed95db7c94988e939f992394 Mon Sep 17 00:00:00 2001 From: Shaohua Wen Date: Thu, 21 Mar 2024 12:31:08 +0700 Subject: [PATCH] add autoscaling for at-scale blueprints, renaming ci to cd in couple places --- blueprints/02-at-scale/README.md | 4 ++-- blueprints/02-at-scale/img/at-scale.k8s.drawio.svg | 9 +++------ blueprints/02-at-scale/k8s/cbcd-values.yml | 4 ++++ blueprints/02-at-scale/outputs.tf | 4 ++-- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/blueprints/02-at-scale/README.md b/blueprints/02-at-scale/README.md index 28ac79b..a7bf8c5 100644 --- a/blueprints/02-at-scale/README.md +++ b/blueprints/02-at-scale/README.md @@ -40,8 +40,8 @@ Once you have familiarized yourself with the [Getting Started blueprint](../01-g |------|-------------| | acm_certificate_arn | ACM certificate ARN | | aws_backup_efs_protected_resource | AWS Backup Protected Resource descriction for EFS Drive. | -| cbcd_helm | Helm configuration for CloudBees CI Add-on. It is accesible only via state files. | -| cbcd_namespace | Namespace for CloudBees CI Add-on. | +| cbcd_helm | Helm configuration for CloudBees CD Add-on. It is accesible only via state files. | +| cbcd_namespace | Namespace for CloudBees CD Add-on. | | cbcd_password | command to get the admin password of Cloudbees CD | | cbcd_url | URL of the CloudBees CD Operations Center for CloudBees CD Add-on. | | efs_access_points | EFS Access Points. | diff --git a/blueprints/02-at-scale/img/at-scale.k8s.drawio.svg b/blueprints/02-at-scale/img/at-scale.k8s.drawio.svg index 93a4216..428f1c0 100644 --- a/blueprints/02-at-scale/img/at-scale.k8s.drawio.svg +++ b/blueprints/02-at-scale/img/at-scale.k8s.drawio.svg @@ -301,18 +301,15 @@ style="box-sizing: border-box; font-size: 0px; text-align: left;"> - cbci + cbcd (Services) - cbci-agents + cbcd-agents - - - (Builds) @@ -1256,7 +1253,7 @@ - /cbci + /cbcd diff --git a/blueprints/02-at-scale/k8s/cbcd-values.yml b/blueprints/02-at-scale/k8s/cbcd-values.yml index fd45c06..495d62d 100644 --- a/blueprints/02-at-scale/k8s/cbcd-values.yml +++ b/blueprints/02-at-scale/k8s/cbcd-values.yml @@ -4,6 +4,10 @@ #https://docs.cloudbees.com/docs/cloudbees-cd/latest/install-k8s/configuration#cloudbees_helm_charts #https://github.com/cloudbees/cloudbees-examples/blob/master/cloudbees-cd/kubernetes/cloudbees-cd-prod-multizone.yaml +server: + autoscaling: + enabled: true + ##--------------------------------------------- ## Database configuration section ##--------------------------------------------- diff --git a/blueprints/02-at-scale/outputs.tf b/blueprints/02-at-scale/outputs.tf index 3392c20..0ff1633 100644 --- a/blueprints/02-at-scale/outputs.tf +++ b/blueprints/02-at-scale/outputs.tf @@ -9,13 +9,13 @@ output "kubeconfig_add" { } output "cbcd_helm" { - description = "Helm configuration for CloudBees CI Add-on. It is accesible only via state files." + description = "Helm configuration for CloudBees CD Add-on. It is accesible only via state files." value = module.eks_blueprints_addon_cbcd.merged_helm_config sensitive = true } output "cbcd_namespace" { - description = "Namespace for CloudBees CI Add-on." + description = "Namespace for CloudBees CD Add-on." value = module.eks_blueprints_addon_cbcd.cbcd_namespace } output "cbcd_url" {