Commit 756bff4
authored
fix: drop OLM artifacts blocking gitops-operators sync on k3s (#6)
## Summary
Two unrelated bugs surface together as a blocked `gitops-operators`
Application after the OpenShift→k3s migration in #6b3abd0:
- **OLM-only manifests in `operators/`.** `cert-manager/operator.yaml`,
`cert-manager/apiserver-config.yaml`,
`cert-manager/certmanager-config.yaml`, plus the `ansible/` and
`grafana/` operator manifests are all OLM Subscriptions / OperatorHub
CRs. Their CRDs don't exist on k3s, so kustomize build → server-side
apply fails with `no matches for kind "Subscription"` etc.
- **Stale ksops generator.** `operators/generator/ksops-generator.yaml`
had its only `files:` entry pointing at `arc/dindsystem.yaml`, which was
removed in `945130b` (selective-field-encryption refactor). Kustomize
build aborts with `no such file or directory`.
This PR:
- Deletes `operators/generator/ksops-generator.yaml`. Per-subdir ksops
generators in `arc/`, `cert-manager/`, `cloudflare/`,
`bootstrap/secrets/`, `workloads/*/` cover all secret decryption —
there's no centralized pipeline being lost.
- Strips `operators/cert-manager/` down to `cluster-issuer.yaml` +
`cloudflare-api-token-secret.yaml` (kept) +
`ksops-cert-manager-secrets.yaml` (kept). Cert-manager itself is
bootstrap-installed by `tfroot-libvirt` cloud-init now (see paired PR
there); the `--dns01-recursive-nameservers` controller args from the
deleted `CertManager` CR are applied directly to the upstream Deployment
by cloud-init.
- Comments out `ansible` and `grafana` from
`operators/kustomization.yaml`. Re-enable once they're rewritten as
upstream operator manifests (Phase B).
- **Also:** `bootstrap/ci-token-sync-job.yaml` gets `runAsUser: 1000` so
the Job's `runAsNonRoot=true` actually validates against `gh-cli`'s `gh`
user (paired with the images-repo PR pinning `USER 1000` numerically).
## Pairs with
- `tfroot-libvirt` PR #2 — bootstraps cert-manager from cloud-init.
- `images` PR — `gh-cli` switches to numeric `USER 1000`.
## Test plan
- [x] `kustomize build operators/` succeeds (no missing-file or
unknown-kind errors)
- [x] On the live cluster, `bootstrap-secrets` Application is Synced +
Healthy
- [x] After merge: `gitops-operators` Application reaches Synced +
Healthy (pending push so ArgoCD picks it up)
- [x] After merge: `ci-token-sync` Job runs to completion, syncs the
deploy token to GitHub
🤖 Generated with [Claude Code](https://claude.com/claude-code)1 parent bac7280 commit 756bff4
7 files changed
Lines changed: 10 additions & 87 deletions
File tree
- bootstrap
- operators
- cert-manager
- generator
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
9 | 9 | | |
10 | 10 | | |
11 | 11 | | |
12 | | - | |
13 | | - | |
| 12 | + | |
| 13 | + | |
14 | 14 | | |
15 | 15 | | |
16 | 16 | | |
| |||
21 | 21 | | |
22 | 22 | | |
23 | 23 | | |
| 24 | + | |
24 | 25 | | |
25 | 26 | | |
26 | 27 | | |
| |||
This file was deleted.
This file was deleted.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
2 | 5 | | |
3 | 6 | | |
4 | 7 | | |
5 | | - | |
6 | | - | |
7 | 8 | | |
8 | | - | |
9 | 9 | | |
10 | 10 | | |
This file was deleted.
This file was deleted.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
3 | 3 | | |
4 | 4 | | |
5 | 5 | | |
6 | | - | |
7 | 6 | | |
8 | 7 | | |
9 | 8 | | |
10 | | - | |
11 | 9 | | |
12 | | - | |
13 | | - | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
0 commit comments