fix(flux)move all components back to main group now that I have seen …

.github/workflows/flux-diff.yaml

@@ -5,7 +5,7 @@ name: "Flux Diff"
 on:
   pull_request:
     branches: ["main"]
-    paths: ["kubernetes/**"]
+    paths: ["kubernetes/main/**"]
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.number || github.ref }}
@@ -20,7 +20,7 @@ jobs:
       pull-requests: write
     strategy:
       matrix:
-        paths: ["kubernetes"]
+        paths: ["kubernetes/main"]
         resources: ["helmrelease", "kustomization"]
     steps:
       - name: Checkout

.github/workflows/kubeconform.yaml

@@ -5,7 +5,7 @@ name: "Kubeconform"
 on:
   pull_request:
     branches: ["main"]
-    paths: ["kubernetes/**"]
+    paths: ["kubernetes/main/**"]
 
 env:
   KUBERNETES_DIR: ./kubernetes

kubernetes/apps/cert-manager/cert-manager/ks.yaml → kubernetes/main/apps/cert-manager/cert-manager/ks.yaml

@@ -9,7 +9,7 @@ spec:
   commonMetadata:
     labels:
       app.kubernetes.io/name: *app
-  path: ./kubernetes/apps/cert-manager/cert-manager/app
+  path: ./kubernetes/main/apps/cert-manager/cert-manager/app
   prune: true
   sourceRef:
     kind: GitRepository
@@ -33,7 +33,7 @@ spec:
   dependsOn:
     - name: cert-manager
     - name: external-secrets-stores
-  path: ./kubernetes/apps/cert-manager/cert-manager/issuers
+  path: ./kubernetes/main/apps/cert-manager/cert-manager/issuers
   prune: true
   sourceRef:
     kind: GitRepository

kubernetes/apps/cert-manager/certificates/ks.yaml → kubernetes/main/apps/cert-manager/certificates/ks.yaml

@@ -12,7 +12,7 @@ spec:
       app.kubernetes.io/name: *app
   dependsOn:
     - name: external-secrets-stores
-  path: ./kubernetes/apps/cert-manager/certificates/import
+  path: ./kubernetes/main/apps/cert-manager/certificates/import
   prune: false
   sourceRef:
     kind: GitRepository
@@ -37,7 +37,7 @@ spec:
     - name: certificates-import
     - name: cert-manager-issuers
     - name: external-secrets-stores
-  path: ./kubernetes/apps/cert-manager/certificates/app
+  path: ./kubernetes/main/apps/cert-manager/certificates/app
   prune: false
   sourceRef:
     kind: GitRepository

kubernetes/apps/databases/cnpg-operator/ks.yaml → kubernetes/main/apps/databases/cnpg-operator/ks.yaml

@@ -9,7 +9,7 @@ spec:
   commonMetadata:
     labels:
       app.kubernetes.io/name: cloudnative-pg
-  path: ./kubernetes/apps/databases/cnpg-operator/app
+  path: ./kubernetes/main/apps/databases/cnpg-operator/app
   prune: false
   sourceRef:
     kind: GitRepository

kubernetes/apps/databases/emqx/ks.yaml → kubernetes/main/apps/databases/emqx/ks.yaml

@@ -12,7 +12,7 @@ spec:
       app.kubernetes.io/name: *appname
   interval: 30m
   timeout: 5m
-  path: ./kubernetes/apps/databases/emqx/operator
+  path: ./kubernetes/main/apps/databases/emqx/operator
   prune: true
   sourceRef:
     kind: GitRepository
@@ -34,7 +34,7 @@ spec:
       app.kubernetes.io/name: *appname
   interval: 30m
   timeout: 5m
-  path: ./kubernetes/apps/databases/emqx/cluster
+  path: ./kubernetes/main/apps/databases/emqx/cluster
   prune: true
   sourceRef:
     kind: GitRepository

