From ef28597e1437b38e31fbe0b852d0f37c1bd492dd Mon Sep 17 00:00:00 2001 From: d059372 Date: Mon, 18 Mar 2024 13:28:54 +0100 Subject: [PATCH 1/6] Scale concourse workers --- terragrunt/concourse-wg-ci/config.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/terragrunt/concourse-wg-ci/config.yaml b/terragrunt/concourse-wg-ci/config.yaml index d510720..c9a9832 100644 --- a/terragrunt/concourse-wg-ci/config.yaml +++ b/terragrunt/concourse-wg-ci/config.yaml @@ -58,10 +58,10 @@ gke_default_pool_ssd_count: 0 # typical config for concourse worker is n4-standard-4 and ssd_count: 1 # note: economy e2-standard machine can't use local ssd drives -gke_workers_pool_machine_type: e2-standard-4 -gke_workers_pool_node_count: 2 +gke_workers_pool_machine_type: n2-standard-4 +gke_workers_pool_node_count: 4 gke_workers_pool_autoscaling_max: 4 -gke_workers_pool_ssd_count: 0 +gke_workers_pool_ssd_count: 1 # low number of preallocated ports will impact networking for heavy concourse pipelines gke_cloud_nat_min_ports_per_vm: 16384 From 821729cdf8a81ab7a03a0ebb65ff90b18ef6c3a1 Mon Sep 17 00:00:00 2001 From: Jochen Ehret Date: Tue, 19 Mar 2024 14:56:33 +0100 Subject: [PATCH 2/6] Specify "containerd" as worker runtime * default runtime (guardian?) produces error "mounting "cgroup" to rootfs at "/sys/fs/cgroup" caused: invalid argument" --- terraform-modules/concourse/app/concourse.tf | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/terraform-modules/concourse/app/concourse.tf b/terraform-modules/concourse/app/concourse.tf index 29b7e29..89173fa 100644 --- 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" { From d351a698c2c6ad29657dae270392a2a608c51896 Mon Sep 17 00:00:00 2001 From: Jochen Ehret Date: Tue, 19 Mar 2024 14:58:02 +0100 Subject: [PATCH 3/6] Update GKE Controlplane version, set Concourse Helm chart to 17.2.0 * latest version 17.3.1 produces error with PodDisruptionBudget (could also be caused by kapp CLI, not sure) --- terragrunt/concourse-wg-ci/config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/terragrunt/concourse-wg-ci/config.yaml b/terragrunt/concourse-wg-ci/config.yaml index c9a9832..4daf8e4 100644 --- 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 From c2e6767d37d538947db224349629c361ebf40874 Mon Sep 17 00:00:00 2001 From: Jochen Ehret Date: Tue, 19 Mar 2024 15:00:45 +0100 Subject: [PATCH 4/6] Re-run vendir --- terraform-modules/concourse/backend/files/vendir.lock.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/terraform-modules/concourse/backend/files/vendir.lock.yml b/terraform-modules/concourse/backend/files/vendir.lock.yml index fcbed84..575e0d2 100644 --- 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 From 23aeb7a9d6e3ad4e5dbef26887551e905030d3b2 Mon Sep 17 00:00:00 2001 From: Jochen Ehret Date: Tue, 19 Mar 2024 15:01:20 +0100 Subject: [PATCH 5/6] Migrate from Terraform to OpenTofu --- .../concourse-wg-ci/app/.terraform.lock.hcl | 121 ++++++++---------- .../backend/.terraform.lock.hcl | 98 +++++++------- .../dr_create/.terraform.lock.hcl | 107 +++++++++------- .../concourse-wg-ci/infra/.terraform.lock.hcl | 96 ++++++-------- 4 files changed, 200 insertions(+), 222 deletions(-) diff --git a/terragrunt/concourse-wg-ci/app/.terraform.lock.hcl b/terragrunt/concourse-wg-ci/app/.terraform.lock.hcl index f77431e..f97e4c2 100644 --- a/terragrunt/concourse-wg-ci/app/.terraform.lock.hcl +++ b/terragrunt/concourse-wg-ci/app/.terraform.lock.hcl @@ -1,82 +1,73 @@ -# This file is maintained automatically by "terraform init". +# This file is maintained automatically by "tofu init". # Manual edits may be lost in future updates. -provider "registry.terraform.io/hashicorp/google" { - version = "4.42.0" +provider "registry.opentofu.org/hashicorp/google" { + version = "5.20.0" hashes = [ - "h1:hYwc7stdvS8gbKIYcxtpVnRAHpxf2YycrOPOfeJWjvk=", - "h1:sEbuoQzQEIzqric0xit5Lm5FrEF5+plvyWuP/xKOyDA=", - "zh:42372be4b901b3c9cecc5331d99b007338d152b9cacfe742a6a722b3c32b1fc0", - "zh:76efb85308b7f3a8ed2c8bdfe0484c54e408d935c679a27f12f0a5435ad77752", - "zh:7cac650e4919f04d0e33cd701651a1f365d9cbf20f272c036b687ad4d7ee1af1", - "zh:9af15a65a83e7a8f6687b06a9e43ed3b803c744517e614027c7453ed45933447", - "zh:a611e112204d43bd166296f009b65c3b97276a56371d1833ac7d73932d939c47", - "zh:a8a127d6dcf21b1db5751f4baf1a1547b305698ec05a73e932a8a7bb00e3f3cd", - "zh:ba540d80cf0219561e1cefa109ddfe14bf0881e7a5ba16ff96cec280c875fe53", - "zh:c37f785098266b058ac75156d8cd1a476be163f86ed8f766e0f5e23d7b947894", - "zh:c8ea695d053e48863c8722bfae2338379caf26ad8b3807735be273bc6713a5cd", - "zh:ce4a43fab9a1942ecaa536d3bf91804e3b82948d6a5972ff9d4b1e9769e3c2f0", - "zh:d7079ac445f7f0cd146ccd151b4443e63ff2aa00c6dab70c6618b292cabfedbd", - "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", + "h1:F8uXYuqI/A7EMUA7FJaLYiq1JTuGxKRWy6sEGV1gVQQ=", + "zh:124d7577793fe37fcc5228039eb478061fd0863a15eb3e1570db44005f69382c", + "zh:3c500b7cfbb51b216f738797db2ed7e91ad646c1c782561c4333fcfe828ef80a", + "zh:463a439976fd0e97205c750e83915bac7118605d40b4871e7c41df712d1e4c83", + "zh:5802953a3dd08e6c27f5f2d8f6cf4ee7b20db46494054abf4ddb2d5c355450c8", + "zh:5e54e697020d2d48db792b8a6b9ac8f0b23d955c00d2a2a5a9d08731da62abea", + "zh:778019fdf28ba42c605ab82353a6ce6117d4091adf3227c7f63ee555fe2e5d48", + "zh:b8958ec729dd034d8c4d8a4c8184da958cfd2b52df01b0aede120158cc6b65ca", + "zh:c8e8c87653cdda0855d3b0f1c8924c47280a6ce6bb313fd76169280f2cc7320b", + "zh:ec251ee722efaa4c8501d51eceb7075a12bded8ade4d479074a4dfc777976269", + "zh:ec69b42faf218e015556ab1d55ea47b4bcb5b76754ee8209a950574250de7db5", ] } -provider "registry.terraform.io/hashicorp/helm" { - version = "2.7.1" +provider "registry.opentofu.org/hashicorp/helm" { + version = "2.12.1" hashes = [ - "h1:11oWNeohjD8Fy9S7WQSKY3GmDZi7gVdMRp8/Wqxn410=", - "h1:OGZRkgiLBWmoA8/a9xZnEs5gsC5JhW+75++MkCPQbqw=", - "zh:13e2467092deeff01c4cfa2b54ba4510aa7a9b06c58f22c4215b0f4333858364", - "zh:4549843db4fdf5d8150e8c0734e67b54b5c3bcfc914e3221e6952f428fb984d2", - "zh:55b5f83ed52f93dd00a73c33c948326052efd700350c19e63bb1679b12bfcda6", - "zh:749397e41393289eb0ef6efd0a75911d29b8aa7f48e5d6813b4b350dad91acbd", - "zh:7a4a2c95b055f6c8e70d1fc7a4cc4fd6e4f04845be36e40d42d31dfc13db37b8", - "zh:8143e5b8218857052505c805b570889b862c618ce6cbfbddb98938ff7a5901d3", - "zh:856d94b3b34d6204d66c6de4feab4737c74dba037ad64e4c613e8eec61d17f1a", - "zh:b9b037f1edda209022df1c7fc906786970524873e27b061f3355cb9bbed2cf08", - "zh:c433b27f52a0600490af07f8b217ab0b1048ba347d68e6fe478aba18634e78d9", - "zh:da133748368c6e27b433cd7faeb7b800536c8651e7af0415452901dfc7577dbf", - "zh:eecc63c2dec8aafa2ffd7426800c3e1a5e31e848be01ea9511ad0184dce15945", - "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", + "h1:ajWSFsohX3kQNLs8DbQd93UJlKTUy4HnccLZ2xWCfFM=", + "zh:0349149992646530c33314cb973eba68757606a037017ba47e56db695d4b3afe", + "zh:3138ffe23c481b01419a4a21adf83538efe6e698b421c4a8f7d142b198518709", + "zh:44658e3070405b88fbd76161ecddde62f478dc31aaebee3b93c2f2783a6d45f9", + "zh:5600a3407dfb8b77da7561490157afa8ad505c864a5dd35ed8d678e9ad8378ca", + "zh:6445e359c813ecbb7c2edf722ed0d1f33dfb171b6a7b470f40cf1e24045b7441", + "zh:7973054604c7f5a51600f6e63fa0327d05b29fac2bffd222c21660cbdd2939f9", + "zh:7c59e2d4602ab5d9de0ba8e442ec1fc425c8f143581018d1e7f645298a124f01", + "zh:8c0fb411dd5de664ac5e801d70507781790c4fc196518a56966d66d0963c240c", + "zh:a6a988c91bbf1828a8fc55001f10c7d06c5c53dc718ee7cd6814bdfa2e6652e0", + "zh:b7935d7dacd7e5a91ff9d17cfb04ce88c9100e563fd88487d14519e8d8d8b2e1", ] } -provider "registry.terraform.io/hashicorp/kubernetes" { - version = "2.15.0" +provider "registry.opentofu.org/hashicorp/kubernetes" { + version = "2.27.0" hashes = [ - "h1:Gcy0a0uHLgHJdqs9le6S0f8zp3xpmHKxH48el5kT0iI=", - "h1:wAdoEHV4gXntbTcKkva3AKQKt1+BZL9Bi+Z+RZjFYyc=", - "zh:108011c33c0fc0b4d429d511bf97744b40b1ab261d51d413b3bffc8247369f26", - "zh:3ac39669fa20b7e0430753c3023d8393348213a84c69a18dc75057761478cfcf", - "zh:530d274328ce6428300dccf94e26d180c4c867b8fd0e4992ae890451c421fec5", - "zh:63245aa73e9df0c71b667ad9e2c6a3495ab3fe43bac0e18a54277ff0593fecdf", - "zh:71794ea586e3dc32091269b84734e82b3481faf2d0c359c2f4cab7495d4862f5", - "zh:74e163dee3d707ba500830360502b3290b18ed4f753d86c1b39b31ee2b937d2e", - "zh:79861de68923f6fd100b7b50a781458437f5d236aa0092005f77beb71f9c13f0", - "zh:93cbf9665675c56e045cb42dad7a3985603eaba3893c2dca114880026ddc6016", - "zh:a503259f0f4b0028e27a98e5d3a62b7bd70fee763a96ac1880ad7397e31783c8", - "zh:d861f87b9b129d60946d580a4190a3bd2aaa30f4fbb237a6a0823fc567c6209a", - "zh:e70dacf74b773326e6c618d41ad51a4220eec2caf77617bf45861af46ba2a4ab", - "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", + "h1:sQ413yweMfNSLmWSFzUXiBnSfH7NlrPWaPIRERV7mRg=", + "zh:1146f53fb39fd4bcea5574303c4871001a97d7891f65a60a4ecbc64da2a90d75", + "zh:1f7e3dc0dbb854f56a0f5ba3c50588272984ae9775da027c3c7f32cb6d8245b0", + "zh:2166f7fdade75266658603280bc822edab848e52a674340485847dde1c5d9324", + "zh:21a97530857330d2013aa66fb7afebb44fe4a5543418d0a3ca93750acd11fea5", + "zh:2d4b9fea7e99750647e1cd8df9a67cba45905825867dd19ab01411dad6b8c6fd", + "zh:de30e92e638b95e56dbb2232cb9a6f6a69346ecb3644965e9be715eaf29f22ff", + "zh:f4ae951c9add4349a498f44c3f5768cbaf7a966392a0e7632de288889e7cd5d9", + "zh:f54ecb1917dfa198933d72632ea6f0aa4da3ead070d6b9765ec1d3b7da60e827", + "zh:fba8a2f192eb5fe248708b9037db046e0d9176e7c54c6edc6f6aa55d50474082", + "zh:fe525956f3e54f0bbd2891a6abad1f807b4763b8dc734d810e223876741fefa3", ] } -provider "registry.terraform.io/vmware-tanzu/carvel" { - version = "0.11.0" +provider "registry.opentofu.org/vmware-tanzu/carvel" { + version = "0.11.2" hashes = [ - "h1:HslYwK+G5J3IdsXMx0ZMU2p6g1Ef7aVfUtZZu4YYJsg=", - "h1:eZ1vBbOHZXncW/VMApPy48ILXqZq71BXpq8KhcN5HI4=", - "zh:3c30070314cd7da84da2d5a92727fb73b1df9d7b84741f6f546a371ee8888343", - "zh:47a956718197e8acc997a80723b341564c65650e7157ac3bc37fe87193421e26", - "zh:4c50d7039bb5ed10343428809ffb76eb2614a136009d346dcbc33fadc41f6e62", - "zh:5e51a8c5f6ce40e504245f650471aebcbe496eddb6e45d6fa39464cae1826fed", - "zh:6b0bbf211d430b82ccc0b48bb968a6774cb2cdf14857082f08b17cfba0001840", - "zh:6e2ff5f40826cac5c67426dbb1cbb7d87db8d159c086942e261d9408a3dd727b", - "zh:87e5131ffc9e49aa4f0870fce306741869d3db16182fce447a54f5c983ecd427", - "zh:aa62d835e25423fb006fac9abfe831df1f54abef1ac85cf03f8c0e334f437fc5", - "zh:b2d4ef885ecc97b2e577e5ee99d9c51237aaa903a6cdf54fc16dc24922521a2d", - "zh:c90a853e5eb6873fc3470016f2b91a73ea564a6b2c05b5869527b9fd7a8ae799", - "zh:cbd57379966e609d9a600dc89783b41ac64601c13b87ca3a5b0b5be254181e2d", - "zh:e6e538fe5ebd296a7a2325095bfad34148fe043e5219ea6f067f25f915bf881d", + "h1:lpfmYk4NK57c4dBiRvzMQ1ki5GraCT13ChnBXsYZChM=", + "zh:0df2ed7631a8c2864d61e3a351cd02faf0b36264e0d92074e9c352bd12bde93d", + "zh:201b68accff4f3835591c36e4b5ac16fcbbc2749f0570607502cbc3e5709a2df", + "zh:25dba84cd01f9bb44978246509ed9f25dd65dc5a7a0bfaf8b08920620365a078", + "zh:535188456d5cf6b996f9a3db03ec0f920464492a77dcd1b0ba0c76234ad37e35", + "zh:56cf900e40d3b0ace54e522455101af5423634b4ae94d5d3844fb8a7c3b34f92", + "zh:64178282853a2f0fb36612f0ee525b0b84b456acdb9bf1171becd914a180654d", + "zh:65c4589e709672b6b087b954d8d2ef880dae0a71fa3157833960634dece50140", + "zh:a34707ed7c3887750967f41f83e994273af4febe772b9fec097db1b5aa45b6e7", + "zh:a422c526d2f8e6dea207607e65f273b0802067b390e6ad3fa2e1890beee6c9dc", + "zh:a6778e77093c5a480db7bc1de7e3af661049b151f55dc50c965cf280226d735b", + "zh:b735a49ebb8efa19b59f617ecb5d7b1bd98b20e340e8bc612867205f46377cbd", + "zh:c307685c882ddee930e52e9f03e393a0c9eecd1300d5a57dff95fde9c77e7454", + "zh:c5a06db70fd528baafb492d0507a71a2924e7ebf7a92f3d16da2c2cf76c13edb", ] } diff --git a/terragrunt/concourse-wg-ci/backend/.terraform.lock.hcl b/terragrunt/concourse-wg-ci/backend/.terraform.lock.hcl index 4baf93e..9aa56e9 100644 --- a/terragrunt/concourse-wg-ci/backend/.terraform.lock.hcl +++ b/terragrunt/concourse-wg-ci/backend/.terraform.lock.hcl @@ -1,11 +1,10 @@ -# This file is maintained automatically by "terraform init". +# This file is maintained automatically by "tofu init". # Manual edits may be lost in future updates. -provider "registry.terraform.io/gavinbunney/kubectl" { +provider "registry.opentofu.org/gavinbunney/kubectl" { version = "1.14.0" hashes = [ - "h1:gLFn+RvP37sVzp9qnFCwngRjjFV649r6apjxvJ1E/SE=", - "h1:mX2AOFIMIxJmW5kM8DT51gloIOKCr9iT6W8yodnUyfs=", + "h1:ItrWfCZMzM2JmvDncihBMalNLutsAk7kyyxVRaipftY=", "zh:0350f3122ff711984bbc36f6093c1fe19043173fad5a904bce27f86afe3cc858", "zh:07ca36c7aa7533e8325b38232c77c04d6ef1081cb0bac9d56e8ccd51f12f2030", "zh:0c351afd91d9e994a71fe64bbd1662d0024006b3493bb61d46c23ea3e42a7cf5", @@ -18,63 +17,56 @@ provider "registry.terraform.io/gavinbunney/kubectl" { ] } -provider "registry.terraform.io/hashicorp/google" { - version = "4.41.0" +provider "registry.opentofu.org/hashicorp/google" { + version = "5.20.0" hashes = [ - "h1:2Bl3jLwdZpzp70yuCIxfn7gL/858f0I/Cv7yuzRySM0=", - "h1:pEu2st2CcWDinLQN8EGgab3ZG2Yr3w0DcoGF+SEOAKY=", - "h1:y93m+LUJaInSsUB1gN/BKrUL97rizTh//5oFUdA7pFM=", - "zh:0c31cae2ec737150987554993f0e332b022bf8e369217967f10029259441db0a", - "zh:4d477e5412575353267cde02d028d8b53b4f9b472548d4079a0512c3ba11751f", - "zh:52a14d7cd851f050a5bf2ba6789200b40bccb0e6240865bcc94f496ae0f77bc0", - "zh:55e18f98ef6f310d93ac84ec0233e0bcd4668f87df7cfe8f81c1fe3a082255a4", - "zh:6017ed02e028ebab6fb4029475f9af6569ee9d69f3c103e7b17d11f2674b2110", - "zh:73e601e534379471fe737136d850ee6f7d3e28efc5befcc7c5a6c6926e3f9dc7", - "zh:886de755287c5a95b53827d3ff77326a9974e17dc27b7a30b05450c1e197622e", - "zh:a80507fb2a92bf698e4c68597d3a36949065a27bc570a19fcaf07552e2b7a5d2", - "zh:ba1b274c95d98da8baadbb2a1dfc4d822b9c1c2cabffc22614423fb9ba48881e", - "zh:bd87817c8e1af629951985d45896627d0e0c16d8c8f23ec479e2f25e04149729", - "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", - "zh:fa451d8caec68902496ec2446ac0074bb51e43f749b76b7d077b81eb3948d0d8", + "h1:F8uXYuqI/A7EMUA7FJaLYiq1JTuGxKRWy6sEGV1gVQQ=", + "zh:124d7577793fe37fcc5228039eb478061fd0863a15eb3e1570db44005f69382c", + "zh:3c500b7cfbb51b216f738797db2ed7e91ad646c1c782561c4333fcfe828ef80a", + "zh:463a439976fd0e97205c750e83915bac7118605d40b4871e7c41df712d1e4c83", + "zh:5802953a3dd08e6c27f5f2d8f6cf4ee7b20db46494054abf4ddb2d5c355450c8", + "zh:5e54e697020d2d48db792b8a6b9ac8f0b23d955c00d2a2a5a9d08731da62abea", + "zh:778019fdf28ba42c605ab82353a6ce6117d4091adf3227c7f63ee555fe2e5d48", + "zh:b8958ec729dd034d8c4d8a4c8184da958cfd2b52df01b0aede120158cc6b65ca", + "zh:c8e8c87653cdda0855d3b0f1c8924c47280a6ce6bb313fd76169280f2cc7320b", + "zh:ec251ee722efaa4c8501d51eceb7075a12bded8ade4d479074a4dfc777976269", + "zh:ec69b42faf218e015556ab1d55ea47b4bcb5b76754ee8209a950574250de7db5", ] } -provider "registry.terraform.io/hashicorp/kubernetes" { - version = "2.15.0" +provider "registry.opentofu.org/hashicorp/kubernetes" { + version = "2.27.0" hashes = [ - "h1:Gcy0a0uHLgHJdqs9le6S0f8zp3xpmHKxH48el5kT0iI=", - "h1:wAdoEHV4gXntbTcKkva3AKQKt1+BZL9Bi+Z+RZjFYyc=", - "zh:108011c33c0fc0b4d429d511bf97744b40b1ab261d51d413b3bffc8247369f26", - "zh:3ac39669fa20b7e0430753c3023d8393348213a84c69a18dc75057761478cfcf", - "zh:530d274328ce6428300dccf94e26d180c4c867b8fd0e4992ae890451c421fec5", - "zh:63245aa73e9df0c71b667ad9e2c6a3495ab3fe43bac0e18a54277ff0593fecdf", - "zh:71794ea586e3dc32091269b84734e82b3481faf2d0c359c2f4cab7495d4862f5", - "zh:74e163dee3d707ba500830360502b3290b18ed4f753d86c1b39b31ee2b937d2e", - "zh:79861de68923f6fd100b7b50a781458437f5d236aa0092005f77beb71f9c13f0", - "zh:93cbf9665675c56e045cb42dad7a3985603eaba3893c2dca114880026ddc6016", - "zh:a503259f0f4b0028e27a98e5d3a62b7bd70fee763a96ac1880ad7397e31783c8", - "zh:d861f87b9b129d60946d580a4190a3bd2aaa30f4fbb237a6a0823fc567c6209a", - "zh:e70dacf74b773326e6c618d41ad51a4220eec2caf77617bf45861af46ba2a4ab", - "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", + "h1:sQ413yweMfNSLmWSFzUXiBnSfH7NlrPWaPIRERV7mRg=", + "zh:1146f53fb39fd4bcea5574303c4871001a97d7891f65a60a4ecbc64da2a90d75", + "zh:1f7e3dc0dbb854f56a0f5ba3c50588272984ae9775da027c3c7f32cb6d8245b0", + "zh:2166f7fdade75266658603280bc822edab848e52a674340485847dde1c5d9324", + "zh:21a97530857330d2013aa66fb7afebb44fe4a5543418d0a3ca93750acd11fea5", + "zh:2d4b9fea7e99750647e1cd8df9a67cba45905825867dd19ab01411dad6b8c6fd", + "zh:de30e92e638b95e56dbb2232cb9a6f6a69346ecb3644965e9be715eaf29f22ff", + "zh:f4ae951c9add4349a498f44c3f5768cbaf7a966392a0e7632de288889e7cd5d9", + "zh:f54ecb1917dfa198933d72632ea6f0aa4da3ead070d6b9765ec1d3b7da60e827", + "zh:fba8a2f192eb5fe248708b9037db046e0d9176e7c54c6edc6f6aa55d50474082", + "zh:fe525956f3e54f0bbd2891a6abad1f807b4763b8dc734d810e223876741fefa3", ] } -provider "registry.terraform.io/vmware-tanzu/carvel" { - version = "0.11.0" +provider "registry.opentofu.org/vmware-tanzu/carvel" { + version = "0.11.2" hashes = [ - "h1:HslYwK+G5J3IdsXMx0ZMU2p6g1Ef7aVfUtZZu4YYJsg=", - "h1:eZ1vBbOHZXncW/VMApPy48ILXqZq71BXpq8KhcN5HI4=", - "zh:3c30070314cd7da84da2d5a92727fb73b1df9d7b84741f6f546a371ee8888343", - "zh:47a956718197e8acc997a80723b341564c65650e7157ac3bc37fe87193421e26", - "zh:4c50d7039bb5ed10343428809ffb76eb2614a136009d346dcbc33fadc41f6e62", - "zh:5e51a8c5f6ce40e504245f650471aebcbe496eddb6e45d6fa39464cae1826fed", - "zh:6b0bbf211d430b82ccc0b48bb968a6774cb2cdf14857082f08b17cfba0001840", - "zh:6e2ff5f40826cac5c67426dbb1cbb7d87db8d159c086942e261d9408a3dd727b", - "zh:87e5131ffc9e49aa4f0870fce306741869d3db16182fce447a54f5c983ecd427", - "zh:aa62d835e25423fb006fac9abfe831df1f54abef1ac85cf03f8c0e334f437fc5", - "zh:b2d4ef885ecc97b2e577e5ee99d9c51237aaa903a6cdf54fc16dc24922521a2d", - "zh:c90a853e5eb6873fc3470016f2b91a73ea564a6b2c05b5869527b9fd7a8ae799", - "zh:cbd57379966e609d9a600dc89783b41ac64601c13b87ca3a5b0b5be254181e2d", - "zh:e6e538fe5ebd296a7a2325095bfad34148fe043e5219ea6f067f25f915bf881d", + "h1:lpfmYk4NK57c4dBiRvzMQ1ki5GraCT13ChnBXsYZChM=", + "zh:0df2ed7631a8c2864d61e3a351cd02faf0b36264e0d92074e9c352bd12bde93d", + "zh:201b68accff4f3835591c36e4b5ac16fcbbc2749f0570607502cbc3e5709a2df", + "zh:25dba84cd01f9bb44978246509ed9f25dd65dc5a7a0bfaf8b08920620365a078", + "zh:535188456d5cf6b996f9a3db03ec0f920464492a77dcd1b0ba0c76234ad37e35", + "zh:56cf900e40d3b0ace54e522455101af5423634b4ae94d5d3844fb8a7c3b34f92", + "zh:64178282853a2f0fb36612f0ee525b0b84b456acdb9bf1171becd914a180654d", + "zh:65c4589e709672b6b087b954d8d2ef880dae0a71fa3157833960634dece50140", + "zh:a34707ed7c3887750967f41f83e994273af4febe772b9fec097db1b5aa45b6e7", + "zh:a422c526d2f8e6dea207607e65f273b0802067b390e6ad3fa2e1890beee6c9dc", + "zh:a6778e77093c5a480db7bc1de7e3af661049b151f55dc50c965cf280226d735b", + "zh:b735a49ebb8efa19b59f617ecb5d7b1bd98b20e340e8bc612867205f46377cbd", + "zh:c307685c882ddee930e52e9f03e393a0c9eecd1300d5a57dff95fde9c77e7454", + "zh:c5a06db70fd528baafb492d0507a71a2924e7ebf7a92f3d16da2c2cf76c13edb", ] } diff --git a/terragrunt/concourse-wg-ci/dr_create/.terraform.lock.hcl b/terragrunt/concourse-wg-ci/dr_create/.terraform.lock.hcl index b791e35..0776a0d 100644 --- a/terragrunt/concourse-wg-ci/dr_create/.terraform.lock.hcl +++ b/terragrunt/concourse-wg-ci/dr_create/.terraform.lock.hcl @@ -1,62 +1,71 @@ -# This file is maintained automatically by "terraform init". +# This file is maintained automatically by "tofu init". # Manual edits may be lost in future updates. -provider "registry.terraform.io/hashicorp/google" { - version = "4.43.0" +provider "registry.opentofu.org/hashicorp/cloudinit" { + version = "2.3.3" + constraints = ">= 2.3.1" hashes = [ - "h1:PSIkDVwksHe9oZd+XP369N8U+6/+SPF8Z5wHkcwmWKw=", - "h1:gmUUWhuuY/YRIllvVBRGl1kUHqsNBHQ/4BHdwKQbzXQ=", - "zh:0b424cab24856dc47177733145fa61b731f345a6a42a0c0b7910ccfcf4e8c8a2", - "zh:0c6b3049957b942e1dbc6f8c38de653a78ff1efe40a7cfc506e60a8da2775591", - "zh:652b740a7f75d716daf0fa9b2ef1964944eb4f8b0b26834dd8659a6ac2f3ed52", - "zh:89222d36d8060beb13df6758d6d9b2d075fa809e90a910a2ce1a867cfa6ff654", - "zh:a8c04acc69a65cb68b91ec08aa89c4953840dad33482c9acf4cc0272375b3bf4", - "zh:b71c10a8167cb6c7c3ae174c8c181a06dc82564f097f89602c3d74e8a7627e92", - "zh:bb9a92b640cf0596edcc510ddd20725637c1ff295054f727277108a4a3c9baec", - "zh:bcd028cd233287420ecfbe4102e59e351e6fd22a4a14698e6896c45fb0509a1e", - "zh:bd9d096abdc42a3cf5849ae8adc9c8ca327c026e6f6f287fd436b6adfc8630dc", - "zh:e8647c8ab63144013446b73c695a01f6bef16712613f1461d1c0bc37e1ba80d6", - "zh:ed01ea31e457d6c4e01a5d6dfd6ad3d09a0a58ff7dc4de494bf559fbc34fa936", - "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", + "h1:2DqQ1QlY+CiievWJmyLah8DcFv2FnFRtvclfJh/6NNI=", + "zh:132f1782bb198a635892ea4b116fd69ffabcf4b6b11f86c57faf53b19575c23d", + "zh:21e7ab6820990f314de03be87af71cb4bae2409fa18007d11cfa60066a7f924c", + "zh:2a6a71194f3923ba6136c8a17765f505fa3e20624f4cd1078f36bdb92cafbe00", + "zh:2cf69cac676eb20e5f82b1dbb739c30b963fd6010e430e1b0bf3dfedc6554000", + "zh:3c508f6ef48fc8073d2e4ebd1ea1532b52e4d7ac679908d73891e8f4b451a71d", + "zh:5ab08771183c7dd6070ae95be84154540f15c41b34606e55fe87639e0bfddc0c", + "zh:af20410183201bbbe4e13f7fa69f0a57eea5b925e3092036f1aaa2767f1a7516", + "zh:bbb60400a2c17aa31728b348d4f7ba2de8a20b014b0c0658c7ff1f54a4e1f776", + "zh:e8cd5c617707b5e5f78a2dba45e864b7690930f39aa6c84e9455e9f3943cb83c", + "zh:f43b99f6b6d581d2745e4f0cfdeb0425f381c113bebf2cc95c08c8f8c2d6506b", ] } -provider "registry.terraform.io/hashicorp/google-beta" { - version = "4.43.0" +provider "registry.opentofu.org/hashicorp/google" { + version = "5.20.0" hashes = [ - "h1:8VHj+IfnuSb4lB5j9Re3RLyTccwnqFZev1LPn8/5xCs=", - "h1:hz/LB+GuYU3LkOEU6TSFBpaKU+MDP+HWhDY1X9k4wao=", - "zh:1904afd736547da2563d51b3bbcb827ed6c488b30bcb60d19efd81153db10648", - "zh:40d47748efb8d57096747834c5b6743f31012ae1d2ef3bb783505406e532f552", - "zh:72acc0b22320aac74289a0284d84187b2de065ddce0fe77760ea9eb688267057", - "zh:7c131094e2b035ce77333cd3c4bd45b5b858ce20b3cdb0fc9c2155f1dac415be", - "zh:823780a260f2845d316adc3692ed886299894091f3ba81b2962d4db58d90d21a", - "zh:9ae53fd8a595067d4886d94d81e7e776ab44a5c4a491b2e095dadd52b7b1a828", - "zh:a7dcad2a71b13b8f698ddd7694a249a1ddd9424958e738a3cbaa0391184b91e9", - "zh:b576d880d8e4a26a5b05017585ff755bd7e385cc8c8fd3e8061755827a9f194c", - "zh:cccb31e30b09a5d922568eb5ab7cdd025f45b485dff9c32418404d390d822c4f", - "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", - "zh:f9c65eba3f9af1b2ad327f152a276a4459b6310fbcf07d0dca366a407045a7c5", - "zh:fbe9d0e530d05a3090bb68ac724320bfd76265c043263c261519e7ea104a7c32", + "h1:F8uXYuqI/A7EMUA7FJaLYiq1JTuGxKRWy6sEGV1gVQQ=", + "zh:124d7577793fe37fcc5228039eb478061fd0863a15eb3e1570db44005f69382c", + "zh:3c500b7cfbb51b216f738797db2ed7e91ad646c1c782561c4333fcfe828ef80a", + "zh:463a439976fd0e97205c750e83915bac7118605d40b4871e7c41df712d1e4c83", + "zh:5802953a3dd08e6c27f5f2d8f6cf4ee7b20db46494054abf4ddb2d5c355450c8", + "zh:5e54e697020d2d48db792b8a6b9ac8f0b23d955c00d2a2a5a9d08731da62abea", + "zh:778019fdf28ba42c605ab82353a6ce6117d4091adf3227c7f63ee555fe2e5d48", + "zh:b8958ec729dd034d8c4d8a4c8184da958cfd2b52df01b0aede120158cc6b65ca", + "zh:c8e8c87653cdda0855d3b0f1c8924c47280a6ce6bb313fd76169280f2cc7320b", + "zh:ec251ee722efaa4c8501d51eceb7075a12bded8ade4d479074a4dfc777976269", + "zh:ec69b42faf218e015556ab1d55ea47b4bcb5b76754ee8209a950574250de7db5", ] } -provider "registry.terraform.io/hashicorp/kubernetes" { - version = "2.15.0" +provider "registry.opentofu.org/hashicorp/google-beta" { + version = "5.20.0" hashes = [ - "h1:Gcy0a0uHLgHJdqs9le6S0f8zp3xpmHKxH48el5kT0iI=", - "h1:wAdoEHV4gXntbTcKkva3AKQKt1+BZL9Bi+Z+RZjFYyc=", - "zh:108011c33c0fc0b4d429d511bf97744b40b1ab261d51d413b3bffc8247369f26", - "zh:3ac39669fa20b7e0430753c3023d8393348213a84c69a18dc75057761478cfcf", - "zh:530d274328ce6428300dccf94e26d180c4c867b8fd0e4992ae890451c421fec5", - "zh:63245aa73e9df0c71b667ad9e2c6a3495ab3fe43bac0e18a54277ff0593fecdf", - "zh:71794ea586e3dc32091269b84734e82b3481faf2d0c359c2f4cab7495d4862f5", - "zh:74e163dee3d707ba500830360502b3290b18ed4f753d86c1b39b31ee2b937d2e", - "zh:79861de68923f6fd100b7b50a781458437f5d236aa0092005f77beb71f9c13f0", - "zh:93cbf9665675c56e045cb42dad7a3985603eaba3893c2dca114880026ddc6016", - "zh:a503259f0f4b0028e27a98e5d3a62b7bd70fee763a96ac1880ad7397e31783c8", - "zh:d861f87b9b129d60946d580a4190a3bd2aaa30f4fbb237a6a0823fc567c6209a", - "zh:e70dacf74b773326e6c618d41ad51a4220eec2caf77617bf45861af46ba2a4ab", - "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", + "h1:33SDa55mMt/ze1LIm6jrikIy5u4h5cGWO4Uqz0cOD94=", + "zh:17da770e66194e530184e383b0d82eb69e2c4060b0970d1190c3a92a6c08e7c3", + "zh:314d1abcf5cc21aeedaacc82bcac9b1f22d5d109bb1418c81fb4ec8645e9d696", + "zh:3180f5ad8d1a40b0a73f433d8db808a34ef4550cfb03b3410d1980e60399c3d4", + "zh:4138abd9bae524a80df2aa81835b3fdb37d0013c2e6699aade64860be0be543e", + "zh:48efe52a3ca47132baf3279ce4d8f517fffd3f46e8e50df234859396116b4431", + "zh:495af6b84ddd51f721e8e9893627ca13f2dfcfc5742810e79e9b2a024965d105", + "zh:6542a4566b6f93b76639a832e1f423717c1670758029e2ffff9b7d6aba5bc40a", + "zh:76fddf054bffb9990ebc3019355e443c9473ef33b894989838c6165f6a11e35b", + "zh:cb171e7bf6bb55f94963571a960651a6dfe594956f1209c995464138fd3e022f", + "zh:d8453bda885009e5efb391783777802412a0beaed0858354062932f9653a28da", + ] +} + +provider "registry.opentofu.org/hashicorp/kubernetes" { + version = "2.27.0" + hashes = [ + "h1:sQ413yweMfNSLmWSFzUXiBnSfH7NlrPWaPIRERV7mRg=", + "zh:1146f53fb39fd4bcea5574303c4871001a97d7891f65a60a4ecbc64da2a90d75", + "zh:1f7e3dc0dbb854f56a0f5ba3c50588272984ae9775da027c3c7f32cb6d8245b0", + "zh:2166f7fdade75266658603280bc822edab848e52a674340485847dde1c5d9324", + "zh:21a97530857330d2013aa66fb7afebb44fe4a5543418d0a3ca93750acd11fea5", + "zh:2d4b9fea7e99750647e1cd8df9a67cba45905825867dd19ab01411dad6b8c6fd", + "zh:de30e92e638b95e56dbb2232cb9a6f6a69346ecb3644965e9be715eaf29f22ff", + "zh:f4ae951c9add4349a498f44c3f5768cbaf7a966392a0e7632de288889e7cd5d9", + "zh:f54ecb1917dfa198933d72632ea6f0aa4da3ead070d6b9765ec1d3b7da60e827", + "zh:fba8a2f192eb5fe248708b9037db046e0d9176e7c54c6edc6f6aa55d50474082", + "zh:fe525956f3e54f0bbd2891a6abad1f807b4763b8dc734d810e223876741fefa3", ] } diff --git a/terragrunt/concourse-wg-ci/infra/.terraform.lock.hcl b/terragrunt/concourse-wg-ci/infra/.terraform.lock.hcl index 22bb037..7f0a687 100644 --- a/terragrunt/concourse-wg-ci/infra/.terraform.lock.hcl +++ b/terragrunt/concourse-wg-ci/infra/.terraform.lock.hcl @@ -1,12 +1,10 @@ -# This file is maintained automatically by "terraform init". +# This file is maintained automatically by "tofu init". # Manual edits may be lost in future updates. -provider "registry.terraform.io/gavinbunney/kubectl" { +provider "registry.opentofu.org/gavinbunney/kubectl" { version = "1.14.0" hashes = [ "h1:ItrWfCZMzM2JmvDncihBMalNLutsAk7kyyxVRaipftY=", - "h1:gLFn+RvP37sVzp9qnFCwngRjjFV649r6apjxvJ1E/SE=", - "h1:mX2AOFIMIxJmW5kM8DT51gloIOKCr9iT6W8yodnUyfs=", "zh:0350f3122ff711984bbc36f6093c1fe19043173fad5a904bce27f86afe3cc858", "zh:07ca36c7aa7533e8325b38232c77c04d6ef1081cb0bac9d56e8ccd51f12f2030", "zh:0c351afd91d9e994a71fe64bbd1662d0024006b3493bb61d46c23ea3e42a7cf5", @@ -19,65 +17,53 @@ provider "registry.terraform.io/gavinbunney/kubectl" { ] } -provider "registry.terraform.io/hashicorp/google" { - version = "4.41.0" +provider "registry.opentofu.org/hashicorp/google" { + version = "5.20.0" hashes = [ - "h1:2Bl3jLwdZpzp70yuCIxfn7gL/858f0I/Cv7yuzRySM0=", - "h1:pEu2st2CcWDinLQN8EGgab3ZG2Yr3w0DcoGF+SEOAKY=", - "h1:y93m+LUJaInSsUB1gN/BKrUL97rizTh//5oFUdA7pFM=", - "zh:0c31cae2ec737150987554993f0e332b022bf8e369217967f10029259441db0a", - "zh:4d477e5412575353267cde02d028d8b53b4f9b472548d4079a0512c3ba11751f", - "zh:52a14d7cd851f050a5bf2ba6789200b40bccb0e6240865bcc94f496ae0f77bc0", - "zh:55e18f98ef6f310d93ac84ec0233e0bcd4668f87df7cfe8f81c1fe3a082255a4", - "zh:6017ed02e028ebab6fb4029475f9af6569ee9d69f3c103e7b17d11f2674b2110", - "zh:73e601e534379471fe737136d850ee6f7d3e28efc5befcc7c5a6c6926e3f9dc7", - "zh:886de755287c5a95b53827d3ff77326a9974e17dc27b7a30b05450c1e197622e", - "zh:a80507fb2a92bf698e4c68597d3a36949065a27bc570a19fcaf07552e2b7a5d2", - "zh:ba1b274c95d98da8baadbb2a1dfc4d822b9c1c2cabffc22614423fb9ba48881e", - "zh:bd87817c8e1af629951985d45896627d0e0c16d8c8f23ec479e2f25e04149729", - "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", - "zh:fa451d8caec68902496ec2446ac0074bb51e43f749b76b7d077b81eb3948d0d8", + "h1:F8uXYuqI/A7EMUA7FJaLYiq1JTuGxKRWy6sEGV1gVQQ=", + "zh:124d7577793fe37fcc5228039eb478061fd0863a15eb3e1570db44005f69382c", + "zh:3c500b7cfbb51b216f738797db2ed7e91ad646c1c782561c4333fcfe828ef80a", + "zh:463a439976fd0e97205c750e83915bac7118605d40b4871e7c41df712d1e4c83", + "zh:5802953a3dd08e6c27f5f2d8f6cf4ee7b20db46494054abf4ddb2d5c355450c8", + "zh:5e54e697020d2d48db792b8a6b9ac8f0b23d955c00d2a2a5a9d08731da62abea", + "zh:778019fdf28ba42c605ab82353a6ce6117d4091adf3227c7f63ee555fe2e5d48", + "zh:b8958ec729dd034d8c4d8a4c8184da958cfd2b52df01b0aede120158cc6b65ca", + "zh:c8e8c87653cdda0855d3b0f1c8924c47280a6ce6bb313fd76169280f2cc7320b", + "zh:ec251ee722efaa4c8501d51eceb7075a12bded8ade4d479074a4dfc777976269", + "zh:ec69b42faf218e015556ab1d55ea47b4bcb5b76754ee8209a950574250de7db5", ] } -provider "registry.terraform.io/hashicorp/google-beta" { - version = "4.41.0" +provider "registry.opentofu.org/hashicorp/google-beta" { + version = "5.20.0" hashes = [ - "h1:+DQItGMunnkbYoCLZGbWFKDdZBXeU4SIGtA/cCt8A7o=", - "h1:/IXKuSzpiVuyHG2K3IANxAPh77atkfoC+HkuclgHgfk=", - "h1:/YLU8F+ltpZp+/W/K4znb3XsS83Kdc4QcBGMQ9XEgVs=", - "zh:17ab0b89abba35b5fa1e6bfccc83672ed5db84de4bf3c44eb79c9093b31fad38", - "zh:1d76a5d9b6739167de5a2ec102b375bb1764d2dae4265fcfe32f408978161f7d", - "zh:2637bf7e62406919280db89873e90e7b64679f5b0cebf4a916f6dfaeac4336cb", - "zh:2d33b60015596f6891a5f2fa3e1e9744fe6bff76d29afeabfa92a996eb63f87d", - "zh:36c398260d82490c1829e94d2e769f29112bba9fea21b5b2ba84414c7826fb7a", - "zh:8dcd1d3676cf2f52f4ef44459c5d5a2115a904e4f353afed76582b62b62742a1", - "zh:92eb6eadcc9e7f6e534b26182a2b4af8f4f5a58057507517d51849d57975ac20", - "zh:ce858392a37acca189ab44f55ee12029122fac0e1e3ac59a37cb15a9a020f8f2", - "zh:cf1380a51f27cec7f39050d521cccde41ce8ef0093391be1206158b80bd39ff7", - "zh:e43f08cb8636f5cb52fa5d9bfac376d0170396b81618bf48c180944a49e3c077", - "zh:e4b366211d5df08192638dfa721dd975b67c89e0dde9c5df709747c3056dcaae", - "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", + "h1:33SDa55mMt/ze1LIm6jrikIy5u4h5cGWO4Uqz0cOD94=", + "zh:17da770e66194e530184e383b0d82eb69e2c4060b0970d1190c3a92a6c08e7c3", + "zh:314d1abcf5cc21aeedaacc82bcac9b1f22d5d109bb1418c81fb4ec8645e9d696", + "zh:3180f5ad8d1a40b0a73f433d8db808a34ef4550cfb03b3410d1980e60399c3d4", + "zh:4138abd9bae524a80df2aa81835b3fdb37d0013c2e6699aade64860be0be543e", + "zh:48efe52a3ca47132baf3279ce4d8f517fffd3f46e8e50df234859396116b4431", + "zh:495af6b84ddd51f721e8e9893627ca13f2dfcfc5742810e79e9b2a024965d105", + "zh:6542a4566b6f93b76639a832e1f423717c1670758029e2ffff9b7d6aba5bc40a", + "zh:76fddf054bffb9990ebc3019355e443c9473ef33b894989838c6165f6a11e35b", + "zh:cb171e7bf6bb55f94963571a960651a6dfe594956f1209c995464138fd3e022f", + "zh:d8453bda885009e5efb391783777802412a0beaed0858354062932f9653a28da", ] } -provider "registry.terraform.io/hashicorp/kubernetes" { - version = "2.14.0" +provider "registry.opentofu.org/hashicorp/kubernetes" { + version = "2.27.0" hashes = [ - "h1:4zSUEWLVFn2Sji7mWT64XQGWwBQVDqTGXGfW4ZBB16U=", - "h1:7fQ/FCIZjnff7EzkyQ6Jh+wBAIZFwHoi5qOxQ1/OD6I=", - "h1:FFeFf2j2ipbMlrbhmIv8M7bzX3Zq8SQHeFkkQGALh1k=", - "zh:1363fcd6eb3c63113eaa6947a4e7a9f78a6974ea344e89b662d97a78e2ccb70c", - "zh:166352455666b7d584705ceeb00f24fb9b884ab84e3a1a6019dc45d6539c9174", - "zh:4615249ce5311f6fbea9738b25b6e6159e7dcf4693b0a24bc6a5720d1bfd38d0", - "zh:5205343f8e6cfa89d2f9a312edddcf263755bc294a5216555c390244df826f17", - "zh:60b7d9b5da2d1a13bc9cdfe5be75da2e3d1034617dff51ef3f0beb72fe801879", - "zh:61b73d78ef03f0b38ff567b78f2984089eb17724fd8d0f92943b7e522cf31e39", - "zh:69dfe1278eecc6049736d74c3fa2d1f384035621ec5d72f8b180e3b25b45b592", - "zh:7746656be1b437e43f7324898cd4548d7e8cad5308042ba38cb45c4fecbf38fe", - "zh:7e573462091aaf2e6a37edeee33ee4d8f4c37f9a35c331e0f3a60caf078c88c1", - "zh:a05e1f02b2385679087a7059944cac7fb1d71dd042601ee4d0d26e9808d14dd5", - "zh:d8d5d52af1aa55160fec601a1006552d9b6fe21e97313850a1e79bc026e99cfe", - "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", + "h1:sQ413yweMfNSLmWSFzUXiBnSfH7NlrPWaPIRERV7mRg=", + "zh:1146f53fb39fd4bcea5574303c4871001a97d7891f65a60a4ecbc64da2a90d75", + "zh:1f7e3dc0dbb854f56a0f5ba3c50588272984ae9775da027c3c7f32cb6d8245b0", + "zh:2166f7fdade75266658603280bc822edab848e52a674340485847dde1c5d9324", + "zh:21a97530857330d2013aa66fb7afebb44fe4a5543418d0a3ca93750acd11fea5", + "zh:2d4b9fea7e99750647e1cd8df9a67cba45905825867dd19ab01411dad6b8c6fd", + "zh:de30e92e638b95e56dbb2232cb9a6f6a69346ecb3644965e9be715eaf29f22ff", + "zh:f4ae951c9add4349a498f44c3f5768cbaf7a966392a0e7632de288889e7cd5d9", + "zh:f54ecb1917dfa198933d72632ea6f0aa4da3ead070d6b9765ec1d3b7da60e827", + "zh:fba8a2f192eb5fe248708b9037db046e0d9176e7c54c6edc6f6aa55d50474082", + "zh:fe525956f3e54f0bbd2891a6abad1f807b4763b8dc734d810e223876741fefa3", ] } From 831d045f4996bc85ebd9614dd393449c4d296042 Mon Sep 17 00:00:00 2001 From: d059372 Date: Thu, 4 Apr 2024 10:03:46 +0200 Subject: [PATCH 6/6] Replace terraform with opentofu --- flake.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/flake.nix b/flake.nix index 1443c12..0ba510b 100644 --- a/flake.nix +++ b/flake.nix @@ -24,16 +24,7 @@ forAllSystems = nixpkgsLib.genAttrs supportedSystems; # Nixpkgs instantiated for supported system types. - nixpkgsFor = forAllSystems (system: import nixpkgs-repo { - inherit system; - config = { - ## Prefer allowing specific packages when unfree over general permission. - # allowUnfree = true; - allowUnfreePredicate = pkg: builtins.elem (nixpkgsLib.getName pkg) [ - "terraform" - ]; - }; - }); + nixpkgsFor = forAllSystems (system: import nixpkgs-repo { inherit system; }); in { packages = forAllSystems (system: let @@ -55,7 +46,7 @@ kapp kubectl kubernetes-helm - terraform + opentofu terragrunt vendir ytt