Merge branch 'main' into benvin/update1

- add new repo
- change write -> none

.woodpecker/apply.yaml

@@ -9,7 +9,7 @@ steps:
       VAULT_AUTH_METHOD: kubernetes
     commands:
       - dnf install vault -y
-      - make apply
+      - make apply-if-changes
     backend_options:
       kubernetes:
         serviceAccountName: terraform-git

config/git.unkin.net/unkin/repository/age-api.yaml

@@ -1,16 +0,0 @@
-description: "Simple API for showing a users age"
-private: false
-default_branch: "main"
-default_delete_branch_after_merge: true
-default_merge_style: "squash"
-branch_protection:
-  - rule_name: "main"
-    enable_push: false
-    status_check_contexts:
-      - "ci/woodpecker/pr/pre-commit"
-      - "ci/woodpecker/pr/test"
-      - "ci/woodpecker/pr/build"
-    approval_whitelist_teams:
-      - "Owners"
-    merge_whitelist_teams:
-      - "Owners"

config/git.unkin.net/unkin/repository/argocd-apps.yaml

@@ -10,3 +10,4 @@ branch_protection:
       - "ci/woodpecker/pr/kubeconform"
     approval_whitelist_users:
       - "unkinben"
+woodpecker: true

config/git.unkin.net/unkin/repository/artifactapi.yaml

@@ -12,3 +12,4 @@ branch_protection:
       - "ci/woodpecker/pr/build"
     approval_whitelist_users:
       - "unkinben"
+woodpecker: true

config/git.unkin.net/unkin/repository/certmanager.yaml

@@ -9,3 +9,4 @@ branch_protection:
       - "unkinben"
     approval_whitelist_users:
       - "unkinben"
+woodpecker: true

config/git.unkin.net/unkin/repository/container-agent-base.yaml

@@ -1,13 +0,0 @@
-description: "Base container image for forgebot agents"
-private: false
-default_branch: "main"
-default_delete_branch_after_merge: true
-default_merge_style: "squash"
-branch_protection:
-  - rule_name: "main"
-    enable_push: false
-    status_check_contexts:
-      - "ci/woodpecker/pr/build"
-    approval_whitelist_teams:
-      - "docker"
-      - "forgebot"

config/git.unkin.net/unkin/repository/container-agent-dev.yaml

@@ -1,13 +0,0 @@
-description: "Dev toolchain container for forgebot agents"
-private: false
-default_branch: "main"
-default_delete_branch_after_merge: true
-default_merge_style: "squash"
-branch_protection:
-  - rule_name: "main"
-    enable_push: false
-    status_check_contexts:
-      - "ci/woodpecker/pr/build"
-    approval_whitelist_teams:
-      - "docker"
-      - "forgebot"

config/git.unkin.net/unkin/repository/container-agent-infra.yaml

@@ -1,13 +0,0 @@
-description: "Infrastructure toolchain container for forgebot agents"
-private: false
-default_branch: "main"
-default_delete_branch_after_merge: true
-default_merge_style: "squash"
-branch_protection:
-  - rule_name: "main"
-    enable_push: false
-    status_check_contexts:
-      - "ci/woodpecker/pr/build"
-    approval_whitelist_teams:
-      - "docker"
-      - "forgebot"

config/git.unkin.net/unkin/repository/forgebot-skills.yaml

@@ -1,14 +0,0 @@
-description: "Skill definitions for forgebot agents"
-private: false
-default_branch: "main"
-default_delete_branch_after_merge: true
-default_merge_style: "squash"
-branch_protection:
-  - rule_name: "main"
-    enable_push: false
-    status_check_contexts:
-      - "ci/woodpecker/pr/validate"
-    approval_whitelist_teams:
-      - "forgebot"
-    merge_whitelist_teams:
-      - "forgebot"

config/git.unkin.net/unkin/repository/forgebot.yaml

@@ -1,16 +0,0 @@
-description: "K8s operator + API for AI agent dispatch from git forges"
-private: false
-default_branch: "main"
-default_delete_branch_after_merge: true
-default_merge_style: "squash"
-branch_protection:
-  - rule_name: "main"
-    enable_push: false
-    status_check_contexts:
-      - "ci/woodpecker/pr/pre-commit"
-      - "ci/woodpecker/pr/test"
-      - "ci/woodpecker/pr/build"
-    approval_whitelist_teams:
-      - "forgebot"
-    merge_whitelist_teams:
-      - "forgebot"