kubernetes/apps/downloads/bazarr/ks.yaml → kubernetes/main/apps/downloads/bazarr/ks.yaml

@@ -12,7 +12,7 @@ spec:
       app.kubernetes.io/name: *app
   dependsOn:
     - name: external-secrets-stores
-  path: ./kubernetes/apps/downloads/bazarr/app
+  path: ./kubernetes/main/apps/downloads/bazarr/app
   prune: true
   sourceRef:
     kind: GitRepository

kubernetes/apps/downloads/prowlarr/ks.yaml → kubernetes/main/apps/downloads/prowlarr/ks.yaml

@@ -11,7 +11,7 @@ spec:
     labels:
       app.kubernetes.io/name: *appname
   interval: 10m
-  path: "./kubernetes/apps/downloads/prowlarr/app"
+  path: ./kubernetes/main/apps/downloads/prowlarr/app
   prune: true
   sourceRef:
     kind: GitRepository

kubernetes/apps/downloads/qbittorrent/ks.yaml → kubernetes/main/apps/downloads/qbittorrent/ks.yaml

@@ -12,7 +12,7 @@ spec:
       app.kubernetes.io/name: *app
   dependsOn:
     - name: external-secrets-stores
-  path: ./kubernetes/apps/downloads/qbittorrent/app
+  path: ./kubernetes/main/apps/downloads/qbittorrent/app
   prune: true
   sourceRef:
     kind: GitRepository

kubernetes/apps/downloads/radarr/ks.yaml → kubernetes/main/apps/downloads/radarr/ks.yaml

@@ -11,7 +11,7 @@ spec:
     labels:
       app.kubernetes.io/name: *appname
   interval: 10m
-  path: "./kubernetes/apps/downloads/radarr/app"
+  path: ./kubernetes/main/apps/downloads/radarr/app
   prune: true
   sourceRef:
     kind: GitRepository

kubernetes/apps/downloads/recyclarr/ks.yaml → kubernetes/main/apps/downloads/recyclarr/ks.yaml

@@ -12,7 +12,7 @@ spec:
       app.kubernetes.io/name: *appname
   interval: 30m
   timeout: 5m
-  path: "./kubernetes/apps/downloads/recyclarr/app"
+  path: ./kubernetes/main/apps/downloads/recyclarr/app
   prune: true
   sourceRef:
     kind: GitRepository

kubernetes/apps/downloads/sabnzbd/ks.yaml → kubernetes/main/apps/downloads/sabnzbd/ks.yaml

@@ -12,7 +12,7 @@ spec:
       app.kubernetes.io/name: *app
   dependsOn:
     - name: external-secrets-stores
-  path: ./kubernetes/apps/downloads/sabnzbd/app
+  path: ./kubernetes/main/apps/downloads/sabnzbd/app
   prune: true
   sourceRef:
     kind: GitRepository

kubernetes/apps/downloads/sonarr/ks.yaml → kubernetes/main/apps/downloads/sonarr/ks.yaml

@@ -11,7 +11,7 @@ spec:
     labels:
       app.kubernetes.io/name: *name
   interval: 10m
-  path: "./kubernetes/apps/downloads/sonarr/app"
+  path: ./kubernetes/main/apps/downloads/sonarr/app
   prune: true
   sourceRef:
     kind: GitRepository

kubernetes/apps/flux-system/webhooks/ks.yaml → kubernetes/main/apps/flux-system/webhooks/ks.yaml

@@ -9,7 +9,7 @@ spec:
   commonMetadata:
     labels:
       app.kubernetes.io/name: *app
-  path: ./kubernetes/apps/flux-system/webhooks/app
+  path: ./kubernetes/main/apps/flux-system/webhooks/app
   prune: true
   sourceRef:
     kind: GitRepository

kubernetes/apps/gateway-system/gateway-api-crds/ks.yaml → kubernetes/main/apps/gateway-system/gateway-api-crds/ks.yaml

