apps/hello-app/image-automation.yaml

@@ -3,7 +3,7 @@
 # when one shows up. Requires clusters/homelab/flux-system to have write
 # access to the Forgejo repo (flux bootstrap sets this up).
 
-apiVersion: image.toolkit.fluxcd.io/v1
+apiVersion: image.toolkit.fluxcd.io/v1beta2
 kind: ImageRepository
 metadata:
   name: hello-app
@@ -15,7 +15,7 @@ spec:
   # secretRef:
   #   name: forgejo-registry
 ---
-apiVersion: image.toolkit.fluxcd.io/v1
+apiVersion: image.toolkit.fluxcd.io/v1beta2
 kind: ImagePolicy
 metadata:
   name: hello-app
@@ -30,7 +30,7 @@ spec:
     pattern: '^main-[a-f0-9]+-(?P<ts>\d+)$'
     extract: '$ts'
 ---
-apiVersion: image.toolkit.fluxcd.io/v1
+apiVersion: image.toolkit.fluxcd.io/v1beta1
 kind: ImageUpdateAutomation
 metadata:
   name: hello-app

docs/03-flux.md

@@ -38,15 +38,6 @@ from `docs/01-bootstrap.md` step 4, not SSH (Forgejo's git-SSH port turned
 out not to be reliably reachable from either this desktop or the T630 —
 see the earlier troubleshooting in this project's history):
 
-`flux bootstrap` only installs its four core controllers
-(`source-controller`, `kustomize-controller`, `helm-controller`,
-`notification-controller`) unless told otherwise. hello-app's image
-automation (step 7 below — `ImageRepository`/`ImagePolicy`/
-`ImageUpdateAutomation`) needs two more, `image-reflector-controller` and
-`image-automation-controller`, which are opt-in via `--components-extra`;
-without it, hello-app's `Kustomization` fails dry-run with "no matches for
-kind ImageRepository" since the CRD was never installed.
-
 ```sh
 flux check --pre --kubeconfig ~/.kube/config-manual
 
@@ -57,7 +48,6 @@ flux bootstrap git \
   --username=codegit \
   --password=<FLUX_WRITE_TOKEN> \
   --token-auth \
-  --components-extra=image-reflector-controller,image-automation-controller \
   --kubeconfig ~/.kube/config-manual
 ```
 
@@ -99,9 +89,7 @@ kubectl -n flux-system get deployments
 ```
 
 `source-controller`, `kustomize-controller`, `helm-controller`,
-`notification-controller`, plus `image-reflector-controller` and
-`image-automation-controller` from `--components-extra` above. Alongside
-them, it registered the CRDs those
+`notification-controller`. Alongside them, it registered the CRDs those
 controllers understand:
 
 ```sh