From fbc124d95365270941e9e7e5968a60e93d0ddafb Mon Sep 17 00:00:00 2001 From: Steven Welch Date: Wed, 26 Aug 2026 23:33:37 -0600 Subject: [PATCH 1/2] feat(github): manage charts repository --- gh-repositories.tf | 1 + main.tf | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/gh-repositories.tf b/gh-repositories.tf index a33c0d8..a48fecf 100644 --- a/gh-repositories.tf +++ b/gh-repositories.tf @@ -3,6 +3,7 @@ resource "github_repository" "repositories" { name = each.key archived = contains(local.archived_github_repositories, each.key) visibility = var.github_visibility + auto_init = each.key == "charts" allow_squash_merge = true allow_merge_commit = true allow_rebase_merge = false diff --git a/main.tf b/main.tf index f59d8a9..881aee0 100644 --- a/main.tf +++ b/main.tf @@ -9,6 +9,7 @@ locals { "ansible-site-cluster", "ansible-role-crc", "cflan", + "charts", "kustomize-cluster", "images", "opencode-server-config", @@ -38,6 +39,7 @@ locals { required_status_checks_by_repository = { ".github" = ["pre-commit"] "cflan" = ["lint-and-test (3.10)", "lint-and-test (3.11)", "lint-and-test (3.12)", "lint-and-test (3.13)", "type-check"] + "charts" = ["test"] "images" = ["checks"] "kustomize-cluster" = ["test"] "opencode-server-config" = ["lint"] @@ -83,12 +85,12 @@ locals { } "www_access_key_id" = { name = "AWS_ACCESS_KEY_ID" - value = data.sops_file.secret_vars.data["www_aws_access_key_id"] + value = data.sops_file.secret_vars.data["www_access_key_id"] repositories = ["www"] } "www_secret_access_key" = { name = "AWS_SECRET_ACCESS_KEY" - value = data.sops_file.secret_vars.data["www_aws_secret_access_key"] + value = data.sops_file.secret_vars.data["www_secret_access_key"] repositories = ["www"] } "cloudflare_zone_id" = { From 1b87c85d26941e0969bad81ba0730024dfda61f3 Mon Sep 17 00:00:00 2001 From: Steven Welch Date: Wed, 26 Aug 2026 23:34:26 -0600 Subject: [PATCH 2/2] fix(github): preserve website secret mappings --- main.tf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/main.tf b/main.tf index 881aee0..6b5e6fe 100644 --- a/main.tf +++ b/main.tf @@ -85,12 +85,12 @@ locals { } "www_access_key_id" = { name = "AWS_ACCESS_KEY_ID" - value = data.sops_file.secret_vars.data["www_access_key_id"] + value = data.sops_file.secret_vars.data["www_aws_access_key_id"] repositories = ["www"] } "www_secret_access_key" = { name = "AWS_SECRET_ACCESS_KEY" - value = data.sops_file.secret_vars.data["www_secret_access_key"] + value = data.sops_file.secret_vars.data["www_aws_secret_access_key"] repositories = ["www"] } "cloudflare_zone_id" = {