config/git.unkin.net/unkin/repository/node-lookup.yaml

@@ -12,3 +12,4 @@ branch_protection:
       - "ci/woodpecker/pr/unit-tests"
     approval_whitelist_users:
       - "unkinben"
+woodpecker: true

config/git.unkin.net/unkin/repository/puppet-prod.yaml

@@ -35,3 +35,4 @@ branch_protection:
       - "ci/woodpecker/pr/yamllint"
     approval_whitelist_teams:
       - "puppet"
+woodpecker: true

config/git.unkin.net/unkin/repository/puppet-r10k.yaml

@@ -13,3 +13,4 @@ branch_protection:
     approval_whitelist_teams:
       - "puppet"
     block_on_rejected_reviews: true
+woodpecker: true

config/git.unkin.net/unkin/repository/rpmbuilder.yaml

@@ -18,3 +18,4 @@ branch_protection:
     approval_whitelist_teams:
       - "rpmbuild"
     block_on_rejected_reviews: true
+woodpecker: true

config/git.unkin.net/unkin/repository/terraform-artifactapi.yaml

@@ -1,18 +0,0 @@
-description: "Terraform configuration for managing ArtifactAPI remote and virtual repositories"
-private: false
-default_branch: "main"
-default_delete_branch_after_merge: true
-default_merge_style: "squash"
-branch_protection:
-  - rule_name: "main"
-    enable_push: false
-    merge_whitelist_users:
-      - "benvin"
-      - "unkinben"
-    status_check_contexts:
-      - "ci/woodpecker/pr/pre-commit"
-      - "ci/woodpecker/pr/plan"
-    approval_whitelist_users:
-      - "unkinben"
-    approval_whitelist_teams:
-      - "Owners"

config/git.unkin.net/unkin/repository/terraform-git.yaml

@@ -1,6 +1,7 @@
 description: "Manage Gitea resources, teams, repos, and Woodpecker CI via Terraform"
 private: false
 default_branch: "main"
+woodpecker: true
 branch_protection:
   - rule_name: "main"
     enable_push: false

config/git.unkin.net/unkin/repository/terraform-provider-artifactapi.yaml

@@ -4,9 +4,6 @@ default_delete_branch_after_merge: false
 branch_protection:
   - rule_name: "main"
     enable_push: false
-    status_check_contexts:
-      - "ci/woodpecker/pr/pre-commit"
-      - "ci/woodpecker/pr/build"
-      - "ci/woodpecker/pr/test"
     approval_whitelist_teams:
       - "Owners"
+woodpecker: true

config/git.unkin.net/unkin/repository/terraform-vault.yaml

@@ -16,3 +16,4 @@ branch_protection:
       - "unkinben"
     approval_whitelist_teams:
       - "Owners"
+woodpecker: true

config/git.unkin.net/unkin/team/forgebot.yaml

@@ -1,13 +0,0 @@
-description: "forgebot maintainers"
-permission: none
-include_all_repositories: false
-can_create_repos: false
-repositories:
-  - forgebot
-  - forgebot-skills
-  - container-agent-base
-  - container-agent-dev
-  - container-agent-infra
-members:
-  - unkinben
-  - benvin

modules/gitea_instance/imports.tf

@@ -143,31 +143,6 @@ import {
   id = "137"
 }
 