@@ -11,7 +11,7 @@ spec:
       app.kubernetes.io/name: *app
   dependsOn:
     - name: cilium
-  path: ./kubernetes/apps/gateway-system/gateway-api-crds/crd/defaults
+  path: ./kubernetes/main/apps/gateway-system/gateway-api-crds/crd/defaults
   prune: false # never should be deleted
   sourceRef:
     kind: GitRepository

kubernetes/apps/gateway-system/gateways/ks.yaml → kubernetes/main/apps/gateway-system/gateways/ks.yaml

@@ -11,7 +11,7 @@ spec:
       app.kubernetes.io/name: *app
   dependsOn:
     - name: cilium
-  path: ./kubernetes/apps/gateway-system/gateways/internal
+  path: ./kubernetes/main/apps/gateway-system/gateways/internal
   prune: false # never should be deleted
   sourceRef:
     kind: GitRepository

kubernetes/apps/home-automation/home-assistant/ks.yaml → kubernetes/main/apps/home-automation/home-assistant/ks.yaml

@@ -12,7 +12,7 @@ spec:
       app.kubernetes.io/name: *app
   dependsOn:
     - name: external-secrets-stores
-  path: ./kubernetes/apps/home-automation/home-assistant/app
+  path: ./kubernetes/main/apps/home-automation/home-assistant/app
   prune: true
   sourceRef:
     kind: GitRepository

kubernetes/apps/home-automation/zigbee2mqtt/ks.yaml → kubernetes/main/apps/home-automation/zigbee2mqtt/ks.yaml

@@ -12,7 +12,7 @@ spec:
       app.kubernetes.io/name: *app
   dependsOn:
     - name: external-secrets-stores
-  path: ./kubernetes/apps/home-automation/zigbee2mqtt/app
+  path: ./kubernetes/main/apps/home-automation/zigbee2mqtt/app
   prune: true
   sourceRef:
     kind: GitRepository

kubernetes/apps/kube-system/cilium/ks.yaml → kubernetes/main/apps/kube-system/cilium/ks.yaml

@@ -9,7 +9,7 @@ spec:
   commonMetadata:
     labels:
       app.kubernetes.io/name: *app
-  path: ./kubernetes/apps/kube-system/cilium/app
+  path: ./kubernetes/main/apps/kube-system/cilium/app
   prune: false # never should be deleted
   sourceRef:
     kind: GitRepository
@@ -31,7 +31,7 @@ spec:
       app.kubernetes.io/name: *app
   dependsOn:
     - name: cilium
-  path: ./kubernetes/apps/kube-system/cilium/config
+  path: ./kubernetes/main/apps/kube-system/cilium/config
   prune: false # never should be deleted
   sourceRef:
     kind: GitRepository

kubernetes/apps/kube-system/coredns/ks.yaml → kubernetes/main/apps/kube-system/coredns/ks.yaml

@@ -9,7 +9,7 @@ spec:
   commonMetadata:
     labels:
       app.kubernetes.io/name: *app
-  path: ./kubernetes/apps/kube-system/coredns/app
+  path: ./kubernetes/main/apps/kube-system/coredns/app
   prune: false # never should be deleted
   sourceRef:
     kind: GitRepository

kubernetes/apps/kube-system/csi-driver-nfs/ks.yaml → kubernetes/main/apps/kube-system/csi-driver-nfs/ks.yaml

@@ -9,7 +9,7 @@ spec:
   commonMetadata:
     labels:
       app.kubernetes.io/name: *app
-  path: ./kubernetes/apps/kube-system/csi-driver-nfs/app
+  path: ./kubernetes/main/apps/kube-system/csi-driver-nfs/app
   prune: true
   sourceRef:
     kind: GitRepository

kubernetes/apps/kube-system/metrics-server/ks.yaml → kubernetes/main/apps/kube-system/metrics-server/ks.yaml

@@ -9,7 +9,7 @@ spec:
   commonMetadata:
     labels:
       app.kubernetes.io/name: *app
-  path: ./kubernetes/apps/kube-system/metrics-server/app
+  path: ./kubernetes/main/apps/kube-system/metrics-server/app
   prune: true
   sourceRef:
     kind: GitRepository

kubernetes/apps/kube-system/reloader/ks.yaml → kubernetes/main/apps/kube-system/reloader/ks.yaml

@@ -9,7 +9,7 @@ spec:
   commonMetadata:
     labels:
       app.kubernetes.io/name: *app
-  path: ./kubernetes/apps/kube-system/reloader/app
+  path: ./kubernetes/main/apps/kube-system/reloader/app
   prune: true
   sourceRef:
     kind: GitRepository

kubernetes/apps/media/plex/ks.yaml → kubernetes/main/apps/media/plex/ks.yaml

@@ -12,7 +12,7 @@ spec:
       app.kubernetes.io/name: *appname
   interval: 30m
   timeout: 5m
-  path: "./kubernetes/apps/media/plex/app"
+  path: ./kubernetes/main/apps/media/plex/app
   prune: true
   sourceRef:
     kind: GitRepository

kubernetes/apps/network/cloudflared/ks.yaml → kubernetes/main/apps/network/cloudflared/ks.yaml

@@ -13,7 +13,7 @@ spec:
   dependsOn:
     - name: external-dns-cloudflare
     - name: external-secrets-stores
-  path: ./kubernetes/apps/network/cloudflared/app
+  path: ./kubernetes/main/apps/network/cloudflared/app
   prune: false
   sourceRef:
     kind: GitRepository

kubernetes/apps/network/echo-server/ks.yaml → kubernetes/main/apps/network/echo-server/ks.yaml

@@ -10,7 +10,7 @@ spec:
   commonMetadata:
     labels:
       app.kubernetes.io/name: *app
-  path: ./kubernetes/apps/network/echo-server/app
+  path: ./kubernetes/main/apps/network/echo-server/app
   prune: false
   sourceRef:
     kind: GitRepository

kubernetes/apps/network/external-dns/ks.yaml → kubernetes/main/apps/network/external-dns/ks.yaml

@@ -12,7 +12,7 @@ spec:
       app.kubernetes.io/name: *app
   dependsOn:
     - name: external-secrets-stores
-  path: ./kubernetes/apps/network/external-dns/cloudflare
+  path: ./kubernetes/main/apps/network/external-dns/cloudflare
   prune: false
   sourceRef:
     kind: GitRepository
@@ -35,7 +35,7 @@ spec:
       app.kubernetes.io/name: *app
   dependsOn:
     - name: external-secrets-stores
-  path: ./kubernetes/apps/network/external-dns/pihole
+  path: ./kubernetes/main/apps/network/external-dns/pihole
   prune: false
   sourceRef:
     kind: GitRepository

kubernetes/apps/network/k8s-gateway/ks.yaml → kubernetes/main/apps/network/k8s-gateway/ks.yaml

@@ -9,7 +9,7 @@ spec:
   commonMetadata:
     labels:
       app.kubernetes.io/name: *app
-  path: ./kubernetes/apps/network/k8s-gateway/app
+  path: ./kubernetes/main/apps/network/k8s-gateway/app
   prune: true
   sourceRef:
     kind: GitRepository

kubernetes/apps/network/multus/ks.yaml → kubernetes/main/apps/network/multus/ks.yaml

@@ -12,7 +12,7 @@ spec:
       app.kubernetes.io/name: *appname
   interval: 30m
   timeout: 5m
-  path: "./kubernetes/apps/network/multus/app/overlays/defaults"
+  path: ./kubernetes/main/apps/network/multus/app/overlays/defaults
   prune: true
   sourceRef:
     kind: GitRepository

kubernetes/apps/network/nginx/ks.yaml → kubernetes/main/apps/network/nginx/ks.yaml

@@ -13,7 +13,7 @@ spec:
   dependsOn:
     - name: certificates
     - name: external-secrets-stores
-  path: ./kubernetes/apps/network/nginx/internal
+  path: ./kubernetes/main/apps/network/nginx/internal
   prune: false
   sourceRef:
     kind: GitRepository
@@ -37,7 +37,7 @@ spec:
   dependsOn:
     - name: certificates
     - name: external-secrets-stores
-  path: ./kubernetes/apps/network/nginx/external
+  path: ./kubernetes/main/apps/network/nginx/external
   prune: false
   sourceRef:
     kind: GitRepository

kubernetes/apps/observability/grafana/ks.yaml → kubernetes/main/apps/observability/grafana/ks.yaml

@@ -12,7 +12,7 @@ spec:
       app.kubernetes.io/name: *app
   dependsOn:
     - name: external-secrets-stores
-  path: ./kubernetes/apps/observability/grafana/app
+  path: ./kubernetes/main/apps/observability/grafana/app
   prune: true
   sourceRef:
     kind: GitRepository

kubernetes/apps/observability/kube-prometheus-stack/ks.yaml → kubernetes/main/apps/observability/kube-prometheus-stack/ks.yaml

@@ -12,7 +12,7 @@ spec:
       app.kubernetes.io/name: *app
   dependsOn:
     - name: external-secrets-stores
-  path: ./kubernetes/apps/observability/kube-prometheus-stack/app
+  path: ./kubernetes/main/apps/observability/kube-prometheus-stack/app
   prune: true
   sourceRef:
     kind: GitRepository

kubernetes/apps/observability/prometheus-operator-crds/ks.yaml → kubernetes/main/apps/observability/prometheus-operator-crds/ks.yaml

@@ -9,7 +9,7 @@ spec:
   commonMetadata:
     labels:
       app.kubernetes.io/name: *app
-  path: ./kubernetes/apps/observability/prometheus-operator-crds/app
+  path: ./kubernetes/main/apps/observability/prometheus-operator-crds/app
   prune: false # never should be deleted
   sourceRef:
     kind: GitRepository

kubernetes/apps/openebs-system/openebs/ks.yaml → kubernetes/main/apps/openebs-system/openebs/ks.yaml

@@ -9,7 +9,7 @@ spec:
   commonMetadata:
     labels:
       app.kubernetes.io/name: *app
-  path: ./kubernetes/apps/openebs-system/openebs/app
+  path: ./kubernetes/main/apps/openebs-system/openebs/app
   prune: true
   sourceRef:
     kind: GitRepository

kubernetes/apps/security/external-secrets/ks.yaml → kubernetes/main/apps/security/external-secrets/ks.yaml

@@ -10,7 +10,7 @@ spec:
   commonMetadata:
     labels:
       app.kubernetes.io/name: *app
-  path: ./kubernetes/apps/security/external-secrets/app
+  path: ./kubernetes/main/apps/security/external-secrets/app
   prune: true
   sourceRef:
     kind: GitRepository
@@ -33,7 +33,7 @@ spec:
       app.kubernetes.io/name: *app
   dependsOn:
     - name: external-secrets
-  path: ./kubernetes/apps/security/external-secrets/stores
+  path: ./kubernetes/main/apps/security/external-secrets/stores
   prune: true
   sourceRef:
     kind: GitRepository

kubernetes/apps/security/onepassword-connect/ks.yaml → kubernetes/main/apps/security/onepassword-connect/ks.yaml

@@ -10,7 +10,7 @@ spec:
   commonMetadata:
     labels:
       app.kubernetes.io/name: *app
-  path: ./kubernetes/apps/security/onepassword-connect/app
+  path: ./kubernetes/main/apps/security/onepassword-connect/app
   prune: true
   sourceRef:
     kind: GitRepository