diff --git a/deploy/organization-rulesets/README.md b/deploy/organization-rulesets/README.md index 90cd3ff..d9491fb 100644 --- a/deploy/organization-rulesets/README.md +++ b/deploy/organization-rulesets/README.md @@ -33,7 +33,7 @@ verb — e.g. `require-pull-request.yaml`). Repo-scoped rulesets live next door |---|---|---| | 10 `OrganizationRuleset` files | the 10 org rulesets below | Observe (read-only import) | | `protect-release-tags.yaml` | **Protect release tags** (net-new) | Managed (Create) — block tag delete + force-move + require `v` | -| (in `../repository-rulesets/`) `restrict-deletions-on-ksail.yaml`, `require-merge-queue-on-platform.yaml` | `ksail` "Restrict deletions", `platform` "Require merge queue" | Observe (read-only import) | +| (in `../repository-rulesets/`) `require-merge-queue-on-platform.yaml` | `platform` "Require merge queue" | Observe (read-only import) | The 10 imported org rulesets: Block force pushes · Require a pull request before merging · Require conversation resolution before merging · Require linear history · diff --git a/deploy/repository-rulesets/README.md b/deploy/repository-rulesets/README.md index 2e7fb5b..75b4f82 100644 --- a/deploy/repository-rulesets/README.md +++ b/deploy/repository-rulesets/README.md @@ -17,5 +17,4 @@ observes. | File | Repo | Ruleset | Policy | |---|---|---|---| -| `restrict-deletions-on-ksail.yaml` | `ksail` | Restrict deletions (scoped to `refs/heads/benchmark-data`) | Observe (read-only import) | | `require-merge-queue-on-platform.yaml` | `platform` | Require merge queue | Observe (read-only import) | diff --git a/deploy/repository-rulesets/kustomization.yaml b/deploy/repository-rulesets/kustomization.yaml index 4e18c1f..d527d6c 100644 --- a/deploy/repository-rulesets/kustomization.yaml +++ b/deploy/repository-rulesets/kustomization.yaml @@ -5,5 +5,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - restrict-deletions-on-ksail.yaml - require-merge-queue-on-platform.yaml diff --git a/deploy/repository-rulesets/restrict-deletions-on-ksail.yaml b/deploy/repository-rulesets/restrict-deletions-on-ksail.yaml deleted file mode 100644 index fc51535..0000000 --- a/deploy/repository-rulesets/restrict-deletions-on-ksail.yaml +++ /dev/null @@ -1,25 +0,0 @@ -# Existing repository ruleset, adopted Observe-first (read-only). external-name = -# the bare numeric ruleset id — the upjet provider stores RepositoryRuleset `id` -# from-provider, exactly like ../organization-rulesets/. (The Terraform -# `:` form is the *import* id, NOT the stored external-name; a -# `:`-prefixed value fails the provider's strconv.ParseInt and the resource -# never observes.) Identity-only forProvider — see ./README.md for the convention. -# -# ksail's own "Restrict deletions" rule, scoped to refs/heads/benchmark-data (the -# long-lived benchmark-data branch) — narrower than the org-wide rule. -apiVersion: repo.github.m.upbound.io/v1alpha1 -kind: RepositoryRuleset -metadata: - name: ksail-restrict-deletions - annotations: - crossplane.io/external-name: "14699634" # numeric ruleset id -spec: - managementPolicies: ["Observe"] - forProvider: - repository: ksail - name: Restrict deletions - target: branch - enforcement: active - providerConfigRef: - kind: ProviderConfig - name: default