-import {
-  to = module.repository["git.unkin.net/unkin/forgebot"].gitea_repository.this
-  id = "139"
-}
-
-import {
-  to = module.repository["git.unkin.net/unkin/forgebot-skills"].gitea_repository.this
-  id = "140"
-}
-
-import {
-  to = module.repository["git.unkin.net/unkin/container-agent-base"].gitea_repository.this
-  id = "141"
-}
-
-import {
-  to = module.repository["git.unkin.net/unkin/container-agent-dev"].gitea_repository.this
-  id = "142"
-}
-
-import {
-  to = module.repository["git.unkin.net/unkin/container-agent-infra"].gitea_repository.this
-  id = "143"
-}
-
 import {
   to = module.team["git.unkin.net/unkin/Owners"].gitea_team.this
   id = "3"
@@ -198,8 +173,58 @@ import {
   id = "12"
 }
 
+import {
+  to = module.woodpecker_repository["git.unkin.net/unkin/puppet-prod"].woodpecker_repository.this
+  id = "unkin/puppet-prod"
+}
+
+import {
+  to = module.woodpecker_repository["git.unkin.net/unkin/puppet-r10k"].woodpecker_repository.this
+  id = "unkin/puppet-r10k"
+}
+
+import {
+  to = module.woodpecker_repository["git.unkin.net/unkin/terraform-vault"].woodpecker_repository.this
+  id = "unkin/terraform-vault"
+}
+
+import {
+  to = module.woodpecker_repository["git.unkin.net/unkin/rpmbuilder"].woodpecker_repository.this
+  id = "unkin/rpmbuilder"
+}
+
+import {
+  to = module.woodpecker_repository["git.unkin.net/unkin/artifactapi"].woodpecker_repository.this
+  id = "unkin/artifactapi"
+}
+
+import {
+  to = module.woodpecker_repository["git.unkin.net/unkin/argocd-apps"].woodpecker_repository.this
+  id = "unkin/argocd-apps"
+}
+
+import {
+  to = module.woodpecker_repository["git.unkin.net/unkin/certmanager"].woodpecker_repository.this
+  id = "unkin/certmanager"
+}
+
+import {
+  to = module.woodpecker_repository["git.unkin.net/unkin/node-lookup"].woodpecker_repository.this
+  id = "unkin/node-lookup"
+}
+
+import {
+  to = module.woodpecker_repository["git.unkin.net/unkin/terraform-provider-artifactapi"].woodpecker_repository.this
+  id = "unkin/terraform-provider-artifactapi"
+}
+
 import {
   to = module.repository["git.unkin.net/unkin/terraform-git"].gitea_repository.this
   id = "144"
 }
 
+import {
+  to = module.woodpecker_repository["git.unkin.net/unkin/terraform-git"].woodpecker_repository.this
+  id = "unkin/terraform-git"
+}
+

modules/gitea_instance/main.tf

@@ -55,12 +55,18 @@ module "team" {
   depends_on = [module.organisation, module.repository]
 }
 
-removed {
+module "woodpecker_repository" {
-  from = module.woodpecker_repository
+  source = "./modules/woodpecker_repository"
 
-  lifecycle {
+  for_each = {
-    destroy = false
+    for k, v in var.repository : k => v
+    if try(v.woodpecker, false)
   }
+
+  full_name  = "${each.value.organisation}/${each.value.name}"
+  visibility = each.value.private ? "private" : "public"
+
+  depends_on = [module.repository]
 }
 
 module "branch_protection" {
@@ -89,7 +95,7 @@ module "branch_protection" {
   protected_file_patterns           = each.value.protected_file_patterns
   unprotected_file_patterns         = each.value.unprotected_file_patterns
 
-  depends_on = [module.repository, module.team]
+  depends_on = [module.repository]
 }
 
 # TODO: enable when deploy keys are needed

modules/gitea_instance/modules/team/main.tf

@@ -6,10 +6,6 @@ resource "gitea_team" "this" {
   include_all_repositories = var.include_all_repositories
   can_create_repos         = var.can_create_repos
   repositories             = var.repositories
-
-  lifecycle {
-    ignore_changes = [permission]
-  }
 }
 
 resource "gitea_team_members" "this" {

modules/gitea_instance/modules/woodpecker_repository/main.tf

@@ -0,0 +1,4 @@
+resource "woodpecker_repository" "this" {
+  full_name  = var.full_name
+  visibility = var.visibility
+}

modules/gitea_instance/modules/woodpecker_repository/terraform.tf

@@ -0,0 +1,9 @@
+terraform {
+  required_version = ">= 1.10"
+  required_providers {
+    woodpecker = {
+      source  = "Kichiyaki/woodpecker"
+      version = "0.5.0"
+    }
+  }
+}

modules/gitea_instance/modules/woodpecker_repository/variables.tf

@@ -0,0 +1,8 @@
+variable "full_name" {
+  type = string
+}
+
+variable "visibility" {
+  type    = string
+  default = "internal"
+}

modules/gitea_instance/variables.tf

@@ -32,6 +32,7 @@ variable "repository" {
     repo_template           = optional(bool)
     website                 = optional(string)
     autodetect_manual_merge = optional(bool)
+    woodpecker              = optional(bool, false)
   }))
   default = {}
 }