Merge pull request #349 from jochenehret/scale-workers-je

Fix Concourse setup
cloudfoundry · Mar 19, 2024 · 14e47de · 14e47de
2 parents ef28597 + 23aeb7a
commit 14e47de
Show file tree

Hide file tree

Showing 7 changed files with 208 additions and 225 deletions.
diff --git a/terraform-modules/concourse/app/concourse.tf b/terraform-modules/concourse/app/concourse.tf
@@ -40,6 +40,11 @@ data "helm_template" "concourse" {
     name = "web.replicas"
     value = var.gke_default_pool_node_count
   }
+
+  set {
+    name = "concourse.worker.runtime"
+    value = "containerd"
+  }
 }
 
 data "carvel_ytt" "concourse_app" {

diff --git a/terraform-modules/concourse/backend/files/vendir.lock.yml b/terraform-modules/concourse/backend/files/vendir.lock.yml
@@ -3,7 +3,7 @@ directories:
 - contents:
   - githubRelease:
       tag: v0.10.3
-      url: https://api.github.com/repos/vmware-tanzu/carvel-secretgen-controller/releases/71524101
+      url: https://api.github.com/repos/carvel-dev/secretgen-controller/releases/71524101
     path: .
   path: config/carvel-secretgen-controller
 kind: LockConfig
diff --git a/terragrunt/concourse-wg-ci/app/.terraform.lock.hcl b/terragrunt/concourse-wg-ci/app/.terraform.lock.hcl
diff --git a/terragrunt/concourse-wg-ci/backend/.terraform.lock.hcl b/terragrunt/concourse-wg-ci/backend/.terraform.lock.hcl
diff --git a/terragrunt/concourse-wg-ci/config.yaml b/terragrunt/concourse-wg-ci/config.yaml
@@ -21,7 +21,7 @@ concourse_github_mainTeam: "cloudfoundry:wg-app-runtime-interfaces-autoscaler-ap
 concourse_github_mainTeamUser: ""
 
 # Concourse helm chart
-concourse_helm_version: "17.3.1"
+concourse_helm_version: "17.2.0"
 
 # Module sources for the stack - git or local
 # ie.
@@ -46,7 +46,7 @@ sql_instance_backup_location: eu
 sql_instance_disk_size: 38
 
 # Other GKE vars
-gke_controlplane_version: 1.23.8-gke.1900
+gke_controlplane_version: 1.27.8-gke.1067004
 gke_cluster_ipv4_cidr: 10.104.0.0/14
 gke_services_ipv4_cidr_block: 10.108.0.0/20
 gke_master_ipv4_cidr_block: 172.16.0.32/28