feat: Makefile that is smarter on dependencies

.claude/settings.local.json

@@ -0,0 +1,41 @@
+{
+  "permissions": {
+    "allow": [
+      "Bash(make fmt)",
+      "Bash(make vet)",
+      "Bash(make lint)",
+      "Bash(make test)",
+      "Bash(make test-e2e)",
+      "Bash(make --dry-run test-e2e-quickstart-manifest)",
+      "Bash(make test-e2e-quickstart-manifest)",
+      "Bash(make test-e2e-quickstart-helm)",
+      "Bash(kubectl --context kind-gitops-reverser-test-e2e-quickstart-helm get clusterrole,clusterrolebinding,crd)",
+      "Bash(make --dry-run test-e2e-quickstart-helm)",
+      "Bash(make --dry-run test-e2e)",
+      "Bash(grep -n \"setupSOPSAgeSecret\\\\|generateAgeKey\\\\|e2eAgeKeyPath\" /workspaces/gitops-reverser2/test/e2e/*.go)",
+      "Bash(grep -n \"readSOPSAgeKeyFromFile\" /workspaces/gitops-reverser2/test/e2e/*.go)",
+      "Bash(grep -r \"make\\\\|Make\" /workspaces/gitops-reverser2/test/e2e/*.go)",
+      "Bash(make .stamps/image/controller.id)",
+      "Bash(docker version)",
+      "Bash(docker buildx version)",
+      "Bash(go build ./test/e2e/tools/gen-age-key/...)",
+      "Bash(make cleanup-cluster)",
+      "Bash(make -n prepare-e2e INSTALL_MODE=helm)",
+      "Bash(checkmake Makefile)",
+      "Bash(docker info)",
+      "Bash(make fmt vet)",
+      "Bash(kubectl --context k3d-gitops-reverser-test-e2e get clusterrole,clusterrolebinding -l app.kubernetes.io/part-of=gitops-reverser --no-headers)",
+      "Read(//workspaces/gitops-reverser2/**)",
+      "Bash(kubectl --context k3d-gitops-reverser-test-e2e get crd gitproviders.configbutler.ai gittargets.configbutler.ai watchrules.configbutler.ai clusterwatchrules.configbutler.ai -o jsonpath='{range .items[*]}{.metadata.name}: managedFields manager={.metadata.managedFields[0].manager}{\"\"\\\\n\"\"}{end}')",
+      "Bash(helm upgrade --help)",
+      "Bash(kubectl --context k3d-gitops-reverser-test-e2e delete ns gitops-reverser --ignore-not-found=true)",
+      "Bash(kubectl --context k3d-gitops-reverser-test-e2e wait --for=delete ns/gitops-reverser --timeout=120s)",
+      "Bash(kubectl --context k3d-gitops-reverser-test-e2e delete validatingwebhookconfiguration gitops-reverser-validating-webhook-configuration --ignore-not-found=true)",
+      "Bash(kubectl --context k3d-gitops-reverser-test-e2e delete crd gitproviders.configbutler.ai gittargets.configbutler.ai watchrules.configbutler.ai clusterwatchrules.configbutler.ai --ignore-not-found=true)",
+      "Bash(grep -l \"managedFields\" charts/gitops-reverser/crds/*.yaml)",
+      "Bash(grep -l \"managedFields\" config/crd/bases/*.yaml)",
+      "Bash(helm install gitops-reverser charts/gitops-reverser --kube-context k3d-gitops-reverser-test-e2e --namespace gitops-reverser --create-namespace --debug)",
+      "Bash(helm version)"
+    ]
+  }
+}

.devcontainer/Dockerfile

@@ -14,6 +14,7 @@ RUN apt-get update \
     vim \
     less \
     jq \
+    yq \
     sudo \
     acl \
     rsync \
@@ -36,7 +37,7 @@ ENV KUBECTL_VERSION=v1.35.0 \
     KUBEBUILDER_VERSION=4.11.1 \
     GOLANGCI_LINT_VERSION=v2.10.1 \
     HELM_VERSION=v4.0.0 \
-    KIND_VERSION=v0.31.0
+    K3D_VERSION=v5.8.3
 
 # Install kubectl
 RUN curl -LO "https://dl.k8s.io/release/${KUBECTL_VERSION}/bin/linux/amd64/kubectl" \
