Home-Network/home-network-k3s-impl
2
0 Fork 0
Code Issues 2 Pull Requests 2 Actions Packages Projects Releases Wiki Activity

chore(flux): migrate image-automation API v1beta2 -> v1

Browse Source 
Migrate image.toolkit.fluxcd.io/v1beta2 -> /v1 for ImageRepository,
ImagePolicy, and ImageUpdateAutomation ahead of the Flux v2.7+ upgrade
(cluster-upgrade-plan §3.2). Flux v2.4 (current) already serves /v1, so
migrating the manifests now is a safe no-op at runtime.

- catalog/render.py: r_image_automation emits v1 for ImageRepository/ImagePolicy
- platform/image-automation/{image-update-automation,per-service/pihole.example}
- conformance L3 hands-off-update chainsaw applies v1 CRs
- conformance L1 goldens re-rendered to match (apiVersion-only diff)

No spec-field changes required: all spec fields used (image, interval,
imageRepositoryRef, filterTags.pattern/extract, policy.semver.range,
sourceRef, git.*, update.strategy/path) are unchanged in v1; the v1
messageTemplate already uses .Changed (not the removed .Updated).
apps/ golden unaffected (canonical render uses --no-image-automation).

Co-Authored-By: Claude Opus 4.8 <[email protected]>
This commit is contained in:
jakman85andClaude Opus 4.8 committed 2026-08-29 23:19:20 -05:00
1 parent 8dfb42f6c0
commit d24a443c7d
8 files changed
+16 -16
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

