Skip to content

Commit 14e47de

Browse files
authored
Merge pull request #349 from jochenehret/scale-workers-je
Fix Concourse setup
2 parents ef28597 + 23aeb7a commit 14e47de

File tree

7 files changed

+208
-225
lines changed

7 files changed

+208
-225
lines changed

terraform-modules/concourse/app/concourse.tf

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,11 @@ data "helm_template" "concourse" {
4040
name = "web.replicas"
4141
value = var.gke_default_pool_node_count
4242
}
43+
44+
set {
45+
name = "concourse.worker.runtime"
46+
value = "containerd"
47+
}
4348
}
4449

4550
data "carvel_ytt" "concourse_app" {

terraform-modules/concourse/backend/files/vendir.lock.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ directories:
33
- contents:
44
- githubRelease:
55
tag: v0.10.3
6-
url: https://api.github.com/repos/vmware-tanzu/carvel-secretgen-controller/releases/71524101
6+
url: https://api.github.com/repos/carvel-dev/secretgen-controller/releases/71524101
77
path: .
88
path: config/carvel-secretgen-controller
99
kind: LockConfig

terragrunt/concourse-wg-ci/app/.terraform.lock.hcl

Lines changed: 56 additions & 65 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

terragrunt/concourse-wg-ci/backend/.terraform.lock.hcl

Lines changed: 45 additions & 53 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

terragrunt/concourse-wg-ci/config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ concourse_github_mainTeam: "cloudfoundry:wg-app-runtime-interfaces-autoscaler-ap
2121
concourse_github_mainTeamUser: ""
2222

2323
# Concourse helm chart
24-
concourse_helm_version: "17.3.1"
24+
concourse_helm_version: "17.2.0"
2525

2626
# Module sources for the stack - git or local
2727
# ie.
@@ -46,7 +46,7 @@ sql_instance_backup_location: eu
4646
sql_instance_disk_size: 38
4747

4848
# Other GKE vars
49-
gke_controlplane_version: 1.23.8-gke.1900
49+
gke_controlplane_version: 1.27.8-gke.1067004
5050
gke_cluster_ipv4_cidr: 10.104.0.0/14
5151
gke_services_ipv4_cidr_block: 10.108.0.0/20
5252
gke_master_ipv4_cidr_block: 172.16.0.32/28

0 commit comments

Comments
 (0)