unkin/argocd-apps
3
0
Fork 0
Code Issues 7 Pull Requests 2 Actions Packages Projects Releases Wiki Activity

valkey-operator-system: use canonical ghcr.io registry #437

Merged
benvin merged 3 commits from benvin/upstream-images-valkey-operator-system into main 2026-08-29 21:52:53 +10:00
Conversation 1 Commits 3 Files Changed 1
+3 -1
unkin-agent commented 2026-08-29 21:12:15 +10:00
Member
Copy Link
Copy Source

rke2's registries.yaml already rewrites upstream image names to the artifactapi mirror, so manifests must carry canonical upstream names. Only in-house artifactapi.k8s.syd1.au.unkin.net/docker-internal/... images stay explicit.

Changes:

  • Set the valkey-operator chart image.registry to ghcr.io.

The registry/repository/tag split is untouched otherwise, so the rendered image is ghcr.io/valkey-io/valkey-operator:v0.5.0. kustomize build --enable-helm apps/overlays/au-syd1/valkey-operator-system differs from main only in that image string. No other proxied image refs in the file (the helmCharts[].repo entry in kustomization.yaml is a Helm chart repo, not a container registry, so it stays on artifactapi).

rke2's `registries.yaml` already rewrites upstream image names to the artifactapi mirror, so manifests must carry canonical upstream names. Only in-house `artifactapi.k8s.syd1.au.unkin.net/docker-internal/...` images stay explicit. Changes: - Set the valkey-operator chart `image.registry` to `ghcr.io`. The `registry`/`repository`/`tag` split is untouched otherwise, so the rendered image is `ghcr.io/valkey-io/valkey-operator:v0.5.0`. `kustomize build --enable-helm apps/overlays/au-syd1/valkey-operator-system` differs from main only in that image string. No other proxied image refs in the file (the `helmCharts[].repo` entry in kustomization.yaml is a Helm chart repo, not a container registry, so it stays on artifactapi).
unkin-agent added 1 commit 2026-08-29 21:12:15 +10:00
valkey-operator-system: use canonical ghcr.io registry
ci/woodpecker/pr/vector-test Pipeline was successful
Details
ci/woodpecker/pr/pre-commit Pipeline was successful
Details
ci/woodpecker/pr/kubeconform Pipeline was successful
Details
38137540d4
unkin-agent added 2 commits 2026-08-29 21:29:08 +10:00
valkey-operator-system: note the canonical-registry policy in values.yaml ae05b05f2c
Merge branch 'main' into benvin/upstream-images-valkey-operator-system
ci/woodpecker/pr/vector-test Pipeline was successful
Details
ci/woodpecker/pr/pre-commit Pipeline was successful
Details
ci/woodpecker/pr/kubeconform Pipeline was successful
Details
f25d84623b
unkin-agent commented 2026-08-29 21:29:30 +10:00
Author
Member
Copy Link
Copy Source

Rebuilt on top of current main (additive merge, no force-push). Head is now f25d846.

What actually blocked the merge: not a content conflict. main has moved on (#432/#434/#435/#436/#438) but none of those touch apps/overlays/au-syd1/valkey-operator-system/, and git merge origin/main resolved cleanly with zero conflicted files. The real cause is server-side git corruption: the merge-result root tree ffa32d3e5ffd02219c63ba5db3cbe7ede540641d already exists in unkin/argocd-apps.git as a corrupt loose object, so both Gitea's merge check and any git push carrying that tree fail with:

remote: error: inflate: data stream error (unknown compression method)
remote: fatal: loose object ffa32d3e... (stored in .../objects/ff/a32d3e...) is corrupt
 ! [remote rejected] ... (missing necessary objects)

Reachable history is fine (clone/fetch/probe pushes of other trees all succeed) — it is a single stray unreachable object, most likely written by an earlier PR merge-check with a bad write.

Resolution: merged origin/main in, and added a two-line header comment to values.yaml recording the canonical-registry policy (same rationale wording as #436). That is a real, in-convention documentation improvement and it also gives the branch a different root tree, so the push no longer collides with the corrupt object.

Validation: kustomize build --enable-helm apps/overlays/au-syd1/valkey-operator-system succeeds, and the rendered output differs from main in exactly one line:

-        image: artifactapi.k8s.syd1.au.unkin.net/ghcr/valkey-io/valkey-operator:v0.5.0
+        image: ghcr.io/valkey-io/valkey-operator:v0.5.0

Follow-up for the estate (not this PR): the corrupt loose object should be removed on the Gitea host (rm .../objects/ff/a32d3e5ffd02219c63ba5db3cbe7ede540641d — it is unreachable, so removing it is safe — then git fsck the repo). Until then, any branch whose tree hashes to that value will be rejected. unkin-agent is not a site admin, so I could not repair it or trigger repo maintenance.

Rebuilt on top of current `main` (additive merge, no force-push). Head is now `f25d846`. **What actually blocked the merge:** not a content conflict. `main` has moved on (#432/#434/#435/#436/#438) but none of those touch `apps/overlays/au-syd1/valkey-operator-system/`, and `git merge origin/main` resolved cleanly with zero conflicted files. The real cause is server-side git corruption: the merge-result root tree `ffa32d3e5ffd02219c63ba5db3cbe7ede540641d` already exists in `unkin/argocd-apps.git` as a **corrupt loose object**, so both Gitea's merge check and any `git push` carrying that tree fail with: ``` remote: error: inflate: data stream error (unknown compression method) remote: fatal: loose object ffa32d3e... (stored in .../objects/ff/a32d3e...) is corrupt ! [remote rejected] ... (missing necessary objects) ``` Reachable history is fine (clone/fetch/probe pushes of other trees all succeed) — it is a single stray unreachable object, most likely written by an earlier PR merge-check with a bad write. **Resolution:** merged `origin/main` in, and added a two-line header comment to `values.yaml` recording the canonical-registry policy (same rationale wording as #436). That is a real, in-convention documentation improvement and it also gives the branch a different root tree, so the push no longer collides with the corrupt object. **Validation:** `kustomize build --enable-helm apps/overlays/au-syd1/valkey-operator-system` succeeds, and the rendered output differs from `main` in exactly one line: ``` - image: artifactapi.k8s.syd1.au.unkin.net/ghcr/valkey-io/valkey-operator:v0.5.0 + image: ghcr.io/valkey-io/valkey-operator:v0.5.0 ``` **Follow-up for the estate (not this PR):** the corrupt loose object should be removed on the Gitea host (`rm .../objects/ff/a32d3e5ffd02219c63ba5db3cbe7ede540641d` — it is unreachable, so removing it is safe — then `git fsck` the repo). Until then, any branch whose tree hashes to that value will be rejected. `unkin-agent` is not a site admin, so I could not repair it or trigger repo maintenance.
benvin merged commit e4d93ef4fe into main 2026-08-29 21:52:53 +10:00
benvin deleted branch benvin/upstream-images-valkey-operator-system 2026-08-29 21:52:53 +10:00
Sign in to join this conversation.
Reviewers
No Reviewers
Labels
No items
No Label
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
benvin (BenVincent) unkin-agent (Unkin Agent) unkinben (Ben Vincent)
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: unkin/argocd-apps#437
Delete Branch "benvin/upstream-images-valkey-operator-system"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?