catalog/render.py
+2 -2
View File
@@ -667,7 +667,7 @@ def r_image_automation(s: dict) -> list:
upd = s["update"]
interval = "1h0m0s"
imagerepo = {
"apiVersion": "image.toolkit.fluxcd.io/v1beta2",
"apiVersion": "image.toolkit.fluxcd.io/v1",
"kind": "ImageRepository",
"metadata": {"name": s["name"], "namespace": s["name"]},
"spec": {"image": image, "interval": interval},
@@ -682,7 +682,7 @@ def r_image_automation(s: dict) -> list:
else:
policy_spec["policy"] = {"semver": {"range": ">=0.0.0"}}
imagepolicy = {
"apiVersion": "image.toolkit.fluxcd.io/v1beta2",
"apiVersion": "image.toolkit.fluxcd.io/v1",
"kind": "ImagePolicy",
"metadata": {
"name": s["name"],
conformance/tests/l1-rendering/container-workload-render/golden/expected.yaml
+2 -2
View File
@@ -162,7 +162,7 @@ spec:
interval: 30s
---
# Flux ImageRepository (R-UPD)
apiVersion: image.toolkit.fluxcd.io/v1beta2
apiVersion: image.toolkit.fluxcd.io/v1
kind: ImageRepository
metadata:
name: paas-demo
@@ -172,7 +172,7 @@ spec:
interval: 1h0m0s
---
# Flux ImagePolicy (R-UPD)
apiVersion: image.toolkit.fluxcd.io/v1beta2
apiVersion: image.toolkit.fluxcd.io/v1
kind: ImagePolicy
metadata:
name: paas-demo
conformance/tests/l1-rendering/default-deny-baseline-render/golden/expected.yaml
+2 -2
View File
@@ -93,7 +93,7 @@ spec:
interval: 30s
---
# Flux ImageRepository (R-UPD)
apiVersion: image.toolkit.fluxcd.io/v1beta2
apiVersion: image.toolkit.fluxcd.io/v1
kind: ImageRepository
metadata:
name: baseline-demo
@@ -103,7 +103,7 @@ spec:
interval: 1h0m0s
---
# Flux ImagePolicy (R-UPD)
apiVersion: image.toolkit.fluxcd.io/v1beta2
apiVersion: image.toolkit.fluxcd.io/v1
kind: ImagePolicy
metadata:
name: baseline-demo
conformance/tests/l1-rendering/egress-class-render/golden/egress-internet.expected.yaml
+2 -2
View File
@@ -212,7 +212,7 @@ spec:
description: 'sonarr has been unreachable for 5m (SLI: up).'
---
# Flux ImageRepository (R-UPD)
apiVersion: image.toolkit.fluxcd.io/v1beta2
apiVersion: image.toolkit.fluxcd.io/v1
kind: ImageRepository
metadata:
name: sonarr
@@ -222,7 +222,7 @@ spec:
interval: 1h0m0s
---
# Flux ImagePolicy (R-UPD)
apiVersion: image.toolkit.fluxcd.io/v1beta2
apiVersion: image.toolkit.fluxcd.io/v1
kind: ImagePolicy
metadata:
name: sonarr
conformance/tests/l1-rendering/egress-class-render/golden/egress-vpn.expected.yaml
+2 -2
View File
@@ -212,7 +212,7 @@ spec:
description: 'sonarr has been unreachable for 5m (SLI: up).'
---
# Flux ImageRepository (R-UPD)
apiVersion: image.toolkit.fluxcd.io/v1beta2
apiVersion: image.toolkit.fluxcd.io/v1
kind: ImageRepository
metadata:
name: sonarr
@@ -222,7 +222,7 @@ spec:
interval: 1h0m0s
---
# Flux ImagePolicy (R-UPD)
apiVersion: image.toolkit.fluxcd.io/v1beta2
apiVersion: image.toolkit.fluxcd.io/v1
kind: ImagePolicy
metadata:
name: sonarr
conformance/tests/l3-fault-injection/hands-off-update/chainsaw-test.yaml
+3 -3
View File
@@ -72,7 +72,7 @@ spec:
# resolution — proving it advanced the selection with zero hand-authored change.
# =========================================================================================
kubectl -n "$NS" apply -f - <<'EOF'
apiVersion: image.toolkit.fluxcd.io/v1beta2
apiVersion: image.toolkit.fluxcd.io/v1
kind: ImageRepository
metadata:
name: podinfo
@@ -80,7 +80,7 @@ spec:
image: ghcr.io/stefanprodan/podinfo
interval: 1m
---
apiVersion: image.toolkit.fluxcd.io/v1beta2
apiVersion: image.toolkit.fluxcd.io/v1
kind: ImagePolicy
metadata:
name: podinfo-stable
@@ -94,7 +94,7 @@ spec:
semver:
range: '>=6.0.0 <7.0.0'
---
apiVersion: image.toolkit.fluxcd.io/v1beta2
apiVersion: image.toolkit.fluxcd.io/v1
kind: ImagePolicy
metadata:
name: podinfo-pinned
platform/image-automation/image-update-automation.yaml
+1 -1
View File
@@ -15,7 +15,7 @@
# flux-system install (bootstrap/flux/bootstrap.sh `--components-extra`), so the image.toolkit CRDs
# pre-exist before reconcile — this CR applies cleanly without the F-MON1 controllers/configs split
# (the CRD is present at bootstrap, exactly like GitRepository/Kustomization are). See README.md.
apiVersion: image.toolkit.fluxcd.io/v1beta2
apiVersion: image.toolkit.fluxcd.io/v1
kind: ImageUpdateAutomation
metadata:
name: flux-image-automation
platform/image-automation/per-service/pihole.example.yaml
+2 -2
View File
@@ -11,7 +11,7 @@
#
# See ./README.md for the field-by-field contract.
# ---------------------------------------------------------------------------------------------------
apiVersion: image.toolkit.fluxcd.io/v1beta2
apiVersion: image.toolkit.fluxcd.io/v1
kind: ImageRepository
metadata:
name: pihole
@@ -21,7 +21,7 @@ spec:
interval: 6h # scan schedule; nearest Flux duration to cadence "0 4 * * *" (daily-ish)
# provider: generic # dockerhub anon; a pull secret goes here if registry rate-limits bite
---
apiVersion: image.toolkit.fluxcd.io/v1beta2
apiVersion: image.toolkit.fluxcd.io/v1
kind: ImagePolicy
metadata:
name: pihole