test

.github/scripts/e2e-debug-failure.sh

@@ -0,0 +1,5 @@
+kubectl -n flux-system get all
+kubectl -n flux-system logs deploy/source-controller
+kubectl -n flux-system logs deploy/kustomize-controller
+kubectl -n flux-system logs deploy/helm-controller
+flux get all --all-namespaces

.github/scripts/e2e-setup-cluster-reconciliation.sh

@@ -0,0 +1,20 @@
+if [ -z "$1" ]; then
+    echo "Error: 'repository_url' argument not set"
+    exit 1
+fi
+
+if [ -z "$2" ]; then
+    echo "Error: 'branch_name' argument not set"
+    exit 1
+fi
+
+repository_url=$1
+branch_name=$2
+
+flux create source git flux-system \
+    --url=$repository_url \
+    --branch=$branch_name \
+    --ignore-paths="k8s/clusters/**/flux-system/"
+flux create kustomization flux-system \
+    --source=flux-system \
+    --path=./k8s/clusters/development

.github/scripts/e2e-verify-cluster-reconciliation.sh

@@ -0,0 +1,2 @@
+kubectl -n flux-system wait kustomization/infrastructure --for=condition=ready --timeout=5m
+kubectl -n flux-system wait kustomization/apps --for=condition=ready --timeout=5m

.github/scripts/e2e-verify-helm-reconciliation.sh

@@ -0,0 +1 @@
+# kubectl -n ingress-traefik wait helmrelease/ingress-traefik --for=condition=ready --timeout=5m

.github/workflows/e2e.yaml

@@ -0,0 +1,36 @@
+name: End-to-end test
+
+on:
+  workflow_dispatch:
+  push:
+    branches: 'main'
+  pull_request:
+    branches: 'main'
+
+jobs:
+  end-to-end-test:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+      - name: Setup Flux
+        uses: fluxcd/flux2/action@main
+      - name: Extract branch name
+        run: echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT
+        id: extract_branch
+      - name: Setup Kubernetes
+        uses: nolar/setup-k3d-k3s@v1
+        with:
+          k3d-name: cluster-test
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+      - name: Install Flux
+        run: flux install
+      - name: Setup cluster reconciliation
+        run: ./.github/scripts/e2e-setup-cluster-reconciliation.sh ${{ github.event.repository.html_url }} ${{ steps.extract_branch.outputs.branch }}
+      - name: Verify cluster reconciliation
+        run: ./.github/scripts/e2e-verify-cluster-reconciliation.sh
+      - name: Verify helm reconciliation
+        run: ./.github/scripts/e2e-verify-helm-reconciliation.sh
+      - name: Debug failure
+        if: failure()
+        run: ./.github/scripts/e2e-debug-failure.sh

k8s/clusters/development/apps.yaml

@@ -6,7 +6,7 @@ metadata:
 spec:
   interval: 10m
   dependsOn:
-    - name: infra-configs
+    - name: infrastructure
   sourceRef:
     kind: GitRepository
     name: flux-system

k8s/clusters/development/infrastructure.yaml

@@ -1,38 +1,15 @@
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
-  name: infra-controllers
+  name: infrastructure
   namespace: flux-system
 spec:
   interval: 1h
   retryInterval: 1m
   sourceRef:
     kind: GitRepository
     name: flux-system
-  path: ./k8s/infrastructure/controllers
+  path: ./k8s/infrastructure/overlays/development
   prune: true
   wait: true
----
-apiVersion: kustomize.toolkit.fluxcd.io/v1
-kind: Kustomization
-metadata:
-  name: infra-configs
-  namespace: flux-system
-spec:
-  dependsOn:
-    - name: infra-controllers
-  interval: 1h
-  retryInterval: 1m
-  sourceRef:
-    kind: GitRepository
-    name: flux-system
-  path: ./k8s/infrastructure/configs
-  prune: true
-  patches:
-    - patch: |
-        - op: replace
-          path: /spec/acme/server
-          value: https://acme-staging-v02.api.letsencrypt.org/directory
-      target:
-        kind: ClusterIssuer
-        name: letsencrypt
+

k8s/clusters/production/apps.yaml

@@ -0,0 +1,15 @@
+apiVersion: kustomize.toolkit.fluxcd.io/v1
+kind: Kustomization
+metadata:
+  name: apps
+  namespace: flux-system
+spec:
+  interval: 10m
+  dependsOn:
+    - name: infrastructure
+  sourceRef:
+    kind: GitRepository
+    name: flux-system
+  path: ./k8s/apps/overlays/production
+  prune: true
+  wait: true

k8s/clusters/production/infrastructure.yaml

@@ -0,0 +1,15 @@
+apiVersion: kustomize.toolkit.fluxcd.io/v1
+kind: Kustomization
+metadata:
+  name: infrastructure
+  namespace: flux-system
+spec:
+  interval: 1h
+  retryInterval: 1m
+  sourceRef:
+    kind: GitRepository
+    name: flux-system
+  path: ./k8s/infrastructure/overlays/production
+  prune: true
+  wait: true
+

k8s/infrastructure/controllers/kustomization.yaml → k8s/infrastructure/kustomization.yaml

@@ -1,4 +1,3 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-resources:
-  - ingress-traefik
+resources: []

k8s/infrastructure/configs/kustomization.yaml → k8s/infrastructure/overlays/development/kustomization.yaml

@@ -1,5 +1,3 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-resources:
-  # - cluster-issuers.yaml
-  - network-policies.yaml
+resources: []

k8s/infrastructure/overlays/production/kustomization.yaml

@@ -0,0 +1,3 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources: []