@@ -62,9 +63,9 @@ RUN curl -fsSL https://get.helm.sh/helm-${HELM_VERSION}-linux-amd64.tar.gz \
 RUN curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh \
     | sh -s -- -b /usr/local/bin ${GOLANGCI_LINT_VERSION}
 
-# Install Kind (needed in CI for e2e cluster creation, and in dev for local clusters)
-RUN curl -Lo /usr/local/bin/kind "https://github.com/kubernetes-sigs/kind/releases/download/${KIND_VERSION}/kind-linux-amd64" \
-    && chmod +x /usr/local/bin/kind
+# Install k3d (faster and kind alternative, also more stable with our docker-outside-docker setup)
+RUN curl -fsSL -o /usr/local/bin/k3d "https://github.com/k3d-io/k3d/releases/download/${K3D_VERSION}/k3d-linux-amd64" \
+    && chmod +x /usr/local/bin/k3d
 
 # Set working directory
 WORKDIR /workspaces
@@ -84,7 +85,8 @@ RUN chgrp -R godev /go && \
 # Install Go tools used by the project (using @version doesn't need go.mod)
 # These run AFTER permissions are set to ensure proper group ownership
 RUN go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.19.0 \
-    && go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest
+    && go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest \
+    && go install github.com/checkmake/checkmake/cmd/checkmake@latest
 
 # Initialize golangci-lint cache by running it once on an empty directory
 # This downloads linter dependencies without needing source code

.devcontainer/SETUP_CLUSTER_TROUBLESHOOTING.md

@@ -10,19 +10,19 @@ Get "https://172.19.0.2:6443/livez?timeout=10s": dial tcp 172.19.0.2:6443: conne
 
 ## Root cause (current setup)
 
-`test/e2e/kind/start-cluster.sh` generates `test/e2e/kind/cluster.ignore.yaml` from `HOST_PROJECT_PATH`.
+`test/e2e/cluster/start-cluster.sh` generates `test/e2e/cluster/cluster.ignore.yaml` from `HOST_PROJECT_PATH`.
 
 In the current devcontainer config, `HOST_PROJECT_PATH` is set from `${localWorkspaceFolder}`.  
 That produced:
 
 ```
-hostPath: /home/simon/git/gitops-reverser2/test/e2e/kind/audit
+hostPath: /home/simon/git/gitops-reverser2/test/e2e/cluster/audit
 ```
 
 But that mounted directory exists and is empty in the container, while the real audit files are under:
 
 ```
-/workspaces/gitops-reverser2/test/e2e/kind/audit
+/workspaces/gitops-reverser2/test/e2e/cluster/audit
 ```
 
 Because the mount source is wrong/empty, kube-apiserver cannot read:
@@ -56,7 +56,7 @@ Your current config mixes modes and path assumptions, so Kind mount path resolut
 Before running `make setup-cluster`, verify generated config points to a path with files:
 
 ```bash
-cat test/e2e/kind/cluster.ignore.yaml
+cat test/e2e/cluster/cluster.ignore.yaml
 ls -la <hostPath-from-generated-file>
 ```
 

.github/workflows/ci.yml

@@ -77,8 +77,9 @@ jobs:
             helm version
             golangci-lint version
             controller-gen --version
-            kind version
+            k3d version
             docker --version
+            checkmake --version
             echo '✅ All CI container tools verified'
           "
 
@@ -123,8 +124,9 @@ jobs:
             kustomize version
             helm version
             golangci-lint version
-            kind version
+            k3d version
             docker --version
+            checkmake --version
             echo '✅ All dev container tools verified'
           "
 
@@ -161,7 +163,7 @@ jobs:
 
       - name: Generate install.yaml from Helm chart
         run: |
-          make build-installer
+          make dist/install.yaml
 
       - name: Package Helm chart
         run: |
@@ -193,6 +195,9 @@ jobs:
       - name: Configure Git safe directory (for now needed as workarround https://github.com/actions/checkout/issues/2031)
         run: git config --global --add safe.directory /__w/gitops-reverser/gitops-reverser
 
+      - name: checkmake Makefile
+        run: checkmake Makefile
+
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v9
         with:

.gitignore

@@ -34,9 +34,9 @@ __debug*
 charts/gitops-reverser/crds/*.yaml
 charts/gitops-reverser/config/*.yaml
 
-# Keep the install.yaml for distribution
-dist/install.yaml
+# Generated single-file installer artifact (not tracked).
+/dist/install.yaml
 
 *.o.yaml
 *.ignore.*
-.stamps/*
+.stamps/*