From 90243fa351ec5bb2e7f07293294dc787633a6e50 Mon Sep 17 00:00:00 2001 From: unkin-agent Date: Sat, 3 Oct 2026 00:51:17 +1000 Subject: [PATCH] Replace terraform-infra with terraform-netbox terraform-infra was scoped to NetBox plus Kea DHCP, but Kea is managed by the kea-operator CRDs in argocd-apps; the two declare the same subnets and would fight. The repo is narrowed to the NetBox side and renamed to match. - add the terraform-netbox repository (squash-only, Owners-gated, pre-commit and plan required) - remove terraform-infra --- .../repository/{terraform-infra.yaml => terraform-netbox.yaml} | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) rename config/git.unkin.net/unkin/repository/{terraform-infra.yaml => terraform-netbox.yaml} (74%) diff --git a/config/git.unkin.net/unkin/repository/terraform-infra.yaml b/config/git.unkin.net/unkin/repository/terraform-netbox.yaml similarity index 74% rename from config/git.unkin.net/unkin/repository/terraform-infra.yaml rename to config/git.unkin.net/unkin/repository/terraform-netbox.yaml index 255c6ed..770fbd1 100644 --- a/config/git.unkin.net/unkin/repository/terraform-infra.yaml +++ b/config/git.unkin.net/unkin/repository/terraform-netbox.yaml @@ -1,7 +1,8 @@ -description: "YAML-driven Terraform for NetBox IPAM, networks, and devices + Kea DHCP" +description: "YAML-driven Terraform for NetBox: prefixes, IPs, devices, platforms and custom fields" private: false default_branch: "main" default_delete_branch_after_merge: true +default_merge_style: "squash" branch_protection: - rule_name: "main" merge_whitelist_teams: