Update dev-resources to match review comments

- Resource alphabetical ordering
- fix `-f` to become `-k` as otherwise specified (muscle memory)
- split monitoring namespace to earlier in kustomize tree
- drop `targetNamespace` from monitoring
- podinfo targetNamespace remains as this enforces namespace to
  resources that do not have it set in upstream repo

Author: mproffitt

doc/development-process.md

@@ -83,7 +83,7 @@ Woop! It's working. It'll be empty cos you haven't created any flux objects. You
 
 To help see some objects in the UI lets create some sample sources, run the following:
 
-`$ k apply -f ./tools/dev-resources`
+`$ k apply -k ./tools/dev-resources`
 
 Boom! You'll see our newly created flux objects in the UI.
 

tools/dev-resources/README.md

@@ -5,3 +5,9 @@ This directory contains quickstart resources to help get going with Weave-GitOps
 Apply the contents of this directory to your cluster with
 
 `$ k apply -k .`
+
+> [!Note]
+> ImageUpdateAutomation will fail as it points to a non-existing GitRepository
+>
+> You're welcome to create that repository, or use it as a failure case to test
+> error state in the UI.

tools/dev-resources/image-policy/kustomization.yaml

@@ -1,4 +1,4 @@
 resources:
 - podinfo-image-policy.yaml
+- podinfo-image-repository.yaml
 - podinfo-image-update-automation.yaml
-- podinfo-image-repository.yaml

tools/dev-resources/image-policy/podinfo-image-policy.yaml

@@ -2,7 +2,7 @@ apiVersion: image.toolkit.fluxcd.io/v1beta2
 kind: ImagePolicy
 metadata:
   name: podinfo
-  namespace: flux-system
+  namespace: default
 spec:
   imageRepositoryRef:
     name: podinfo

tools/dev-resources/image-policy/podinfo-image-repository.yaml

@@ -2,7 +2,7 @@ apiVersion: image.toolkit.fluxcd.io/v1beta2
 kind: ImageRepository
 metadata:
   name: podinfo
-  namespace: flux-system
+  namespace: default
 spec:
   image: ghcr.io/stefanprodan/podinfo
   interval: 5m

tools/dev-resources/image-policy/podinfo-image-update-automation.yaml

@@ -1,13 +1,14 @@
 apiVersion: image.toolkit.fluxcd.io/v1beta2
 kind: ImageUpdateAutomation
 metadata:
-  name: flux-system
-  namespace: flux-system
+  name: podinfo
+  namespace: default
 spec:
   interval: 30m
   sourceRef:
     kind: GitRepository
     name: flux-system
+    namespace: flux-system
   git:
     checkout:
       ref:
@@ -22,5 +23,3 @@ spec:
   update:
     path: ./clusters/management
     strategy: Setters
-
-

tools/dev-resources/kustomization.yaml

@@ -1,4 +1,5 @@
 resources:
-- podinfo
 - image-policy
-- monitoring
+- monitoring
+- namespace.yaml
+- podinfo

tools/dev-resources/monitoring/kustomization.yaml

@@ -1,2 +1,2 @@
 resources:
-- monitoring.yaml
+- monitoring.yaml

tools/dev-resources/monitoring/monitoring.yaml

@@ -1,61 +1,54 @@
+---
 apiVersion: source.toolkit.fluxcd.io/v1
 kind: GitRepository
 metadata:
   name: flux-monitoring
-  namespace: flux-system
+  namespace: monitoring
 spec:
   interval: 10m0s
   ref:
     branch: main
   url: https://github.com/fluxcd/flux2-monitoring-example
 ---
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: monitoring
----
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
   name: kube-prometheus-stack
-  namespace: flux-system
+  namespace: monitoring
 spec:
   interval: 10m0s
   sourceRef:
     kind: GitRepository
     name: flux-monitoring
   path: ./monitoring/controllers/kube-prometheus-stack
   prune: true
-  targetNamespace: monitoring
   wait: true
 ---
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
   name: loki-stack
-  namespace: flux-system
+  namespace: monitoring
 spec:
   interval: 10m0s
   sourceRef:
     kind: GitRepository
     name: flux-monitoring
   path: ./monitoring/controllers/loki-stack
   prune: true
-  targetNamespace: monitoring
   wait: true
 ---
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
   name: monitoring-config
-  namespace: flux-system
+  namespace: monitoring
 spec:
   interval: 1m0s
   sourceRef:
     kind: GitRepository
-    name: flux-monitoring
+    name: monitoring
   path: ./monitoring/configs
   dependsOn:
     - name: kube-prometheus-stack
   prune: true
-  targetNamespace: monitoring

tools/dev-resources/namespace.yaml

@@ -0,0 +1,5 @@
+---
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: monitoring

tools/dev-resources/podinfo/kustomization.yaml

@@ -1,3 +1,3 @@
 resources:
+- kustomize.yaml
 - source.yaml
-- kustomize.yaml

tools/dev-resources/podinfo/kustomize.yaml

@@ -3,12 +3,13 @@ apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
   name: podinfo
-  namespace: flux-system
+  namespace: default
 spec:
   interval: 5m0s
   path: ./kustomize
   prune: true
   sourceRef:
     kind: GitRepository
     name: podinfo
+    namespace: default
   targetNamespace: default

tools/dev-resources/podinfo/source.yaml

@@ -3,7 +3,7 @@ apiVersion: source.toolkit.fluxcd.io/v1
 kind: GitRepository
 metadata:
   name: podinfo
-  namespace: flux-system
+  namespace: default
 spec:
   interval: 30m0s
   ref: