feat(flux): convert to cluster/meta folder

.github/workflows/flux-diff.yaml

@@ -47,8 +47,8 @@ jobs:
           args: >-
             diff ${{ matrix.resources }}
             --unified 6
-            --path /github/workspace/pull/kubernetes/flux/config
-            --path-orig /github/workspace/default/kubernetes/flux/config
+            --path /github/workspace/pull/kubernetes/flux/cluster
+            --path-orig /github/workspace/default/kubernetes/flux/cluster
             --strip-attrs "helm.sh/chart,checksum/config,app.kubernetes.io/version,chart"
             --limit-bytes 10000
             --all-namespaces
@@ -89,6 +89,6 @@ jobs:
     name: Flux Diff Successful
     runs-on: ubuntu-latest
     steps:
-      - if: ${{ !contains(needs.*.result, 'success') }}
+      - if: ${{ contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled') }}
         name: Check matrix status
         run: exit 1

.github/workflows/pre-pull-images.yaml

@@ -40,7 +40,7 @@ jobs:
         with:
           args: >-
             get cluster
-            --path /github/workspace/kubernetes/flux/config
+            --path /github/workspace/kubernetes/flux/cluster
             --enable-images
             --output yaml
             --output-file images.yaml
@@ -92,11 +92,11 @@ jobs:
 
   # Summarize matrix https://github.community/t/status-check-for-a-matrix-jobs/127354/7
   pre-pull-images-success:
-    if: ${{ needs.compare-images.outputs.images != '[]' }}
+    if: ${{ always() }}
     needs: ["pre-pull-images"]
     name: Pre-pull Images Successful
     runs-on: ubuntu-latest
     steps:
-      - if: ${{ !contains(needs.*.result, 'success') }}
+      - if: ${{ contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled') }}
         name: Check matrix status
         run: exit 1

kubernetes/apps/flux-system/flux-operator/instance/resources/values.yaml

@@ -14,7 +14,7 @@ instance:
     kind: GitRepository
     url: ssh://git@github.com/buroa/k8s-gitops
     ref: refs/heads/master
-    path: ./kubernetes/flux/config
+    path: ./kubernetes/flux/cluster
     pullSecret: github-deploy-key
   kustomize:
     patches:

kubernetes/flux/config/cluster.yaml → kubernetes/flux/cluster/ks.yaml

@@ -2,30 +2,12 @@
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
-  name: cluster-repositories
+  name: cluster-meta
   namespace: flux-system
 spec:
   interval: 30m
-  path: ./kubernetes/flux/repositories
-  prune: false # revert after
-  wait: true
-  sourceRef:
-    kind: GitRepository
-    name: flux-system
-  decryption:
-    provider: sops
-    secretRef:
-      name: sops-age
----
-apiVersion: kustomize.toolkit.fluxcd.io/v1
-kind: Kustomization
-metadata:
-  name: cluster-settings
-  namespace: flux-system
-spec:
-  interval: 30m
-  path: ./kubernetes/flux/settings
-  prune: false # revert after
+  path: ./kubernetes/flux/meta
+  prune: true
   wait: true
   sourceRef:
     kind: GitRepository
@@ -43,8 +25,7 @@ metadata:
 spec:
   interval: 30m
   dependsOn:
-    - name: cluster-repositories
-    - name: cluster-settings
+    - name: cluster-meta
   path: ./kubernetes/apps
   prune: false # revert after
   sourceRef:

kubernetes/flux/config/kustomization.yaml → kubernetes/flux/meta/kustomization.yaml

@@ -2,4 +2,5 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - ./cluster.yaml
+  - ./repositories
+  - ./settings