Merge pull request #5904 from fluxcd/update-components-release/v2.8.x

Update toolkit components

.github/labels.yaml

@@ -44,12 +44,12 @@
   description: Feature request proposals in the RFC format
   color: '#D621C3'
   aliases: ['area/RFC']
+- name: backport:release/v2.5.x
+  description: To be backported to release/v2.5.x
+  color: '#ffd700'
 - name: backport:release/v2.6.x
   description: To be backported to release/v2.6.x
   color: '#ffd700'
 - name: backport:release/v2.7.x
   description: To be backported to release/v2.7.x
   color: '#ffd700'
-- name: backport:release/v2.8.x
-  description: To be backported to release/v2.8.x
-  color: '#ffd700'

.github/workflows/action.yaml

@@ -24,6 +24,6 @@ jobs:
     name: action on ${{ matrix.version }}
     steps:
       - name: Checkout
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
       - name: Setup flux
         uses: ./action

.github/workflows/backport.yaml

@@ -8,6 +8,6 @@ jobs:
     permissions:
       contents: write # for reading and creating branches.
       pull-requests: write # for creating pull requests against release branches.
-    uses: fluxcd/gha-workflows/.github/workflows/backport.yaml@v0.11.0
+    uses: fluxcd/gha-workflows/.github/workflows/backport.yaml@v0.9.0
     secrets:
       github-token: ${{ secrets.BOT_GITHUB_TOKEN }}

.github/workflows/conformance.yaml

@@ -19,13 +19,13 @@ jobs:
       matrix:
         # Keep this list up-to-date with https://endoflife.date/kubernetes
         # Build images with https://github.com/fluxcd/flux-benchmark/actions/workflows/build-kind.yaml
-        KUBERNETES_VERSION: [1.34.1, 1.35.2, 1.36.1]
+        KUBERNETES_VERSION: [1.33.0, 1.34.1, 1.35.0]
       fail-fast: false
     steps:
       - name: Checkout
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
       - name: Setup Go
-        uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
+        uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6.3.0
         with:
           go-version: ${{ env.GO_VERSION }}
           cache-dependency-path: |
@@ -42,7 +42,7 @@ jobs:
       - name: Setup Kubernetes
         uses: helm/kind-action@ef37e7f390d99f746eb8b610417061a60e82a6cc # v1.14.0
         with:
-          version: v0.32.0
+          version: v0.30.0
           cluster_name: ${{ steps.prep.outputs.CLUSTER }}
           node_image: ghcr.io/fluxcd/kindest/node:v${{ matrix.KUBERNETES_VERSION }}-arm64
       - name: Run e2e tests
@@ -76,13 +76,13 @@ jobs:
       matrix:
         # Keep this list up-to-date with https://endoflife.date/kubernetes
         # Available versions can be found with "replicated cluster versions"
-        K3S_VERSION: [ 1.34.8, 1.35.5, 1.36.1 ]
+        K3S_VERSION: [ 1.33.7, 1.34.3, 1.35.0 ]
       fail-fast: false
     steps:
       - name: Checkout
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
       - name: Setup Go
-        uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
+        uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6.3.0
         with:
           go-version: ${{ env.GO_VERSION }}
           cache-dependency-path: |
@@ -97,7 +97,7 @@ jobs:
           KUBECONFIG_PATH="$(git rev-parse --show-toplevel)/bin/kubeconfig.yaml"
           echo "kubeconfig-path=${KUBECONFIG_PATH}" >> $GITHUB_OUTPUT
       - name: Setup Kustomize
-        uses: fluxcd/pkg/actions/kustomize@5a7f3ce0de742b6c561a50f90940d81cf6fc698d # main
+        uses: fluxcd/pkg/actions/kustomize@9a8c0edd5da84dc51a585738c67e3a3950d7fbf0 # main
       - name: Build
         run: make build-dev
       - name: Create repository
@@ -107,7 +107,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITPROVIDER_BOT_TOKEN }}
       - name: Create cluster
         id: create-cluster
-        uses: replicatedhq/replicated-actions/create-cluster@6803131db735f7cc067de88fa14237c7462b247a # v1.27.0
+        uses: replicatedhq/replicated-actions/create-cluster@1abb33f5274580b14f49f2a12d819df7920e4d9b # v1.20.0
         with:
           api-token: ${{ secrets.REPLICATED_API_TOKEN }}
           kubernetes-distribution: "k3s"
@@ -150,7 +150,7 @@ jobs:
           kubectl delete ns flux-system --wait
       - name: Delete cluster
         if: ${{ always() }}
-        uses: replicatedhq/replicated-actions/remove-cluster@6803131db735f7cc067de88fa14237c7462b247a # v1.27.0
+        uses: replicatedhq/replicated-actions/remove-cluster@1abb33f5274580b14f49f2a12d819df7920e4d9b # v1.20.0
         continue-on-error: true
         with:
           api-token: ${{ secrets.REPLICATED_API_TOKEN }}
@@ -168,13 +168,13 @@ jobs:
     strategy:
       matrix:
         # Keep this list up-to-date with https://endoflife.date/red-hat-openshift
-        OPENSHIFT_VERSION: [ 4.20.0-okd, 4.21.0-okd ]
+        OPENSHIFT_VERSION: [ 4.20.0-okd ]
       fail-fast: false
     steps:
       - name: Checkout
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
       - name: Setup Go
-        uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
+        uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6.3.0
         with:
           go-version: ${{ env.GO_VERSION }}
           cache-dependency-path: |
@@ -189,7 +189,7 @@ jobs:
           KUBECONFIG_PATH="$(git rev-parse --show-toplevel)/bin/kubeconfig.yaml"
           echo "kubeconfig-path=${KUBECONFIG_PATH}" >> $GITHUB_OUTPUT
       - name: Setup Kustomize
-        uses: fluxcd/pkg/actions/kustomize@5a7f3ce0de742b6c561a50f90940d81cf6fc698d # main
+        uses: fluxcd/pkg/actions/kustomize@9a8c0edd5da84dc51a585738c67e3a3950d7fbf0 # main
       - name: Build
         run: make build-dev
       - name: Create repository
@@ -199,7 +199,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITPROVIDER_BOT_TOKEN }}
       - name: Create cluster
         id: create-cluster
-        uses: replicatedhq/replicated-actions/create-cluster@6803131db735f7cc067de88fa14237c7462b247a # v1.27.0
+        uses: replicatedhq/replicated-actions/create-cluster@1abb33f5274580b14f49f2a12d819df7920e4d9b # v1.20.0
         with:
           api-token: ${{ secrets.REPLICATED_API_TOKEN }}
           kubernetes-distribution: "openshift"
@@ -240,7 +240,7 @@ jobs:
           kubectl delete ns flux-system --wait
       - name: Delete cluster
         if: ${{ always() }}
-        uses: replicatedhq/replicated-actions/remove-cluster@6803131db735f7cc067de88fa14237c7462b247a # v1.27.0
+        uses: replicatedhq/replicated-actions/remove-cluster@1abb33f5274580b14f49f2a12d819df7920e4d9b # v1.20.0
         continue-on-error: true
         with:
           api-token: ${{ secrets.REPLICATED_API_TOKEN }}

.github/workflows/e2e-azure.yaml

@@ -29,14 +29,14 @@ jobs:
     if: (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository) && github.actor != 'dependabot[bot]'
     steps:
       - name: CheckoutD
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
       - name: Setup Go
-        uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
+        uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6.3.0
         with:
           go-version: 1.26.x
           cache-dependency-path: tests/integration/go.sum
       - name: Setup Terraform
-        uses: hashicorp/setup-terraform@dfe3c3f87815947d99a8997f908cb6525fc44e9e # v4.0.1
+        uses: hashicorp/setup-terraform@5e8dbf3c6d9deaf4193ca7a8fb23f2ac83bb6c85 # v4.0.0
       - name: Setup Flux CLI
         run: make build
         working-directory: ./
@@ -48,7 +48,7 @@ jobs:
         env:
           SOPS_VER: 3.7.1
       - name: Authenticate to Azure
-        uses: Azure/login@532459ea530d8321f2fb9bb10d1e0bcf23869a43 # v1.4.6
+        uses: Azure/login@a457da9ea143d694b1b9c7c869ebb04ebe844ef5 # v1.4.6
         with:
           creds: '{"clientId":"${{ secrets.ARM_CLIENT_ID }}","clientSecret":"${{ secrets.ARM_CLIENT_SECRET }}","subscriptionId":"${{ secrets.ARM_SUBSCRIPTION_ID }}","tenantId":"${{ secrets.ARM_TENANT_ID }}"}'
       - name: Set dynamic variables in .env

.github/workflows/e2e-bootstrap.yaml

@@ -17,9 +17,9 @@ jobs:
     if: (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository) && github.actor != 'dependabot[bot]'
     steps:
       - name: Checkout
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
       - name: Setup Go
-        uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
+        uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6.3.0
         with:
           go-version: 1.26.x
           cache-dependency-path: |
@@ -28,16 +28,16 @@ jobs:
       - name: Setup Kubernetes
         uses: helm/kind-action@ef37e7f390d99f746eb8b610417061a60e82a6cc # v1.14.0
         with:
-          version: v0.32.0
+          version: v0.30.0
           cluster_name: kind
           # The versions below should target the newest Kubernetes version
           # Keep this up-to-date with https://endoflife.date/kubernetes
-          node_image: ghcr.io/fluxcd/kindest/node:v1.36.1-amd64
-          kubectl_version: v1.36.0
+          node_image: ghcr.io/fluxcd/kindest/node:v1.33.0-amd64
+          kubectl_version: v1.33.0
       - name: Setup Kustomize
-        uses: fluxcd/pkg/actions/kustomize@5a7f3ce0de742b6c561a50f90940d81cf6fc698d # main
+        uses: fluxcd/pkg/actions/kustomize@9a8c0edd5da84dc51a585738c67e3a3950d7fbf0 # main
       - name: Setup yq
-        uses: fluxcd/pkg/actions/yq@5a7f3ce0de742b6c561a50f90940d81cf6fc698d # main
+        uses: fluxcd/pkg/actions/yq@9a8c0edd5da84dc51a585738c67e3a3950d7fbf0 # main
       - name: Build
         run: make build-dev
       - name: Set outputs

.github/workflows/e2e-gcp.yaml

@@ -29,14 +29,14 @@ jobs:
     if: (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository) && github.actor != 'dependabot[bot]'
     steps:
       - name: Checkout
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
       - name: Setup Go
-        uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
+        uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6.3.0
         with:
           go-version: 1.26.x
           cache-dependency-path: tests/integration/go.sum
       - name: Setup Terraform
-        uses: hashicorp/setup-terraform@dfe3c3f87815947d99a8997f908cb6525fc44e9e # v4.0.1
+        uses: hashicorp/setup-terraform@5e8dbf3c6d9deaf4193ca7a8fb23f2ac83bb6c85 # v4.0.0
       - name: Setup Flux CLI
         run: make build
         working-directory: ./
@@ -56,11 +56,11 @@ jobs:
       - name: Setup gcloud
         uses: google-github-actions/setup-gcloud@aa5489c8933f4cc7a4f7d45035b3b1440c9c10db # v3.0.1
       - name: Setup QEMU
-        uses: docker/setup-qemu-action@06116385d9baf250c9f4dcb4858b16962ea869c3 # v4.1.0
+        uses: docker/setup-qemu-action@ce360397dd3f832beb865e1373c09c0e9f86d70a # v4.0.0
       - name: Setup Docker Buildx
-        uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4.1.0
+        uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0
       - name: Log into us-central1-docker.pkg.dev
-        uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4.2.0
+        uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0
         with:
           registry: us-central1-docker.pkg.dev
           username: oauth2accesstoken

.github/workflows/e2e.yaml

@@ -18,14 +18,14 @@ jobs:
       labels: ubuntu-latest-16-cores
     services:
       registry:
-        image: registry:3
+        image: registry:2
         ports:
           - 5000:5000
     steps:
       - name: Checkout
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
       - name: Setup Go
-        uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
+        uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6.3.0
         with:
           go-version: 1.26.x
           cache-dependency-path: |
@@ -34,19 +34,19 @@ jobs:
       - name: Setup Kubernetes
         uses: helm/kind-action@ef37e7f390d99f746eb8b610417061a60e82a6cc # v1.14.0
         with:
-          version: v0.32.0
+          version: v0.30.0
           cluster_name: kind
           wait: 5s
           config: .github/kind/config.yaml # disable KIND-net
           # The versions below should target the oldest supported Kubernetes version
           # Keep this up-to-date with https://endoflife.date/kubernetes
-          node_image: ghcr.io/fluxcd/kindest/node:v1.34.1-amd64
-          kubectl_version: v1.34.0
+          node_image: ghcr.io/fluxcd/kindest/node:v1.33.0-amd64
+          kubectl_version: v1.33.0
       - name: Setup Calico for network policy
         run: |
-          kubectl apply -f https://raw.githubusercontent.com/projectcalico/calico/v3.32.0/manifests/calico.yaml
+          kubectl apply -f https://raw.githubusercontent.com/projectcalico/calico/v3.27.3/manifests/calico.yaml
       - name: Setup Kustomize
-        uses: fluxcd/pkg/actions/kustomize@5a7f3ce0de742b6c561a50f90940d81cf6fc698d # main
+        uses: fluxcd/pkg/actions/kustomize@9a8c0edd5da84dc51a585738c67e3a3950d7fbf0 # main
       - name: Run tests
         run: make test
       - name: Run e2e tests

.github/workflows/ossf.yaml

@@ -19,7 +19,7 @@ jobs:
       actions: read
       contents: read
     steps:
-      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
       - name: Run analysis
         uses: ossf/scorecard-action@4eaacf0543bb3f2c246792bd56e8cdeffafb205a # v2.4.3
         with:
@@ -28,12 +28,12 @@ jobs:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           publish_results: true
       - name: Upload artifact
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
         with:
           name: SARIF file
           path: results.sarif
           retention-days: 5
       - name: Upload SARIF results
-        uses: github/codeql-action/upload-sarif@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4.36.2
+        uses: github/codeql-action/upload-sarif@0d579ffd059c29b07949a3cce3983f0780820c98 # v4.32.6
         with:
           sarif_file: results.sarif

.github/workflows/release.yaml

@@ -22,35 +22,35 @@ jobs:
       packages: write # needed for ghcr access
     steps:
       - name: Checkout
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
       - name: Unshallow
         run: git fetch --prune --unshallow
       - name: Setup Go
-        uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
+        uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6.3.0
         with:
           go-version: 1.26.x
           cache: false
       - name: Setup QEMU
-        uses: docker/setup-qemu-action@06116385d9baf250c9f4dcb4858b16962ea869c3 # v4.1.0
+        uses: docker/setup-qemu-action@ce360397dd3f832beb865e1373c09c0e9f86d70a # v4.0.0
       - name: Setup Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4.1.0
+        uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0
       - name: Setup Syft
-        uses: anchore/sbom-action/download-syft@e22c389904149dbc22b58101806040fa8d37a610 # v0.24.0
+        uses: anchore/sbom-action/download-syft@57aae528053a48a3f6235f2d9461b05fbcb7366d # v0.23.1
       - name: Setup Cosign
-        uses: sigstore/cosign-installer@6f9f17788090df1f26f669e9d70d6ae9567deba6 # v4.1.2
+        uses: sigstore/cosign-installer@ba7bc0a3fef59531c69a25acd34668d6d3fe6f22 # v4.1.0
         with:
           cosign-release: v2.6.1 # TODO: remove after Flux 2.8 with support for cosign v3
       - name: Setup Kustomize
-        uses: fluxcd/pkg/actions/kustomize@5a7f3ce0de742b6c561a50f90940d81cf6fc698d # main
+        uses: fluxcd/pkg/actions/kustomize@9a8c0edd5da84dc51a585738c67e3a3950d7fbf0 # main
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4.2.0
+        uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0
         with:
           registry: ghcr.io
           username: fluxcdbot
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Login to Docker Hub
-        uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4.2.0
+        uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0
         with:
           username: fluxcdbot
           password: ${{ secrets.DOCKER_FLUXCD_PASSWORD }}
@@ -63,7 +63,7 @@ jobs:
         run: |
           kustomize build manifests/crds > all-crds.yaml
       - name: Generate OpenAPI JSON schemas from CRDs
-        uses: fluxcd/pkg/actions/crdjsonschema@5a7f3ce0de742b6c561a50f90940d81cf6fc698d # main
+        uses: fluxcd/pkg/actions/crdjsonschema@9a8c0edd5da84dc51a585738c67e3a3950d7fbf0 # main
         with:
           crd: all-crds.yaml
           output: schemas
@@ -72,7 +72,7 @@ jobs:
           tar -czvf ./output/crd-schemas.tar.gz -C schemas .
       - name: Run GoReleaser
         id: run-goreleaser
-        uses: goreleaser/goreleaser-action@5daf1e915a5f0af01ddbcd89a43b8061ff4f1a89 # v7.2.2
+        uses: goreleaser/goreleaser-action@ec59f474b9834571250b370d4735c50f8e2d1e29 # v7.0.0
         with:
           version: latest
           args: release --skip=validate
@@ -103,9 +103,9 @@ jobs:
       id-token: write
       packages: write
     steps:
-      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
       - name: Setup Kustomize
-        uses: fluxcd/pkg/actions/kustomize@5a7f3ce0de742b6c561a50f90940d81cf6fc698d # main
+        uses: fluxcd/pkg/actions/kustomize@9a8c0edd5da84dc51a585738c67e3a3950d7fbf0 # main
       - name: Setup Flux CLI
         uses: ./action/
         with:
@@ -116,13 +116,13 @@ jobs:
           VERSION=$(flux version --client | awk '{ print $NF }')
           echo "version=${VERSION}" >> $GITHUB_OUTPUT
       - name: Login to GHCR
-        uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4.2.0
+        uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0
         with:
           registry: ghcr.io
           username: fluxcdbot
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Login to DockerHub
-        uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4.2.0
+        uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0
         with:
           username: fluxcdbot
           password: ${{ secrets.DOCKER_FLUXCD_PASSWORD }}
@@ -150,7 +150,7 @@ jobs:
           --path="./flux-system" \
           --source=${{ github.repositoryUrl }} \
           --revision="${{ github.ref_name }}@sha1:${{ github.sha }}"
-      - uses: sigstore/cosign-installer@6f9f17788090df1f26f669e9d70d6ae9567deba6 # v4.1.2
+      - uses: sigstore/cosign-installer@ba7bc0a3fef59531c69a25acd34668d6d3fe6f22 # v4.1.0
         with:
           cosign-release: v2.6.1 # TODO: remove after Flux 2.8 with support for cosign v3
       - name: Sign manifests

.github/workflows/scan.yaml

@@ -13,7 +13,7 @@ jobs:
     permissions:
       contents: read # for reading the repository code.
       security-events: write # for uploading the CodeQL analysis results.
-    uses: fluxcd/gha-workflows/.github/workflows/code-scan.yaml@v0.11.0
+    uses: fluxcd/gha-workflows/.github/workflows/code-scan.yaml@v0.9.0
     secrets:
       github-token: ${{ secrets.GITHUB_TOKEN }}
       fossa-token: ${{ secrets.FOSSA_TOKEN }}

.github/workflows/sync-labels.yaml

@@ -12,6 +12,6 @@ jobs:
     permissions:
       contents: read # for reading the labels file.
       issues: write # for creating and updating labels.
-    uses: fluxcd/gha-workflows/.github/workflows/labels-sync.yaml@v0.11.0
+    uses: fluxcd/gha-workflows/.github/workflows/labels-sync.yaml@v0.9.0
     secrets:
       github-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/update.yaml

@@ -16,9 +16,9 @@ jobs:
       pull-requests: write
     steps:
       - name: Check out code
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
       - name: Setup Go
-        uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
+        uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6.3.0
         with:
           go-version: 1.26.x
           cache-dependency-path: |
@@ -96,7 +96,7 @@ jobs:
 
       - name: Create Pull Request
         id: cpr
-        uses: peter-evans/create-pull-request@5f6978faf089d4d20b00c7766989d076bb2fc7f1 # v8.1.1
+        uses: peter-evans/create-pull-request@c0f553fe549906ede9cf27b5156039d195d2ece0 # v8.1.0
         with:
           token: ${{ secrets.BOT_GITHUB_TOKEN }}
           commit-message: |

.github/workflows/upgrade-fluxcd-pkg.yaml

@@ -3,11 +3,8 @@ name: upgrade-fluxcd-pkg
 on:
   workflow_dispatch:
 
-permissions:
-  contents: read
-
 jobs:
   upgrade-fluxcd-pkg:
-    uses: fluxcd/gha-workflows/.github/workflows/upgrade-fluxcd-pkg.yaml@v0.11.0
+    uses: fluxcd/gha-workflows/.github/workflows/upgrade-fluxcd-pkg.yaml@v0.9.0
     secrets:
       github-token: ${{ secrets.BOT_GITHUB_TOKEN }}

AGENTS.md

@@ -1,151 +0,0 @@
-# AGENTS.md
-
-Guidance for AI coding assistants working in `fluxcd/flux2`. Read this file before making changes.
-
-## Contribution workflow for AI agents
-
-These rules come from [`fluxcd/flux2/CONTRIBUTING.md`](https://github.com/fluxcd/flux2/blob/main/CONTRIBUTING.md) and apply to every Flux repository.
-
-- **Do not add `Signed-off-by` or `Co-authored-by` trailers with your agent name.** Only a human can legally certify the DCO.
-- **Disclose AI assistance** with an `Assisted-by` trailer naming your agent and model:
-  ```sh
-  git commit -s -m "Add support for X" --trailer "Assisted-by: <agent-name>/<model-id>"
-  ```
-  The `-s` flag adds the human's `Signed-off-by` from their git config — do not remove it.
-- **Commit message format:** Subject in imperative mood ("Add feature X" instead of "Adding feature X"), capitalized, no trailing period, ≤50 characters. Body wrapped at 72 columns, explaining what and why. No `@mentions` or `#123` issue references in the commit — put those in the PR description.
-- **Trim verbiage:** in PR descriptions, commit messages, and code comments. No marketing prose, no restating the diff, no emojis.
-- **Rebase, don't merge:** Never merge `main` into the feature branch; rebase onto the latest `main` and push with `--force-with-lease`. Squash before merge when asked.
-- **Pre-PR gate:** `make tidy fmt vet && make test` must pass and the working tree must be clean.
-- **Flux is GA:** Backward compatibility is mandatory. Breaking changes to CLI flags, output format, or behavior will be rejected. Design additive changes.
-- **Copyright:** All new `.go` files must begin with the header from `cmd/flux/main.go` (Apache 2.0). Update the year to the current year when copying.
-- **Tests:** New features, improvements and fixes must have test coverage. Add unit tests in `cmd/flux/*_test.go` tagged `//go:build unit`. Follow the existing `cmdTestCase` + golden file patterns. Run tests locally before pushing.
-
-## Code quality
-
-Before submitting code, review your changes for the following:
-
-- **No secrets in logs or output.** Never surface auth tokens, passwords, deploy keys, or credential URLs in error messages, log lines, or CLI output. Bootstrap and source-secret commands handle sensitive material — take extra care.
-- **No unchecked I/O.** Close HTTP response bodies, file handles, and tar readers in `defer` statements. Check and propagate errors from I/O operations.
-- **No path traversal.** Validate and sanitize file paths extracted from archives or user input. Never `filepath.Join` with untrusted components without validation.
-- **No command injection.** Do not shell out via `os/exec` for git, helm, or kustomize operations. Use the Go libraries already in use (`fluxcd/pkg/git`, `fluxcd/pkg/kustomize`, `fluxcd/pkg/ssa`).
-- **No hardcoded defaults for security settings.** TLS verification must remain enabled by default. Git auth settings come from user-provided secrets.
-- **Error handling.** Wrap errors with `%w` for chain inspection. Do not swallow errors silently. CLI errors must be actionable — tell the user what went wrong and how to fix it without leaking internal state.
-- **Resource cleanup.** Ensure temporary files and directories (manifest staging, downloaded tarballs) are cleaned up on all code paths (success and error). Use `defer` and `t.TempDir()` in tests.
-- **No panics.** Never use `panic` in runtime code paths. Return errors and let the CLI handle them gracefully.
-- **Output discipline.** Machine-readable data (tables, YAML, JSON) goes to stdout via `rootCmd.OutOrStdout()`. Human-readable status messages go to stderr via the `stderrLogger`.
-- **Minimal surface.** Keep new exported APIs in `pkg/` to the minimum needed. Every export is a backward-compatibility commitment.
-
-## Project overview
-
-flux2 is the Flux CLI (`flux` command) and distribution repository. It is **not** a controller — it consumes CRD APIs from six independent controller repos (source-controller, kustomize-controller, helm-controller, notification-controller, image-reflector-controller, image-automation-controller). It serves two purposes:
-
-1. **CLI tool** — a Cobra-based binary that installs Flux onto Kubernetes clusters, bootstraps GitOps pipelines, and manages all Flux CRD objects (create, get, export, reconcile, suspend, resume, delete, diff, build, etc.).
-2. **Distribution hub** — it bundles the Kustomize manifests for all Flux controllers and releases them as `manifests.tar.gz` on GitHub. Those manifests are also compiled into the binary itself via `//go:embed`.
-
-## Repository layout
-
-- `cmd/flux/` — all CLI source. Single `main` package with one file per command or resource type. `main.go` defines the root cobra command with global flags. `manifests.embed.go` embeds the generated controller manifests via `//go:embed`.
-- `internal/build/` — `flux build kustomization` logic (kustomize-based diff/build, SOPS secret masking).
-- `internal/flags/` — custom `pflag.Value` types providing enum validation (e.g. `LogLevel`, `ECDSACurve`, `RSAKeyBits`, `PublicKeyAlgorithm`, `DecryptionProvider`).
-- `internal/tree/` — tree-printing helper for `flux tree kustomization`.
-- `internal/utils/` — shared helpers: `KubeClient`, `KubeConfig`, `NewScheme` (registers all controller API groups), `Apply` (SSA-based two-phase apply), `ExecKubectlCommand`, `ValidateComponents`.
-- `pkg/bootstrap/` — bootstrap orchestration: `Run()`, `PlainGitBootstrapper`, `ProviderBootstrapper`. `provider/` has the git provider factory (GitHub, GitLab, Gitea, Bitbucket).
-- `pkg/log/` — `Logger` interface (`Actionf`, `Generatef`, `Waitingf`, `Successf`, `Warningf`, `Failuref`).
-- `pkg/manifestgen/` — manifest generation for install, sync, kustomization, and source secrets.
-- `pkg/printers/` — specialized printers `TablePrinter` and `DyffPrinter`.
-- `pkg/status/` — `StatusChecker` using `fluxcd/cli-utils` kstatus polling.
-- `pkg/uninstall/` — `flux uninstall` logic.
-- `manifests/` — Kustomize bases per controller, RBAC, network policies, CRD references, and `scripts/bundle.sh` which runs `kustomize build` to generate `cmd/flux/manifests/`.
-- `tests/integration/` — cloud e2e tests (Azure/GCP) with their own `go.mod` and Terraform infrastructure.
-- `rfcs/` — Request for Comments documents for major design proposals and changes.
-
-## CLI architecture
-
-Commands are Cobra-based, organized as parent + per-resource children:
-- Group files (`create.go`, `get.go`, `reconcile.go`, etc.) register the parent subcommand.
-- Per-resource files (`create_kustomization.go`, `get_helmrelease.go`, etc.) register children.
-
-Core interfaces in `cmd/flux/` enable generic command implementations:
-- `adapter` / `copyable` / `listAdapter` — wrap controller API types for generic CRUD.
-- `reconcilable` — annotate-and-poll pattern for triggering reconciliation.
-- `summarisable` — generic table output for `get` commands.
-
-Each resource type (e.g. `kustomizationAdapter` in `kustomization.go`) wraps the controller API type and implements these interfaces. Follow this pattern when adding new resource support.
-
-Commands interact with the Kubernetes API via `internal/utils.KubeClient()` → `client.WithWatch`. `internal/utils.NewScheme()` registers all six controller API groups plus core k8s types. `internal/utils.Apply()` implements SSA-based two-phase apply (CRDs/Namespaces first, then remaining objects).
-
-## Manifest pipeline
-
-1. `manifests/bases/<controller>/` contains a Kustomize base per controller referencing the controller's GitHub release for CRDs and deployment manifests.
-2. `manifests/install/kustomization.yaml` assembles all bases plus RBAC and policies.
-3. `manifests/scripts/bundle.sh` runs `kustomize build` on each base, writing output to `cmd/flux/manifests/` (not checked in — generated).
-4. The Makefile `$(EMBEDDED_MANIFESTS_TARGET)` runs `bundle.sh` and creates a sentinel file `cmd/flux/.manifests.done`.
-5. `cmd/flux/manifests.embed.go` uses `//go:embed manifests/*.yaml` to compile everything into the binary.
-
-When modifying `manifests/`, always run `make build` and verify the generated output before committing. Never hand-edit files under `cmd/flux/manifests/`.
-
-## Build, test, lint
-
-All targets in the root `Makefile`. Go version tracks `go.mod`.
-
-- `make tidy` — tidy the root module and `tests/integration/`.
-- `make fmt` / `make vet` — run in the root module.
-- `make build` — builds `bin/flux` (CGO disabled, version injected via ldflags). Depends on embedded manifests being generated.
-- `make build-dev` — builds with `DEV_VERSION`.
-- `make install` / `make install-dev` — `go install` or copy to `/usr/local/bin`.
-- `make test` — unit tests with envtest: runs `tidy fmt vet install-envtest`, then `go test ./... -coverprofile cover.out --tags=unit $(TEST_ARGS)`.
-- `make e2e` — e2e tests against a live cluster: `go test ./cmd/flux/... --tags=e2e -v -failfast`.
-- `make test-with-kind` — sets up a kind cluster, runs e2e, tears it down.
-- `make install-envtest` — downloads `setup-envtest` and fetches k8s binaries into `testbin/`.
-
-Run a single test: `make test TEST_ARGS='-run TestCreate -v'`.
-
-## Codegen and generated files
-
-Check `go.mod` and the `Makefile` for current dependency and tool versions. The main codegen pipeline is the manifest bundle:
-
-```sh
-./manifests/scripts/bundle.sh
-```
-
-Generated files (never hand-edit):
-
-- `cmd/flux/manifests/*.yaml` — generated by `bundle.sh` from `manifests/` sources.
-- `cmd/flux/.manifests.done` — sentinel file tracking bundle state.
-
-Bump `fluxcd/pkg/*` and controller `api` modules as a set. Run `make tidy` after any bump.
-
-## Conventions
-
-- Standard `gofmt`. All exported names need doc comments.
-- **Command pattern:** follow the existing group-parent + per-resource-child cobra structure. New resources need an adapter type implementing `adapter`, `copyable`, and the relevant command interfaces (`reconcilable`, `summarisable`, etc.).
-- **Output:** stderr for human status messages via `stderrLogger` (Unicode symbols: `►` action, `✔` success, `✗` failure, `◎` waiting, `⚠️` warning, `✚` generate). Stdout for machine-readable data (tables, YAML, JSON) via `rootCmd.OutOrStdout()`.
-- **Global flags:** kubeconfig flags come from `k8s.io/cli-runtime/pkg/genericclioptions.ConfigFlags`. Client tuning comes from `fluxcd/pkg/runtime/client.Options`. `FLUX_SYSTEM_NAMESPACE` env var overrides the default namespace.
-- **SSA apply:** always use `internal/utils.Apply()` (two-phase: CRDs/Namespaces first, then rest). Do not apply manifests directly via the k8s client.
-- **Reconcile triggering:** patch `meta.ReconcileRequestAnnotation` with a timestamp, then poll with `kstatus.Compute()` until ready. See `reconcile.go`.
-- **Error handling:** return errors from `RunE`. Use `*RequestError` with exit codes for actionable CLI errors. Exit code 1 = warning, anything else = failure.
-- **Flags:** use `internal/flags/` custom `pflag.Value` types for enum flags (providers, algorithms, sources). Add new enum types there.
-
-## Testing
-
-Three test suites with build tags:
-
-- **Unit** (`//go:build unit`): lives in `cmd/flux/*_test.go`. Uses `controller-runtime/envtest` for an in-process fake k8s API. CRDs are loaded from `cmd/flux/manifests/` (embedded manifests). Pattern: `cmdTestCase{args: "...", assert: assertGoldenFile("testdata/...")}`. The `executeCommand()` helper captures stdout.
-- **E2e** (`//go:build e2e`): lives in `cmd/flux/*_test.go`. Requires a live cluster via `TEST_KUBECONFIG`. `TestMain` runs `flux install` for setup and teardown.
-- **Integration** (`//go:build integration`): lives in `tests/integration/` with its own `go.mod`. Uses Terraform-provisioned cloud clusters.
-
-Golden files live in `cmd/flux/testdata/`. Update them with `go test ./cmd/flux/... --tags=unit -update`.
-
-Run a single unit test: `make test TEST_ARGS='-run TestInstall -v'`.
-
-## Gotchas and non-obvious rules
-
-- The `cmd/flux/manifests/` directory is **generated, not checked in**. It is created by `manifests/scripts/bundle.sh` and embedded into the binary. `make build` and `make test` both trigger the bundle if the sentinel file is stale.
-- `kustomize` must be on `PATH` for `bundle.sh` to work. If you see "command not found" errors during build, install kustomize.
-- `internal/utils.NewScheme()` registers all six controller API groups. Adding support for a new CRD type means updating the scheme registration there.
-- The `VERSION` constant is injected via `-ldflags` at build time. In dev builds it defaults to `0.0.0-dev.0`. The embedded manifest version check (`isEmbeddedVersion`) determines whether `flux install` uses compiled-in manifests or downloads from GitHub.
-- `resetCmdArgs()` in tests is critical — Cobra persists flag state between test runs. Every test case must reset to avoid pollution.
-- `executeCommand()` captures stdout only. Stderr output (from `stderrLogger`) is not captured in test assertions. If your command's output goes to the wrong stream, tests will silently pass with empty golden files.
-- The `adapter` / `listAdapter` interfaces use type assertions internally. If you add a new resource type and forget to implement an interface method, you'll get a runtime panic in the generic command handler, not a compile error. Add interface compliance checks (`var _ reconcilable = ...`).
-- Bootstrap commands create real Git commits and push to real repos. E2e tests for bootstrap need careful cleanup. Do not add bootstrap e2e tests without a corresponding teardown.
-- `pkg/` packages are importable by external consumers (e.g. Terraform provider, other tools). Treat their exported surface as public API.

CONTRIBUTING.md

@@ -1,129 +1,154 @@
 # Contributing
 
-Flux is [Apache 2.0 licensed](https://github.com/fluxcd/flux2/blob/main/LICENSE) and accepts contributions via GitHub pull requests.
-This document outlines the conventions to get your contribution accepted.
-We gratefully welcome improvements to documentation as well as code contributions.
+Flux is [Apache 2.0 licensed](https://github.com/fluxcd/flux2/blob/main/LICENSE) and
+accepts contributions via GitHub pull requests. This document outlines
+some of the conventions on to make it easier to get your contribution
+accepted.
 
-If you are new to the project, we recommend starting with documentation improvements or
-small bug fixes to get familiar with the codebase and the contribution process.
-
-## Project Structure
-
-The Flux project consists of a set of Kubernetes controllers and tools that implement the GitOps pattern.
-The main repositories in the Flux project are:
-
-- [fluxcd/flux2](https://github.com/fluxcd/flux2): The Flux distribution and command-line interface (CLI)
-- [fluxcd/pkg](https://github.com/fluxcd/pkg): The GitOps Toolkit Go SDK for building Flux controllers and CLI plugins
-- [fluxcd/source-controller](https://github.com/fluxcd/source-controller): Kubernetes operator for managing sources (Git, OCI and Helm repositories, S3-compatible Buckets)
-- [fluxcd/source-watcher](https://github.com/fluxcd/source-watcher): Kubernetes operator for advanced source composition and decomposition patterns
-- [fluxcd/kustomize-controller](https://github.com/fluxcd/kustomize-controller): Kubernetes operator for building GitOps pipelines with Kustomize
-- [fluxcd/helm-controller](https://github.com/fluxcd/helm-controller): Kubernetes operator for lifecycle management of Helm releases
-- [fluxcd/notification-controller](https://github.com/fluxcd/notification-controller): Kubernetes operator for handling inbound and outbound events (alerts and webhook receivers)
-- [fluxcd/image-reflector-controller](https://github.com/fluxcd/image-reflector-controller): Kubernetes operator for scanning container registries for new image tags and digests
-- [fluxcd/image-automation-controller](https://github.com/fluxcd/image-automation-controller): Kubernetes operator for patching container image tags and digests in Git repositories
-- [fluxcd/website](https://github.com/fluxcd/website): The Flux documentation website accessible at <https://fluxcd.io/>
-
-## AI Coding Assistants Guidance
-
-Using AI Agents to help write your PR is acceptable, but as the author, you are responsible
-for understanding the code and the documentation you submit. Please review all the AI-generated
-content and make sure it follows the guidelines in this document before submitting your PR.
-
-All Flux repositories contain an `AGENTS.md` file. You must point your AI Agent to
-`AGENTS.md` and ask it to follow the guidelines and conventions described there.
-
-Trim down the verbiage in the PR description, commit messages and code comments.
-When engaging with Flux maintainers please refrain from using AI Agents to
-generate responses, we want to talk to you, not to your AI Agent.
-
-AI Agents **must not** add `Signed-off-by` or `Co-authored-by` tags to the commit message.
-Only humans can legally certify the Developer Certificate of Origin ([DCO](https://developercertificate.org/)).
-
-You should disclose the use of AI Agents in the description of your PR and
-in the commit message using the `Assisted-by: AGENT_NAME/LLM_VERSION` tag.
-
-Adding the `Assisted-by` tag to the commit message can be done with:
-
-```sh
-git commit -s -m "Your commit message" --trailer "Assisted-by: <agent>/<model>"
-```
-
-**Note** that the `Signed-off-by` tag is set via the `-s` flag using your real name and email
-(`user.name` and `user.email` must be set in Git config).
-
-Example of a commit message disclosing the use of AI assistance:
-
-```text
-Add version info to plugin listing
-
-Add a version column to the `flux plugin list` table output and populate
-it with the semantic version info extracted from the plugin's recipe file.
-For plugins installed via symlinks, the version is set to `unknown`.
-
-Signed-off-by: Jane Doe <jane.doe@example.com>
-Assisted-by: copilot/gpt-5.4
-```
+We gratefully welcome improvements to issues and documentation as well as to
+code.
 
 ## Certificate of Origin
 
-By contributing to this project you agree to the Developer Certificate of Origin (DCO).
-This document was created by the Linux Kernel community and is a simple statement that you,
-as a contributor, have the legal right to make the contribution.
+By contributing to this project you agree to the Developer Certificate of
+Origin (DCO). This document was created by the Linux Kernel community and is a
+simple statement that you, as a contributor, have the legal right to make the
+contribution.
 
-We require all commits to be signed. By signing off with your signature, you certify that you wrote
-the patch or otherwise have the right to contribute the material by the rules of the [DCO](https://raw.githubusercontent.com/fluxcd/flux2/refs/heads/main/DCO):
+We require all commits to be signed. By signing off with your signature, you
+certify that you wrote the patch or otherwise have the right to contribute the
+material by the rules of the [DCO](DCO):
 
 `Signed-off-by: Jane Doe <jane.doe@example.com>`
 
-The signature must contain your real name (sorry, no pseudonyms or anonymous contributions).
-If your `user.name` and `user.email` are set in your Git config,
+The signature must contain your real name
+(sorry, no pseudonyms or anonymous contributions)
+If your `user.name` and `user.email` are configured in your Git config,
 you can sign your commit automatically with `git commit -s`.
 
+## Communications
+
+For realtime communications we use Slack: To join the conversation, simply
+join the [CNCF](https://slack.cncf.io/) Slack workspace and use the
+[#flux-contributors](https://cloud-native.slack.com/messages/flux-contributors/) channel.
+
+To discuss ideas and specifications we use [Github
+Discussions](https://github.com/fluxcd/flux2/discussions).
+
+For announcements we use a mailing list as well. Simply subscribe to
+[flux-dev on cncf.io](https://lists.cncf.io/g/cncf-flux-dev)
+to join the conversation (there you can also add calendar invites
+to your Google calendar for our [Flux
+meeting](https://docs.google.com/document/d/1l_M0om0qUEN_NNiGgpqJ2tvsF2iioHkaARDeh6b70B0/view)).
+
+## Understanding Flux and the GitOps Toolkit
+
+If you are entirely new to Flux and the GitOps Toolkit,
+you might want to take a look at the [introductory talk and demo](https://www.youtube.com/watch?v=qQBtSkgl7tI).
+
+This project is composed of:
+
+- [flux2](https://github.com/fluxcd/flux2): The Flux CLI
+- [source-controller](https://github.com/fluxcd/source-controller): Kubernetes operator for managing sources (Git, OCI and Helm repositories, S3-compatible Buckets)
+- [source-watcher](https://github.com/fluxcd/source-watcher): Kubernetes operator for advanced source composition and decomposition patterns
+- [kustomize-controller](https://github.com/fluxcd/kustomize-controller): Kubernetes operator for building GitOps pipelines with Kustomize
+- [helm-controller](https://github.com/fluxcd/helm-controller): Kubernetes operator for building GitOps pipelines with Helm
+- [notification-controller](https://github.com/fluxcd/notification-controller): Kubernetes operator for handling inbound and outbound events
+- [image-reflector-controller](https://github.com/fluxcd/image-reflector-controller): Kubernetes operator for scanning container registries
+- [image-automation-controller](https://github.com/fluxcd/image-automation-controller): Kubernetes operator for patches container image tags in Git
+
+### Understanding the code
+
+To get started with developing controllers, you might want to review
+[our guide](https://fluxcd.io/flux/gitops-toolkit/source-watcher/) which
+walks you through writing a short and concise controller that watches out
+for source changes.
+
+## How to run the test suite
+
+Prerequisites:
+
+* go >= 1.26
+* kubectl >= 1.33
+* kustomize >= 5.0
+
+Install the [controller-runtime/envtest](https://github.com/kubernetes-sigs/controller-runtime/tree/master/tools/setup-envtest) binaries with:
+
+```bash
+make install-envtest
+```
+
+Then you can run the unit tests with:
+
+```bash
+make test
+```
+
+After [installing Kubernetes kind](https://kind.sigs.k8s.io/docs/user/quick-start#installation) on your machine,
+create a cluster for testing with:
+
+```bash
+make setup-kind
+```
+
+Then you can run the end-to-end tests with:
+
+```bash
+make e2e
+```
+
+When the output of the Flux CLI changes, to automatically update the golden
+files used in the test, pass `-update` flag to the test as:
+
+```bash
+make e2e TEST_ARGS="-update"
+```
+
+Since not all packages use golden files for testing, `-update` argument must be
+passed only for the packages that use golden files. Use the variables
+`TEST_PKG_PATH` for unit tests and `E2E_TEST_PKG_PATH` for e2e tests, to set the
+path of the target test package:
+
+```bash
+# Unit test
+make test TEST_PKG_PATH="./cmd/flux" TEST_ARGS="-update"
+# e2e test
+make e2e E2E_TEST_PKG_PATH="./cmd/flux" TEST_ARGS="-update"
+```
+
+Teardown the e2e environment with:
+
+```bash
+make cleanup-kind
+```
+
 ## Acceptance policy
 
 These things will make a PR more likely to be accepted:
 
-- Addressing an open issue, if one doesn't exist, please open an issue to discuss the problem and the proposed solution before submitting a PR.
-- Flux is GA software and we are committed to maintaining backward compatibility. If your contribution introduces a breaking change, expect for your PR to be rejected.
-- New code and tests must follow the conventions in the existing code and tests. All new code must have good test coverage and be well documented.
-- All top-level Go code and exported names should have doc comments, as should non-trivial unexported type or function declarations.
-- Before submitting a PR, make sure that your code is properly formatted by running `make tidy fmt vet` and that all tests are passing by running `make test`.
+- a well-described requirement
+- tests for new code
+- tests for old code!
+- new code and tests follow the conventions in old code and tests
+- a good commit message (see below)
+- all code must abide [Go Code Review Comments](https://github.com/golang/go/wiki/CodeReviewComments)
+- names should abide [What's in a name](https://talks.golang.org/2014/names.slide#1)
+- code must build on both Linux and Darwin, via plain `go build`
+- code should have appropriate test coverage and tests should be written
+  to work with `go test`
 
 In general, we will merge a PR once one maintainer has endorsed it.
 For substantial changes, more people may become involved, and you might
 get asked to resubmit the PR or divide the changes into more than one PR.
 
-## Format of the Commit Message
+### Format of the Commit Message
 
-For the Flux project we prefer the following rules:
+For the GitOps Toolkit controllers we prefer the following rules for good commit messages:
 
-- Limit the subject to 50 characters, start with a capital letter and do not end with a period.
-- Explain what and why in the body, if more than a trivial change; wrap it at 72 characters.
-- Use the imperative mood in the subject line (e.g., "Add support for X" instead of "Added support for X" or "Adds support for X").
-- Do not include GitHub mentions to issues in the commit message, use the PR description instead (e.g., "Fixes #123" or "Closes #123").
-- Do not include GitHub mentions to accounts (e.g., `@username` or `@team`) within the commit message.
+- Limit the subject to 50 characters and write as the continuation
+  of the sentence "If applied, this commit will ..."
+- Explain what and why in the body, if more than a trivial change;
+  wrap it at 72 characters.
 
-## Pull Request Process
-
-Fork the repository and create a new branch for your changes, do not commit directly to the `main` branch.
-Once you have made your changes and committed them, push your branch to your fork and open a pull request
-against the `main` branch of the Flux repository.
-
-During the review process, you may be asked to make changes to your PR. Add commits to address the feedback
-without force pushing, as this will make it easier for reviewers to see the changes.
-Before committing, make sure to run `make test` to ensure that your code will pass the CI checks.
-
-When the review process is complete, you will be asked to **squash** the commits and **rebase** your branch.
-**Do not merge** the `main` branch into your branch, instead, rebase your branch on top of the latest `main`
-branch after **syncing your fork** with the latest changes from the Flux repository. After rebasing,
-you can push your branch with the `--force-with-lease` option to update the PR.
-
-## Communications
-
-For realtime communications we use Slack. To reach out to the Flux maintainers and contributors,
-join the [CNCF](https://slack.cncf.io/) Slack workspace and use the [#flux-contributors](https://cloud-native.slack.com/messages/flux-contributors/) channel.
-To discuss ideas and specifications we use [GitHub Discussions](https://github.com/fluxcd/flux2/discussions).
-
-For announcements, we use a mailing list as well. Subscribe to
-[flux-dev on cncf.io](https://lists.cncf.io/g/cncf-flux-dev), there you can also add calendar invites
-to your Google calendar for our [Flux dev meeting](https://docs.google.com/document/d/1l_M0om0qUEN_NNiGgpqJ2tvsF2iioHkaARDeh6b70B0/view).
+The [following article](https://chris.beams.io/posts/git-commit/#seven-rules)
+has some more helpful advice on documenting your work.

Dockerfile

@@ -3,7 +3,7 @@ FROM alpine:3.23 AS builder
 RUN apk add --no-cache ca-certificates curl
 
 ARG ARCH=linux/amd64
-ARG KUBECTL_VER=1.36.1
+ARG KUBECTL_VER=1.35.0
 
 RUN curl -sL https://dl.k8s.io/release/v${KUBECTL_VER}/bin/${ARCH}/kubectl \
     -o /usr/local/bin/kubectl && chmod +x /usr/local/bin/kubectl

Makefile

@@ -2,9 +2,8 @@ VERSION?=$(shell grep 'VERSION' cmd/flux/main.go | awk '{ print $$4 }' | head -n
 DEV_VERSION?=0.0.0-$(shell git rev-parse --abbrev-ref HEAD)-$(shell git rev-parse --short HEAD)-$(shell date +%s)
 EMBEDDED_MANIFESTS_TARGET=cmd/flux/.manifests.done
 TEST_KUBECONFIG?=/tmp/flux-e2e-test-kubeconfig
-# Architecture to use envtest with; defaults to the host architecture.
-LOCALARCH ?= $(shell go env GOARCH)
-ENVTEST_ARCH ?= $(LOCALARCH)
+# Architecture to use envtest with
+ENVTEST_ARCH ?= amd64
 
 # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
 ifeq (,$(shell go env GOBIN))

cmd/flux/bootstrap.go

@@ -20,11 +20,9 @@ import (
 	"context"
 	"crypto/elliptic"
 	"fmt"
-	"os"
 	"strings"
 
 	"github.com/fluxcd/pkg/git"
-	"github.com/fluxcd/pkg/git/signature"
 	"github.com/manifoldco/promptui"
 	"github.com/spf13/cobra"
 	"k8s.io/apimachinery/pkg/api/errors"
@@ -32,7 +30,6 @@ import (
 
 	"github.com/fluxcd/flux2/v2/internal/flags"
 	"github.com/fluxcd/flux2/v2/internal/utils"
-	"github.com/fluxcd/flux2/v2/pkg/bootstrap"
 	"github.com/fluxcd/flux2/v2/pkg/manifestgen"
 	"github.com/fluxcd/flux2/v2/pkg/manifestgen/sourcesecret"
 )
@@ -50,7 +47,6 @@ type bootstrapFlags struct {
 
 	branch            string
 	recurseSubmodules bool
-	sparseCheckout    []string
 	manifestsPath     string
 
 	defaultComponents  []string
@@ -83,11 +79,6 @@ type bootstrapFlags struct {
 	gpgPassphrase  string
 	gpgKeyID       string
 
-	sshSigningKeyFile         string
-	sshSigningPassword        string
-	sshSigningPassphrase      string
-	sshSigningReusePrivateKey bool
-
 	force bool
 
 	commitMessageAppendix string
@@ -118,8 +109,6 @@ func init() {
 	bootstrapCmd.PersistentFlags().StringVar(&bootstrapArgs.branch, "branch", bootstrapDefaultBranch, "Git branch")
 	bootstrapCmd.PersistentFlags().BoolVar(&bootstrapArgs.recurseSubmodules, "recurse-submodules", false,
 		"when enabled, configures the GitRepository source to initialize and include Git submodules in the artifact it produces")
-	bootstrapCmd.PersistentFlags().StringSliceVar(&bootstrapArgs.sparseCheckout, "sparse-checkout", nil,
-		"list of directories to be included in the GitRepository sparse checkout, the configured --path must be one of them, accepts comma-separated values")
 
 	bootstrapCmd.PersistentFlags().StringVar(&bootstrapArgs.manifestsPath, "manifests", "", "path to the manifest directory")
 
@@ -150,12 +139,6 @@ func init() {
 	bootstrapCmd.PersistentFlags().StringVar(&bootstrapArgs.gpgPassphrase, "gpg-passphrase", "", "passphrase for decrypting GPG private key")
 	bootstrapCmd.PersistentFlags().StringVar(&bootstrapArgs.gpgKeyID, "gpg-key-id", "", "key id for selecting a particular key")
 
-	bootstrapCmd.PersistentFlags().StringVar(&bootstrapArgs.sshSigningKeyFile, "ssh-signing-key-file", "", "path to an SSH private key file used for signing commits")
-	bootstrapCmd.PersistentFlags().StringVar(&bootstrapArgs.sshSigningPassword, "ssh-signing-password", "", "passphrase for decrypting SSH signing key")
-	bootstrapCmd.PersistentFlags().StringVar(&bootstrapArgs.sshSigningPassphrase, "ssh-signing-passphrase", "", "alias for --ssh-signing-password")
-	bootstrapCmd.PersistentFlags().MarkHidden("ssh-signing-passphrase")
-	bootstrapCmd.PersistentFlags().BoolVar(&bootstrapArgs.sshSigningReusePrivateKey, "ssh-signing-reuse-private-key", false, "use the SSH transport key (--private-key-file) to sign commits")
-
 	bootstrapCmd.PersistentFlags().StringVar(&bootstrapArgs.commitMessageAppendix, "commit-message-appendix", "", "string to add to the commit messages, e.g. '[ci skip]'")
 
 	bootstrapCmd.PersistentFlags().BoolVar(&bootstrapArgs.force, "force", false, "override existing Flux installation if it's managed by a different tool such as Helm")
@@ -212,31 +195,6 @@ func bootstrapValidate() error {
 		return fmt.Errorf("invalid --registry-creds format, expected 'user:password'")
 	}
 
-	sshSigningSet := bootstrapArgs.sshSigningKeyFile != "" || bootstrapArgs.sshSigningReusePrivateKey
-	if bootstrapArgs.gpgKeyRingPath != "" && sshSigningSet {
-		return fmt.Errorf("--gpg-* and --ssh-signing-* are mutually exclusive; pick one signing format")
-	}
-
-	if bootstrapArgs.sshSigningKeyFile != "" && bootstrapArgs.sshSigningReusePrivateKey {
-		return fmt.Errorf("--ssh-signing-key-file and --ssh-signing-reuse-private-key are mutually exclusive")
-	}
-
-	if bootstrapArgs.sshSigningReusePrivateKey && bootstrapArgs.privateKeyFile == "" {
-		return fmt.Errorf("--ssh-signing-reuse-private-key requires --private-key-file")
-	}
-
-	sshSigningPwd, err := effectiveSshSigningPassword()
-	if err != nil {
-		return err
-	}
-	if sshSigningPwd != "" && bootstrapArgs.sshSigningKeyFile == "" {
-		return fmt.Errorf("--ssh-signing-password requires --ssh-signing-key-file")
-	}
-
-	if err := preflightSigningKey(); err != nil {
-		return err
-	}
-
 	if len(bootstrapArgs.sshHostKeyAlgorithms) > 0 {
 		git.HostKeyAlgos = bootstrapArgs.sshHostKeyAlgorithms
 	}
@@ -256,57 +214,6 @@ func mapTeamSlice(s []string, defaultPermission string) map[string]string {
 	return m
 }
 
-// preflightSigningKey reads and parses the configured signing key so
-// malformed PEM, wrong passphrases, and unsupported SSH algorithms
-// surface before any clone runs.
-func preflightSigningKey() error {
-	switch {
-	case bootstrapArgs.gpgKeyRingPath != "":
-		ring, err := bootstrap.LoadEntityListFromPath(bootstrapArgs.gpgKeyRingPath)
-		if err != nil {
-			return fmt.Errorf("invalid GPG signing key: %w", err)
-		}
-		if _, err := bootstrap.SelectOpenPGPSigningEntity(ring, bootstrapArgs.gpgPassphrase, bootstrapArgs.gpgKeyID); err != nil {
-			return fmt.Errorf("invalid GPG signing key: %w", err)
-		}
-	case bootstrapArgs.sshSigningKeyFile != "":
-		pemBytes, err := os.ReadFile(bootstrapArgs.sshSigningKeyFile)
-		if err != nil {
-			return fmt.Errorf("failed to read SSH signing key file: %w", err)
-		}
-		pwd, err := effectiveSshSigningPassword()
-		if err != nil {
-			return err
-		}
-		if _, err := signature.NewSSHSigner(pemBytes, []byte(pwd)); err != nil {
-			return fmt.Errorf("invalid SSH signing key: %w", err)
-		}
-	}
-	return nil
-}
-
-// effectiveSshSigningPassword resolves the SSH signing-key passphrase
-// from --ssh-signing-password and its hidden alias
-// --ssh-signing-passphrase. When both are set with the same value, the
-// value is returned. When both are set with different non-empty values,
-// an error is returned. When neither is set, an empty string is
-// returned with no error.
-func effectiveSshSigningPassword() (string, error) {
-	pw := bootstrapArgs.sshSigningPassword
-	alias := bootstrapArgs.sshSigningPassphrase
-	switch {
-	case pw != "" && alias != "":
-		if pw != alias {
-			return "", fmt.Errorf("--ssh-signing-password and --ssh-signing-passphrase are aliases; do not pass both")
-		}
-		return pw, nil
-	case pw == "" && alias != "":
-		return alias, nil
-	default:
-		return pw, nil
-	}
-}
-
 // confirmBootstrap gets a confirmation for running bootstrap over an existing Flux installation.
 // It returns a nil error if Flux is not installed or the user confirms overriding an existing installation
 func confirmBootstrap(ctx context.Context, kubeClient client.Client) error {

cmd/flux/bootstrap_bitbucket_server.go

@@ -24,7 +24,6 @@ import (
 
 	"github.com/fluxcd/pkg/git"
 	"github.com/fluxcd/pkg/git/gogit"
-	"github.com/fluxcd/pkg/git/signature"
 	"github.com/spf13/cobra"
 
 	"github.com/fluxcd/flux2/v2/internal/flags"
@@ -254,7 +253,6 @@ func bootstrapBServerCmdRun(cmd *cobra.Command, args []string) error {
 		TargetPath:        bServerArgs.path.ToSlash(),
 		ManifestFile:      sync.MakeDefaultOptions().ManifestFile,
 		RecurseSubmodules: bootstrapArgs.recurseSubmodules,
-		SparseCheckout:    bootstrapArgs.sparseCheckout,
 	}
 
 	entityList, err := bootstrap.LoadEntityListFromPath(bootstrapArgs.gpgKeyRingPath)
@@ -289,31 +287,6 @@ func bootstrapBServerCmdRun(cmd *cobra.Command, args []string) error {
 		bootstrapOpts = append(bootstrapOpts, bootstrap.WithReconcile())
 	}
 
-	if bootstrapArgs.sshSigningKeyFile != "" {
-		pemBytes, err := os.ReadFile(bootstrapArgs.sshSigningKeyFile)
-		if err != nil {
-			return fmt.Errorf("failed to read SSH signing key file: %w", err)
-		}
-		pwd, err := effectiveSshSigningPassword()
-		if err != nil {
-			return err
-		}
-		bootstrapOpts = append(bootstrapOpts,
-			bootstrap.WithSSHCommitSigning(pemBytes, []byte(pwd)))
-	}
-
-	if bootstrapArgs.sshSigningReusePrivateKey {
-		pemBytes, err := os.ReadFile(bootstrapArgs.privateKeyFile)
-		if err != nil {
-			return fmt.Errorf("failed to read transport private key for signing: %w", err)
-		}
-		if _, err := signature.NewSSHSigner(pemBytes, []byte(gitArgs.password)); err != nil {
-			return fmt.Errorf("invalid signing key (reused from --private-key-file): %w", err)
-		}
-		bootstrapOpts = append(bootstrapOpts,
-			bootstrap.WithSSHCommitSigning(pemBytes, []byte(gitArgs.password)))
-	}
-
 	// Setup bootstrapper with constructed configs
 	b, err := bootstrap.NewGitProviderBootstrapper(gitClient, providerClient, kubeClient, bootstrapOpts...)
 	if err != nil {

cmd/flux/bootstrap_git.go

@@ -28,12 +28,8 @@ import (
 	"github.com/spf13/cobra"
 	corev1 "k8s.io/api/core/v1"
 
-	"github.com/fluxcd/pkg/auth"
-	"github.com/fluxcd/pkg/auth/aws"
-	authutils "github.com/fluxcd/pkg/auth/utils"
 	"github.com/fluxcd/pkg/git"
 	"github.com/fluxcd/pkg/git/gogit"
-	"github.com/fluxcd/pkg/git/signature"
 
 	"github.com/fluxcd/flux2/v2/internal/flags"
 	"github.com/fluxcd/flux2/v2/internal/utils"
@@ -66,12 +62,9 @@ command will perform an upgrade if needed.`,
   # Run bootstrap for a Git repository with a private key and password
   flux bootstrap git --url=ssh://git@example.com/repository.git --private-key-file=<path/to/private.key> --password=<password> --path=clusters/my-cluster
 
-  # Run bootstrap for a Git repository on AWS CodeCommit using SSH
+  # Run bootstrap for a Git repository on AWS CodeCommit
   flux bootstrap git --url=ssh://<SSH-Key-ID>@git-codecommit.<region>.amazonaws.com/v1/repos/<repository> --private-key-file=<path/to/private.key> --password=<SSH-passphrase> --path=clusters/my-cluster
 
-  # Run bootstrap for a Git repository on AWS CodeCommit using HTTPS (requires AWS IAM credentials)
-  flux bootstrap git --url=https://git-codecommit.<region>.amazonaws.com/v1/repos/<repository> --path=clusters/my-cluster
-
   # Run bootstrap for a Git repository on Azure Devops
   flux bootstrap git --url=ssh://git@ssh.dev.azure.com/v3/<org>/<project>/<repository> --private-key-file=<path/to/rsa-sha2-private.key> --ssh-hostkey-algos=rsa-sha2-512,rsa-sha2-256 --path=clusters/my-cluster
 
@@ -116,7 +109,6 @@ func bootstrapGitCmdRun(cmd *cobra.Command, args []string) error {
 		bootstrapArgs.tokenAuth = true
 	}
 
-	var gitProvider string
 	gitPassword := os.Getenv(gitPasswordEnvVar)
 	if gitPassword != "" && gitArgs.password == "" {
 		gitArgs.password = gitPassword
@@ -139,12 +131,8 @@ func bootstrapGitCmdRun(cmd *cobra.Command, args []string) error {
 		return err
 	}
 
-	ctx, cancel := context.WithTimeout(context.Background(), rootArgs.timeout)
-	defer cancel()
-
 	if strings.Contains(repositoryURL.Hostname(), "git-codecommit") && strings.Contains(repositoryURL.Hostname(), "amazonaws.com") {
-		// https://docs.aws.amazon.com/codecommit/latest/userguide/auth-and-access-control.html
-		if repositoryURL.Scheme == string(git.SSH) { // IAM user + SSH
+		if repositoryURL.Scheme == string(git.SSH) {
 			if repositoryURL.User == nil {
 				return fmt.Errorf("invalid AWS CodeCommit url: ssh username should be specified in the url")
 			}
@@ -154,19 +142,15 @@ func bootstrapGitCmdRun(cmd *cobra.Command, args []string) error {
 			if bootstrapArgs.privateKeyFile == "" {
 				return fmt.Errorf("private key file is required for bootstrapping against AWS CodeCommit using ssh")
 			}
-		} else if repositoryURL.Scheme == string(git.HTTPS) && !bootstrapArgs.tokenAuth { // IAM role + HTTPS
-			creds, err := authutils.GetGitCredentials(ctx, "aws", auth.WithGitURL(*repositoryURL))
-			if err != nil {
-				return fmt.Errorf("failed to get AWS CodeCommit IAM git credentials: %w", err)
-			}
-			gitArgs.username = creds.Username
-			gitArgs.password = creds.Password
-			bootstrapArgs.tokenAuth = true
-			gitProvider = aws.ProviderName
 		}
-
+		if repositoryURL.Scheme == string(git.HTTPS) && !bootstrapArgs.tokenAuth {
+			return fmt.Errorf("--token-auth=true must be specified for using an HTTPS AWS CodeCommit url")
+		}
 	}
 
+	ctx, cancel := context.WithTimeout(context.Background(), rootArgs.timeout)
+	defer cancel()
+
 	kubeClient, err := utils.KubeClient(kubeconfigArgs, kubeclientOptions)
 	if err != nil {
 		return err
@@ -312,10 +296,6 @@ func bootstrapGitCmdRun(cmd *cobra.Command, args []string) error {
 		TargetPath:        gitArgs.path.ToSlash(),
 		ManifestFile:      sync.MakeDefaultOptions().ManifestFile,
 		RecurseSubmodules: bootstrapArgs.recurseSubmodules,
-		SparseCheckout:    bootstrapArgs.sparseCheckout,
-	}
-	if gitProvider != "" {
-		syncOpts.Provider = gitProvider
 	}
 
 	entityList, err := bootstrap.LoadEntityListFromPath(bootstrapArgs.gpgKeyRingPath)
@@ -335,33 +315,6 @@ func bootstrapGitCmdRun(cmd *cobra.Command, args []string) error {
 		bootstrap.WithGitCommitSigning(entityList, bootstrapArgs.gpgPassphrase, bootstrapArgs.gpgKeyID),
 	}
 
-	if bootstrapArgs.sshSigningKeyFile != "" {
-		pemBytes, err := os.ReadFile(bootstrapArgs.sshSigningKeyFile)
-		if err != nil {
-			return fmt.Errorf("failed to read SSH signing key file: %w", err)
-		}
-		pwd, err := effectiveSshSigningPassword()
-		if err != nil {
-			return err
-		}
-		bootstrapOpts = append(bootstrapOpts,
-			bootstrap.WithSSHCommitSigning(pemBytes, []byte(pwd)))
-	}
-
-	if bootstrapArgs.sshSigningReusePrivateKey {
-		pemBytes, err := os.ReadFile(bootstrapArgs.privateKeyFile)
-		if err != nil {
-			return fmt.Errorf("failed to read transport private key for signing: %w", err)
-		}
-		// Reuse-path pre-flight: bootstrapValidate cannot run this check
-		// because the SSH transport password is subcommand-local.
-		if _, err := signature.NewSSHSigner(pemBytes, []byte(gitArgs.password)); err != nil {
-			return fmt.Errorf("invalid signing key (reused from --private-key-file): %w", err)
-		}
-		bootstrapOpts = append(bootstrapOpts,
-			bootstrap.WithSSHCommitSigning(pemBytes, []byte(gitArgs.password)))
-	}
-
 	// Setup bootstrapper with constructed configs
 	b, err := bootstrap.NewPlainGitProvider(gitClient, kubeClient, bootstrapOpts...)
 	if err != nil {

cmd/flux/bootstrap_gitea.go

@@ -107,11 +107,6 @@ func init() {
 }
 
 func bootstrapGiteaCmdRun(cmd *cobra.Command, args []string) error {
-	if bootstrapArgs.sshSigningReusePrivateKey {
-		return fmt.Errorf("--ssh-signing-reuse-private-key is not supported by 'bootstrap gitea'; " +
-			"that subcommand generates the SSH transport key in-process and has no operator-supplied key to reuse")
-	}
-
 	gtToken := os.Getenv(gtTokenEnvVar)
 	if gtToken == "" {
 		var err error
@@ -237,7 +232,6 @@ func bootstrapGiteaCmdRun(cmd *cobra.Command, args []string) error {
 		TargetPath:        giteaArgs.path.ToSlash(),
 		ManifestFile:      sync.MakeDefaultOptions().ManifestFile,
 		RecurseSubmodules: bootstrapArgs.recurseSubmodules,
-		SparseCheckout:    bootstrapArgs.sparseCheckout,
 	}
 
 	entityList, err := bootstrap.LoadEntityListFromPath(bootstrapArgs.gpgKeyRingPath)
@@ -258,7 +252,6 @@ func bootstrapGiteaCmdRun(cmd *cobra.Command, args []string) error {
 		bootstrap.WithLogger(logger),
 		bootstrap.WithGitCommitSigning(entityList, bootstrapArgs.gpgPassphrase, bootstrapArgs.gpgKeyID),
 	}
-
 	if bootstrapArgs.sshHostname != "" {
 		bootstrapOpts = append(bootstrapOpts, bootstrap.WithSSHHostname(bootstrapArgs.sshHostname))
 	}
@@ -272,19 +265,6 @@ func bootstrapGiteaCmdRun(cmd *cobra.Command, args []string) error {
 		bootstrapOpts = append(bootstrapOpts, bootstrap.WithReconcile())
 	}
 
-	if bootstrapArgs.sshSigningKeyFile != "" {
-		pemBytes, err := os.ReadFile(bootstrapArgs.sshSigningKeyFile)
-		if err != nil {
-			return fmt.Errorf("failed to read SSH signing key file: %w", err)
-		}
-		pwd, err := effectiveSshSigningPassword()
-		if err != nil {
-			return err
-		}
-		bootstrapOpts = append(bootstrapOpts,
-			bootstrap.WithSSHCommitSigning(pemBytes, []byte(pwd)))
-	}
-
 	// Setup bootstrapper with constructed configs
 	b, err := bootstrap.NewGitProviderBootstrapper(gitClient, providerClient, kubeClient, bootstrapOpts...)
 	if err != nil {

cmd/flux/bootstrap_github.go

@@ -107,11 +107,6 @@ func init() {
 }
 
 func bootstrapGitHubCmdRun(cmd *cobra.Command, args []string) error {
-	if bootstrapArgs.sshSigningReusePrivateKey {
-		return fmt.Errorf("--ssh-signing-reuse-private-key is not supported by 'bootstrap github'; " +
-			"that subcommand generates the SSH transport key in-process and has no operator-supplied key to reuse")
-	}
-
 	ghToken := os.Getenv(ghTokenEnvVar)
 	if ghToken == "" {
 		var err error
@@ -244,7 +239,6 @@ func bootstrapGitHubCmdRun(cmd *cobra.Command, args []string) error {
 		TargetPath:        githubArgs.path.ToSlash(),
 		ManifestFile:      sync.MakeDefaultOptions().ManifestFile,
 		RecurseSubmodules: bootstrapArgs.recurseSubmodules,
-		SparseCheckout:    bootstrapArgs.sparseCheckout,
 	}
 
 	entityList, err := bootstrap.LoadEntityListFromPath(bootstrapArgs.gpgKeyRingPath)
@@ -265,7 +259,6 @@ func bootstrapGitHubCmdRun(cmd *cobra.Command, args []string) error {
 		bootstrap.WithLogger(logger),
 		bootstrap.WithGitCommitSigning(entityList, bootstrapArgs.gpgPassphrase, bootstrapArgs.gpgKeyID),
 	}
-
 	if bootstrapArgs.sshHostname != "" {
 		bootstrapOpts = append(bootstrapOpts, bootstrap.WithSSHHostname(bootstrapArgs.sshHostname))
 	}
@@ -279,19 +272,6 @@ func bootstrapGitHubCmdRun(cmd *cobra.Command, args []string) error {
 		bootstrapOpts = append(bootstrapOpts, bootstrap.WithReconcile())
 	}
 
-	if bootstrapArgs.sshSigningKeyFile != "" {
-		pemBytes, err := os.ReadFile(bootstrapArgs.sshSigningKeyFile)
-		if err != nil {
-			return fmt.Errorf("failed to read SSH signing key file: %w", err)
-		}
-		pwd, err := effectiveSshSigningPassword()
-		if err != nil {
-			return err
-		}
-		bootstrapOpts = append(bootstrapOpts,
-			bootstrap.WithSSHCommitSigning(pemBytes, []byte(pwd)))
-	}
-
 	// Setup bootstrapper with constructed configs
 	b, err := bootstrap.NewGitProviderBootstrapper(gitClient, providerClient, kubeClient, bootstrapOpts...)
 	if err != nil {

cmd/flux/bootstrap_gitlab.go

@@ -27,7 +27,6 @@ import (
 	"github.com/fluxcd/go-git-providers/gitprovider"
 	"github.com/fluxcd/pkg/git"
 	"github.com/fluxcd/pkg/git/gogit"
-	"github.com/fluxcd/pkg/git/signature"
 	"github.com/spf13/cobra"
 
 	"github.com/fluxcd/flux2/v2/internal/flags"
@@ -288,7 +287,6 @@ func bootstrapGitLabCmdRun(cmd *cobra.Command, args []string) error {
 		TargetPath:        gitlabArgs.path.ToSlash(),
 		ManifestFile:      sync.MakeDefaultOptions().ManifestFile,
 		RecurseSubmodules: bootstrapArgs.recurseSubmodules,
-		SparseCheckout:    bootstrapArgs.sparseCheckout,
 	}
 
 	entityList, err := bootstrap.LoadEntityListFromPath(bootstrapArgs.gpgKeyRingPath)
@@ -323,31 +321,6 @@ func bootstrapGitLabCmdRun(cmd *cobra.Command, args []string) error {
 		bootstrapOpts = append(bootstrapOpts, bootstrap.WithReconcile())
 	}
 
-	if bootstrapArgs.sshSigningKeyFile != "" {
-		pemBytes, err := os.ReadFile(bootstrapArgs.sshSigningKeyFile)
-		if err != nil {
-			return fmt.Errorf("failed to read SSH signing key file: %w", err)
-		}
-		pwd, err := effectiveSshSigningPassword()
-		if err != nil {
-			return err
-		}
-		bootstrapOpts = append(bootstrapOpts,
-			bootstrap.WithSSHCommitSigning(pemBytes, []byte(pwd)))
-	}
-
-	if bootstrapArgs.sshSigningReusePrivateKey {
-		pemBytes, err := os.ReadFile(bootstrapArgs.privateKeyFile)
-		if err != nil {
-			return fmt.Errorf("failed to read transport private key for signing: %w", err)
-		}
-		if _, err := signature.NewSSHSigner(pemBytes, []byte(gitArgs.password)); err != nil {
-			return fmt.Errorf("invalid signing key (reused from --private-key-file): %w", err)
-		}
-		bootstrapOpts = append(bootstrapOpts,
-			bootstrap.WithSSHCommitSigning(pemBytes, []byte(gitArgs.password)))
-	}
-
 	// Setup bootstrapper with constructed configs
 	b, err := bootstrap.NewGitProviderBootstrapper(gitClient, providerClient, kubeClient, bootstrapOpts...)
 	if err != nil {

cmd/flux/bootstrap_test.go

@@ -1,208 +0,0 @@
-/*
-Copyright 2026 The Flux authors
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package main
-
-import (
-	"strings"
-	"testing"
-)
-
-func TestBootstrapValidate_signingFlags(t *testing.T) {
-	tests := []struct {
-		name       string
-		gpgRing    string
-		gpgPass    string
-		sshKey     string
-		sshPass    string
-		sshPassp   string
-		privateKey string
-		reuse      bool
-		wantErr    string
-	}{
-		{name: "no signing flags is valid"},
-		{name: "GPG only is valid", gpgRing: "./testdata/bootstrap/gpg.pgp"},
-		{name: "SSH only is valid", sshKey: "./testdata/bootstrap/ed25519.private"},
-		{
-			name:       "Reuse-private-key with private-key-file is valid",
-			privateKey: "./testdata/bootstrap/ed25519.private",
-			reuse:      true,
-		},
-		{
-			name:    "GPG + SSH errors",
-			gpgRing: "./testdata/bootstrap/gpg.pgp",
-			sshKey:  "./testdata/bootstrap/ed25519.private",
-			wantErr: "--gpg-* and --ssh-signing-* are mutually exclusive",
-		},
-		{
-			name:       "GPG + reuse errors",
-			gpgRing:    "./testdata/bootstrap/gpg.pgp",
-			privateKey: "./testdata/bootstrap/ed25519.private",
-			reuse:      true,
-			wantErr:    "--gpg-* and --ssh-signing-* are mutually exclusive",
-		},
-		{
-			name:       "SSH key-file + reuse errors",
-			sshKey:     "./testdata/bootstrap/ed25519.private",
-			privateKey: "./testdata/bootstrap/ed25519.private",
-			reuse:      true,
-			wantErr:    "--ssh-signing-key-file and --ssh-signing-reuse-private-key are mutually exclusive",
-		},
-		{
-			name:    "Reuse without private-key-file errors",
-			reuse:   true,
-			wantErr: "--ssh-signing-reuse-private-key requires --private-key-file",
-		},
-		{
-			name:    "SSH password without key errors",
-			sshPass: "secret",
-			wantErr: "--ssh-signing-password requires --ssh-signing-key-file",
-		},
-		{
-			name:     "SSH passphrase alias alone applies",
-			sshKey:   "./testdata/bootstrap/ed25519-encrypted.private",
-			sshPassp: "abcde12345",
-		},
-		{
-			name:     "SSH password and passphrase with same value passes",
-			sshKey:   "./testdata/bootstrap/ed25519-encrypted.private",
-			sshPass:  "abcde12345",
-			sshPassp: "abcde12345",
-		},
-		{
-			name:     "SSH password and passphrase with different values errors",
-			sshKey:   "./testdata/bootstrap/ed25519-encrypted.private",
-			sshPass:  "right",
-			sshPassp: "wrong",
-			wantErr:  "are aliases; do not pass both",
-		},
-		{
-			name:    "SSH malformed key fails pre-flight",
-			sshKey:  "./testdata/bootstrap/malformed.private",
-			wantErr: "invalid SSH signing key",
-		},
-		{
-			name:    "SSH encrypted key without password fails pre-flight",
-			sshKey:  "./testdata/bootstrap/ed25519-encrypted.private",
-			wantErr: "passphrase required",
-		},
-		// The GPG fixture used here is encrypted (passphrase: "right") so that
-		// passing the wrong passphrase exercises the Decrypt error path.
-		// An unencrypted key would make Decrypt a no-op regardless of the
-		// passphrase supplied.
-		{
-			name:    "GPG with wrong passphrase fails pre-flight",
-			gpgRing: "./testdata/bootstrap/gpg-encrypted.pgp",
-			gpgPass: "wrong",
-			wantErr: "invalid GPG signing key",
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			savedDefaultComponents := bootstrapArgs.defaultComponents
-			savedGpgRing := bootstrapArgs.gpgKeyRingPath
-			savedGpgPass := bootstrapArgs.gpgPassphrase
-			savedSshKey := bootstrapArgs.sshSigningKeyFile
-			savedSshPass := bootstrapArgs.sshSigningPassword
-			savedSshPassp := bootstrapArgs.sshSigningPassphrase
-			savedPrivKey := bootstrapArgs.privateKeyFile
-			savedReuse := bootstrapArgs.sshSigningReusePrivateKey
-			defer func() {
-				bootstrapArgs.defaultComponents = savedDefaultComponents
-				bootstrapArgs.gpgKeyRingPath = savedGpgRing
-				bootstrapArgs.gpgPassphrase = savedGpgPass
-				bootstrapArgs.sshSigningKeyFile = savedSshKey
-				bootstrapArgs.sshSigningPassword = savedSshPass
-				bootstrapArgs.sshSigningPassphrase = savedSshPassp
-				bootstrapArgs.privateKeyFile = savedPrivKey
-				bootstrapArgs.sshSigningReusePrivateKey = savedReuse
-			}()
-
-			// The e2e TestMain calls resetCmdArgs which clears the
-			// cobra-populated default components, so seed them here to
-			// satisfy the requiredComponents pre-check in bootstrapValidate.
-			bootstrapArgs.defaultComponents = bootstrapArgs.requiredComponents
-			bootstrapArgs.gpgKeyRingPath = tt.gpgRing
-			bootstrapArgs.gpgPassphrase = tt.gpgPass
-			bootstrapArgs.sshSigningKeyFile = tt.sshKey
-			bootstrapArgs.sshSigningPassword = tt.sshPass
-			bootstrapArgs.sshSigningPassphrase = tt.sshPassp
-			bootstrapArgs.privateKeyFile = tt.privateKey
-			bootstrapArgs.sshSigningReusePrivateKey = tt.reuse
-
-			err := bootstrapValidate()
-			if tt.wantErr == "" {
-				if err != nil {
-					t.Fatalf("expected no error, got: %v", err)
-				}
-				return
-			}
-			if err == nil {
-				t.Fatalf("expected error containing %q, got nil", tt.wantErr)
-			}
-			if !strings.Contains(err.Error(), tt.wantErr) {
-				t.Fatalf("expected error containing %q, got: %v", tt.wantErr, err)
-			}
-		})
-	}
-}
-
-// Providers that generate the SSH transport key in-process (github, gitea)
-// must reject --ssh-signing-reuse-private-key with their own, provider-
-// specific error before bootstrapValidate runs — otherwise the generic
-// "--ssh-signing-reuse-private-key requires --private-key-file" error
-// shadows the fact that the flag is fundamentally unsupported there.
-func TestBootstrapProviderRejectsReuseBeforeValidate(t *testing.T) {
-	tests := []struct {
-		name    string
-		runE    func() error
-		wantErr string
-	}{
-		{
-			name:    "github rejects reuse with provider-specific error",
-			runE:    func() error { return bootstrapGitHubCmdRun(nil, nil) },
-			wantErr: "not supported by 'bootstrap github'",
-		},
-		{
-			name:    "gitea rejects reuse with provider-specific error",
-			runE:    func() error { return bootstrapGiteaCmdRun(nil, nil) },
-			wantErr: "not supported by 'bootstrap gitea'",
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			savedReuse := bootstrapArgs.sshSigningReusePrivateKey
-			savedPrivKey := bootstrapArgs.privateKeyFile
-			defer func() {
-				bootstrapArgs.sshSigningReusePrivateKey = savedReuse
-				bootstrapArgs.privateKeyFile = savedPrivKey
-			}()
-
-			// Reuse flag set, no --private-key-file: bootstrapValidate
-			// would otherwise return "requires --private-key-file".
-			bootstrapArgs.sshSigningReusePrivateKey = true
-			bootstrapArgs.privateKeyFile = ""
-
-			err := tt.runE()
-			if err == nil {
-				t.Fatalf("expected error containing %q, got nil", tt.wantErr)
-			}
-			if !strings.Contains(err.Error(), tt.wantErr) {
-				t.Fatalf("expected error containing %q, got: %v", tt.wantErr, err)
-			}
-		})
-	}
-}

cmd/flux/build_artifact.go

@@ -22,7 +22,6 @@ import (
 	"fmt"
 	"io"
 	"os"
-	"path/filepath"
 	"strings"
 
 	"github.com/spf13/cobra"
@@ -49,10 +48,9 @@ from the given directory or a single manifest file.`,
 }
 
 type buildArtifactFlags struct {
-	output          string
-	path            string
-	ignorePaths     []string
-	resolveSymlinks bool
+	output      string
+	path        string
+	ignorePaths []string
 }
 
 var excludeOCI = append(strings.Split(sourceignore.ExcludeVCS, ","), strings.Split(sourceignore.ExcludeExt, ",")...)
@@ -63,7 +61,6 @@ func init() {
 	buildArtifactCmd.Flags().StringVarP(&buildArtifactArgs.path, "path", "p", "", "Path to the directory where the Kubernetes manifests are located.")
 	buildArtifactCmd.Flags().StringVarP(&buildArtifactArgs.output, "output", "o", "artifact.tgz", "Path to where the artifact tgz file should be written.")
 	buildArtifactCmd.Flags().StringSliceVar(&buildArtifactArgs.ignorePaths, "ignore-paths", excludeOCI, "set paths to ignore in .gitignore format")
-	buildArtifactCmd.Flags().BoolVar(&buildArtifactArgs.resolveSymlinks, "resolve-symlinks", false, "resolve symlinks by copying their targets into the artifact")
 
 	buildCmd.AddCommand(buildArtifactCmd)
 }
@@ -88,15 +85,6 @@ func buildArtifactCmdRun(cmd *cobra.Command, args []string) error {
 		return fmt.Errorf("invalid path '%s', must point to an existing directory or file", path)
 	}
 
-	if buildArtifactArgs.resolveSymlinks {
-		resolved, cleanupDir, err := resolveSymlinks(path)
-		if err != nil {
-			return fmt.Errorf("resolving symlinks failed: %w", err)
-		}
-		defer os.RemoveAll(cleanupDir)
-		path = resolved
-	}
-
 	logger.Actionf("building artifact from %s", path)
 
 	ociClient := oci.NewClient(oci.DefaultOptions())
@@ -108,141 +96,6 @@ func buildArtifactCmdRun(cmd *cobra.Command, args []string) error {
 	return nil
 }
 
-// resolveSymlinks creates a temporary directory with symlinks resolved to their
-// real file contents. This allows building artifacts from symlink trees (e.g.,
-// those created by Nix) where the actual files live outside the source directory.
-// It returns the resolved path and the temporary directory path for cleanup.
-func resolveSymlinks(srcPath string) (string, string, error) {
-	absPath, err := filepath.Abs(srcPath)
-	if err != nil {
-		return "", "", err
-	}
-
-	info, err := os.Stat(absPath)
-	if err != nil {
-		return "", "", err
-	}
-
-	// For a single file, resolve the symlink and return the path to the
-	// copied file within the temp dir, preserving file semantics for callers.
-	if !info.IsDir() {
-		resolved, err := filepath.EvalSymlinks(absPath)
-		if err != nil {
-			return "", "", fmt.Errorf("resolving symlink for %s: %w", absPath, err)
-		}
-		tmpDir, err := os.MkdirTemp("", "flux-artifact-*")
-		if err != nil {
-			return "", "", err
-		}
-		dst := filepath.Join(tmpDir, filepath.Base(absPath))
-		if err := copyFile(resolved, dst); err != nil {
-			os.RemoveAll(tmpDir)
-			return "", "", err
-		}
-		return dst, tmpDir, nil
-	}
-
-	tmpDir, err := os.MkdirTemp("", "flux-artifact-*")
-	if err != nil {
-		return "", "", err
-	}
-
-	visited := make(map[string]bool)
-	if err := copyDir(absPath, tmpDir, visited); err != nil {
-		os.RemoveAll(tmpDir)
-		return "", "", err
-	}
-
-	return tmpDir, tmpDir, nil
-}
-
-// copyDir recursively copies the contents of srcDir to dstDir, resolving any
-// symlinks encountered along the way. The visited map tracks resolved real
-// directory paths to detect and break symlink cycles.
-func copyDir(srcDir, dstDir string, visited map[string]bool) error {
-	real, err := filepath.EvalSymlinks(srcDir)
-	if err != nil {
-		return fmt.Errorf("resolving symlink %s: %w", srcDir, err)
-	}
-	abs, err := filepath.Abs(real)
-	if err != nil {
-		return fmt.Errorf("getting absolute path for %s: %w", real, err)
-	}
-	if visited[abs] {
-		return nil // break the cycle
-	}
-	visited[abs] = true
-	defer delete(visited, abs)
-	entries, err := os.ReadDir(srcDir)
-	if err != nil {
-		return err
-	}
-
-	for _, entry := range entries {
-		srcPath := filepath.Join(srcDir, entry.Name())
-		dstPath := filepath.Join(dstDir, entry.Name())
-
-		// Resolve symlinks to get the real path and info.
-		realPath, err := filepath.EvalSymlinks(srcPath)
-		if err != nil {
-			return fmt.Errorf("resolving symlink %s: %w", srcPath, err)
-		}
-		realInfo, err := os.Stat(realPath)
-		if err != nil {
-			return fmt.Errorf("stat resolved path %s: %w", realPath, err)
-		}
-
-		if realInfo.IsDir() {
-			if err := os.MkdirAll(dstPath, realInfo.Mode()); err != nil {
-				return err
-			}
-			// Recursively copy the resolved directory contents.
-			if err := copyDir(realPath, dstPath, visited); err != nil {
-				return err
-			}
-			continue
-		}
-
-		if !realInfo.Mode().IsRegular() {
-			continue
-		}
-
-		if err := copyFile(realPath, dstPath); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func copyFile(src, dst string) error {
-	srcInfo, err := os.Stat(src)
-	if err != nil {
-		return err
-	}
-
-	in, err := os.Open(src)
-	if err != nil {
-		return err
-	}
-	defer in.Close()
-
-	if err := os.MkdirAll(filepath.Dir(dst), 0o755); err != nil {
-		return err
-	}
-
-	out, err := os.OpenFile(dst, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, srcInfo.Mode())
-	if err != nil {
-		return err
-	}
-	defer out.Close()
-
-	if _, err := io.Copy(out, in); err != nil {
-		return err
-	}
-	return out.Close()
-}
-
 func saveReaderToFile(reader io.Reader) (string, error) {
 	b, err := io.ReadAll(bufio.NewReader(reader))
 	if err != nil {

cmd/flux/build_artifact_test.go

@@ -18,7 +18,6 @@ package main
 
 import (
 	"os"
-	"path/filepath"
 	"strings"
 	"testing"
 
@@ -69,149 +68,3 @@ data:
 
 	}
 }
-
-func Test_resolveSymlinks(t *testing.T) {
-	g := NewWithT(t)
-
-	// Create source directory with a real file
-	srcDir := t.TempDir()
-	realFile := filepath.Join(srcDir, "real.yaml")
-	g.Expect(os.WriteFile(realFile, []byte("apiVersion: v1\nkind: Namespace\nmetadata:\n  name: test\n"), 0o644)).To(Succeed())
-
-	// Create a directory with symlinks pointing to files outside it
-	symlinkDir := t.TempDir()
-	symlinkFile := filepath.Join(symlinkDir, "linked.yaml")
-	g.Expect(os.Symlink(realFile, symlinkFile)).To(Succeed())
-
-	// Also add a regular file in the symlink dir
-	regularFile := filepath.Join(symlinkDir, "regular.yaml")
-	g.Expect(os.WriteFile(regularFile, []byte("apiVersion: v1\nkind: ConfigMap\n"), 0o644)).To(Succeed())
-
-	// Create a symlinked subdirectory
-	subDir := filepath.Join(srcDir, "subdir")
-	g.Expect(os.MkdirAll(subDir, 0o755)).To(Succeed())
-	g.Expect(os.WriteFile(filepath.Join(subDir, "nested.yaml"), []byte("nested"), 0o644)).To(Succeed())
-	g.Expect(os.Symlink(subDir, filepath.Join(symlinkDir, "linkeddir"))).To(Succeed())
-
-	// Resolve symlinks
-	resolved, cleanupDir, err := resolveSymlinks(symlinkDir)
-	g.Expect(err).To(BeNil())
-	t.Cleanup(func() { os.RemoveAll(cleanupDir) })
-
-	// Verify the regular file was copied
-	content, err := os.ReadFile(filepath.Join(resolved, "regular.yaml"))
-	g.Expect(err).To(BeNil())
-	g.Expect(string(content)).To(Equal("apiVersion: v1\nkind: ConfigMap\n"))
-
-	// Verify the symlinked file was resolved and copied
-	content, err = os.ReadFile(filepath.Join(resolved, "linked.yaml"))
-	g.Expect(err).To(BeNil())
-	g.Expect(string(content)).To(ContainSubstring("kind: Namespace"))
-
-	// Verify that the resolved file is a regular file, not a symlink
-	info, err := os.Lstat(filepath.Join(resolved, "linked.yaml"))
-	g.Expect(err).To(BeNil())
-	g.Expect(info.Mode().IsRegular()).To(BeTrue())
-
-	// Verify that the symlinked directory was resolved and its contents were copied
-	content, err = os.ReadFile(filepath.Join(resolved, "linkeddir", "nested.yaml"))
-	g.Expect(err).To(BeNil())
-	g.Expect(string(content)).To(Equal("nested"))
-
-	// Verify that the file inside the symlinked directory is a regular file
-	info, err = os.Lstat(filepath.Join(resolved, "linkeddir", "nested.yaml"))
-	g.Expect(err).To(BeNil())
-	g.Expect(info.Mode().IsRegular()).To(BeTrue())
-}
-
-func Test_resolveSymlinks_singleFile(t *testing.T) {
-	g := NewWithT(t)
-
-	// Create a real file
-	srcDir := t.TempDir()
-	realFile := filepath.Join(srcDir, "manifest.yaml")
-	g.Expect(os.WriteFile(realFile, []byte("kind: ConfigMap"), 0o644)).To(Succeed())
-
-	// Create a symlink to the real file
-	linkDir := t.TempDir()
-	linkFile := filepath.Join(linkDir, "link.yaml")
-	g.Expect(os.Symlink(realFile, linkFile)).To(Succeed())
-
-	// Resolve the single symlinked file
-	resolved, cleanupDir, err := resolveSymlinks(linkFile)
-	g.Expect(err).To(BeNil())
-	t.Cleanup(func() { os.RemoveAll(cleanupDir) })
-
-	// The returned path should be a file, not a directory
-	info, err := os.Stat(resolved)
-	g.Expect(err).To(BeNil())
-	g.Expect(info.IsDir()).To(BeFalse())
-
-	// Verify contents
-	content, err := os.ReadFile(resolved)
-	g.Expect(err).To(BeNil())
-	g.Expect(string(content)).To(Equal("kind: ConfigMap"))
-}
-
-func Test_resolveSymlinks_cycle(t *testing.T) {
-	g := NewWithT(t)
-
-	// Create a directory with a symlink cycle: dir/link -> dir
-	dir := t.TempDir()
-	g.Expect(os.WriteFile(filepath.Join(dir, "file.yaml"), []byte("data"), 0o644)).To(Succeed())
-	g.Expect(os.Symlink(dir, filepath.Join(dir, "cycle"))).To(Succeed())
-
-	// resolveSymlinks should not infinite-loop
-	resolved, cleanupDir, err := resolveSymlinks(dir)
-	g.Expect(err).To(BeNil())
-	t.Cleanup(func() { os.RemoveAll(cleanupDir) })
-
-	// The file should be copied
-	content, err := os.ReadFile(filepath.Join(resolved, "file.yaml"))
-	g.Expect(err).To(BeNil())
-	g.Expect(string(content)).To(Equal("data"))
-
-	// The cycle directory should exist but not cause infinite nesting
-	_, err = os.Stat(filepath.Join(resolved, "cycle"))
-	g.Expect(err).To(BeNil())
-
-	// There should NOT be deeply nested cycle/cycle/cycle/... paths
-	_, err = os.Stat(filepath.Join(resolved, "cycle", "cycle", "cycle"))
-	g.Expect(os.IsNotExist(err)).To(BeTrue())
-}
-
-func Test_resolveSymlinks_multipleLinksSameTarget(t *testing.T) {
-	g := NewWithT(t)
-
-	// Create source directory with a real file inside a dir
-	srcDir := t.TempDir()
-	targetDir := filepath.Join(srcDir, "target")
-	g.Expect(os.MkdirAll(targetDir, 0o755)).To(Succeed())
-	g.Expect(os.WriteFile(filepath.Join(targetDir, "file.yaml"), []byte("data"), 0o644)).To(Succeed())
-
-	// Create a directory with multiple symlinks pointing to targetDir
-	symlinkDir := t.TempDir()
-
-	// Link 1
-	link1 := filepath.Join(symlinkDir, "link1")
-	g.Expect(os.Symlink(targetDir, link1)).To(Succeed())
-
-	// Link 2
-	link2 := filepath.Join(symlinkDir, "link2")
-	g.Expect(os.Symlink(targetDir, link2)).To(Succeed())
-
-	// Resolve symlinks
-	resolved, cleanupDir, err := resolveSymlinks(symlinkDir)
-	g.Expect(err).To(BeNil())
-	t.Cleanup(func() { os.RemoveAll(cleanupDir) })
-
-	// Verify link1 has the file
-	content, err := os.ReadFile(filepath.Join(resolved, "link1", "file.yaml"))
-	g.Expect(err).To(BeNil())
-	g.Expect(string(content)).To(Equal("data"))
-
-	// Verify link2 ALSO has the file
-	content2, err := os.ReadFile(filepath.Join(resolved, "link2", "file.yaml"))
-	g.Expect(err).To(BeNil())
-	g.Expect(string(content2)).To(Equal("data"))
-}

cmd/flux/build_kustomization.go

@@ -72,7 +72,6 @@ type buildKsFlags struct {
 	strictSubst       bool
 	recursive         bool
 	localSources      map[string]string
-	inMemoryBuild     bool
 }
 
 var buildKsArgs buildKsFlags
@@ -86,8 +85,6 @@ func init() {
 		"When enabled, the post build substitutions will fail if a var without a default value is declared in files but is missing from the input vars.")
 	buildKsCmd.Flags().BoolVarP(&buildKsArgs.recursive, "recursive", "r", false, "Recursively build Kustomizations")
 	buildKsCmd.Flags().StringToStringVar(&buildKsArgs.localSources, "local-sources", nil, "Comma-separated list of repositories in format: Kind/namespace/name=path")
-	buildKsCmd.Flags().BoolVar(&buildKsArgs.inMemoryBuild, "in-memory-build", true,
-		"Use in-memory filesystem during build.")
 	buildCmd.AddCommand(buildKsCmd)
 }
 
@@ -133,7 +130,6 @@ func buildKsCmdRun(cmd *cobra.Command, args []string) (err error) {
 			build.WithStrictSubstitute(buildKsArgs.strictSubst),
 			build.WithRecursive(buildKsArgs.recursive),
 			build.WithLocalSources(buildKsArgs.localSources),
-			build.WithInMemoryBuild(buildKsArgs.inMemoryBuild),
 		)
 	} else {
 		builder, err = build.NewBuilder(name, buildKsArgs.path,
@@ -144,7 +140,6 @@ func buildKsCmdRun(cmd *cobra.Command, args []string) (err error) {
 			build.WithStrictSubstitute(buildKsArgs.strictSubst),
 			build.WithRecursive(buildKsArgs.recursive),
 			build.WithLocalSources(buildKsArgs.localSources),
-			build.WithInMemoryBuild(buildKsArgs.inMemoryBuild),
 		)
 	}
 

cmd/flux/build_kustomization_test.go

@@ -52,12 +52,6 @@ func TestBuildKustomization(t *testing.T) {
 			resultFile: "./testdata/build-kustomization/podinfo-result.yaml",
 			assertFunc: "assertGoldenTemplateFile",
 		},
-		{
-			name:       "build podinfo (on-disk)",
-			args:       "build kustomization podinfo --path ./testdata/build-kustomization/podinfo --in-memory-build=false",
-			resultFile: "./testdata/build-kustomization/podinfo-result.yaml",
-			assertFunc: "assertGoldenTemplateFile",
-		},
 		{
 			name:       "build podinfo without service",
 			args:       "build kustomization podinfo --path ./testdata/build-kustomization/delete-service",
@@ -76,24 +70,12 @@ func TestBuildKustomization(t *testing.T) {
 			resultFile: "./testdata/build-kustomization/podinfo-with-ignore-result.yaml",
 			assertFunc: "assertGoldenTemplateFile",
 		},
-		{
-			name:       "build ignore (on-disk)",
-			args:       "build kustomization podinfo --path ./testdata/build-kustomization/ignore --ignore-paths \"!configmap.yaml,!secret.yaml\" --in-memory-build=false",
-			resultFile: "./testdata/build-kustomization/podinfo-with-ignore-result.yaml",
-			assertFunc: "assertGoldenTemplateFile",
-		},
 		{
 			name:       "build with recursive",
 			args:       "build kustomization podinfo --path ./testdata/build-kustomization/podinfo-with-my-app --recursive --local-sources GitRepository/default/podinfo=./testdata/build-kustomization",
 			resultFile: "./testdata/build-kustomization/podinfo-with-my-app-result.yaml",
 			assertFunc: "assertGoldenTemplateFile",
 		},
-		{
-			name:       "build with recursive (on-disk)",
-			args:       "build kustomization podinfo --path ./testdata/build-kustomization/podinfo-with-my-app --recursive --local-sources GitRepository/default/podinfo=./testdata/build-kustomization --in-memory-build=false",
-			resultFile: "./testdata/build-kustomization/podinfo-with-my-app-result.yaml",
-			assertFunc: "assertGoldenTemplateFile",
-		},
 	}
 
 	tmpl := map[string]string{
@@ -163,12 +145,6 @@ spec:
 			resultFile: "./testdata/build-kustomization/podinfo-result.yaml",
 			assertFunc: "assertGoldenTemplateFile",
 		},
-		{
-			name:       "build podinfo (on-disk)",
-			args:       "build kustomization podinfo --kustomization-file " + tmpFile + " --path ./testdata/build-kustomization/podinfo --in-memory-build=false",
-			resultFile: "./testdata/build-kustomization/podinfo-result.yaml",
-			assertFunc: "assertGoldenTemplateFile",
-		},
 		{
 			name:       "build podinfo without service",
 			args:       "build kustomization podinfo --kustomization-file " + tmpFile + " --path ./testdata/build-kustomization/delete-service",
@@ -199,18 +175,6 @@ spec:
 			resultFile: "./testdata/build-kustomization/podinfo-with-my-app-result.yaml",
 			assertFunc: "assertGoldenTemplateFile",
 		},
-		{
-			name:       "build with recursive (on-disk)",
-			args:       "build kustomization podinfo --kustomization-file " + tmpFile + " --path ./testdata/build-kustomization/podinfo-with-my-app --recursive --local-sources GitRepository/default/podinfo=./testdata/build-kustomization --in-memory-build=false",
-			resultFile: "./testdata/build-kustomization/podinfo-with-my-app-result.yaml",
-			assertFunc: "assertGoldenTemplateFile",
-		},
-		{
-			name:       "build with recursive in dry-run mode (on-disk)",
-			args:       "build kustomization podinfo --kustomization-file " + tmpFile + " --path ./testdata/build-kustomization/podinfo-with-my-app --recursive --local-sources GitRepository/default/podinfo=./testdata/build-kustomization --in-memory-build=false --dry-run",
-			resultFile: "./testdata/build-kustomization/podinfo-with-my-app-result.yaml",
-			assertFunc: "assertGoldenTemplateFile",
-		},
 	}
 
 	tmpl := map[string]string{
@@ -277,12 +241,6 @@ func TestBuildKustomizationPathNormalization(t *testing.T) {
 			resultFile: "./testdata/build-kustomization/podinfo-result.yaml",
 			assertFunc: "assertGoldenTemplateFile",
 		},
-		{
-			name:       "build with absolute path (on-disk)",
-			args:       "build kustomization podinfo --path " + absTestDataPath + " --in-memory-build=false",
-			resultFile: "./testdata/build-kustomization/podinfo-result.yaml",
-			assertFunc: "assertGoldenTemplateFile",
-		},
 		{
 			name:       "build with complex relative path (parent dir)",
 			args:       "build kustomization podinfo --path ./testdata/build-kustomization/../build-kustomization/podinfo",

cmd/flux/create_helmrelease.go

@@ -218,7 +218,7 @@ func createHelmReleaseCmdRun(cmd *cobra.Command, args []string) error {
 	}
 
 	if len(helmReleaseArgs.dependsOn) > 0 {
-		ls := meta.MakeDependsOn(helmReleaseArgs.dependsOn)
+		ls := utils.MakeDependsOn(helmReleaseArgs.dependsOn)
 		hrDependsOn := make([]helmv2.DependencyReference, 0, len(ls))
 		for _, d := range ls {
 			hrDependsOn = append(hrDependsOn, helmv2.DependencyReference{

cmd/flux/create_image_update.go

@@ -23,7 +23,6 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 	autov1 "github.com/fluxcd/image-automation-controller/api/v1"
-	"github.com/fluxcd/pkg/apis/meta"
 	sourcev1 "github.com/fluxcd/source-controller/api/v1"
 )
 
@@ -76,8 +75,6 @@ type imageUpdateFlags struct {
 	commitTemplate   string
 	authorName       string
 	authorEmail      string
-	signingKeySecret string
-	signingKeyType   string
 }
 
 var imageUpdateArgs = imageUpdateFlags{}
@@ -92,8 +89,6 @@ func init() {
 	flags.StringVar(&imageUpdateArgs.commitTemplate, "commit-template", "", "a template for commit messages")
 	flags.StringVar(&imageUpdateArgs.authorName, "author-name", "", "the name to use for commit author")
 	flags.StringVar(&imageUpdateArgs.authorEmail, "author-email", "", "the email to use for commit author")
-	flags.StringVar(&imageUpdateArgs.signingKeySecret, "signing-key-secret", "", "name of the Secret containing the signing key referenced in spec.git.commit.signingKey")
-	flags.StringVar(&imageUpdateArgs.signingKeyType, "signing-key-type", "", "signing-key format: gpg or ssh (defaults to gpg when --signing-key-secret is set)")
 
 	createImageCmd.AddCommand(createImageUpdateCmd)
 }
@@ -117,15 +112,6 @@ func createImageUpdateRun(cmd *cobra.Command, args []string) error {
 		return fmt.Errorf("the author email is required (--author-email)")
 	}
 
-	if imageUpdateArgs.signingKeyType != "" && imageUpdateArgs.signingKeySecret == "" {
-		return fmt.Errorf("--signing-key-type requires --signing-key-secret")
-	}
-	if imageUpdateArgs.signingKeyType != "" &&
-		imageUpdateArgs.signingKeyType != string(autov1.SigningKeyTypeGPG) &&
-		imageUpdateArgs.signingKeyType != string(autov1.SigningKeyTypeSSH) {
-		return fmt.Errorf("--signing-key-type must be one of: gpg, ssh")
-	}
-
 	labels, err := parseLabels()
 	if err != nil {
 		return err
@@ -177,13 +163,6 @@ func createImageUpdateRun(cmd *cobra.Command, args []string) error {
 		}
 	}
 
-	if imageUpdateArgs.signingKeySecret != "" {
-		update.Spec.GitSpec.Commit.SigningKey = &autov1.SigningKey{
-			SecretRef: meta.LocalObjectReference{Name: imageUpdateArgs.signingKeySecret},
-			Type:      autov1.SigningKeyType(imageUpdateArgs.signingKeyType),
-		}
-	}
-
 	if createArgs.export {
 		return printExport(exportImageUpdate(&update))
 	}

cmd/flux/create_image_update_test.go

@@ -1,62 +0,0 @@
-/*
-Copyright 2026 The Flux authors
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package main
-
-import "testing"
-
-func TestCreateImageUpdate(t *testing.T) {
-	tests := []struct {
-		name   string
-		args   string
-		assert assertFunc
-	}{
-		{
-			name:   "no signing key",
-			args:   "create image update flux-system --git-repo-ref=flux-system --checkout-branch=main --author-name=flux --author-email=flux@example.com --interval=1m0s --namespace=flux-system --export",
-			assert: assertGoldenFile("./testdata/create_image_update/no-signing.yaml"),
-		},
-		{
-			name:   "signing secret without explicit type defaults to gpg",
-			args:   "create image update flux-system --git-repo-ref=flux-system --checkout-branch=main --author-name=flux --author-email=flux@example.com --signing-key-secret=my-key --interval=1m0s --namespace=flux-system --export",
-			assert: assertGoldenFile("./testdata/create_image_update/signing-default-gpg.yaml"),
-		},
-		{
-			name:   "ssh signing key",
-			args:   "create image update flux-system --git-repo-ref=flux-system --checkout-branch=main --author-name=flux --author-email=flux@example.com --signing-key-secret=my-deploy-key --signing-key-type=ssh --interval=1m0s --namespace=flux-system --export",
-			assert: assertGoldenFile("./testdata/create_image_update/signing-ssh.yaml"),
-		},
-		{
-			name:   "signing-key-type without secret errors",
-			args:   "create image update flux-system --git-repo-ref=flux-system --checkout-branch=main --author-name=flux --author-email=flux@example.com --signing-key-type=ssh --namespace=flux-system --export",
-			assert: assertError("--signing-key-type requires --signing-key-secret"),
-		},
-		{
-			name:   "invalid signing-key-type errors",
-			args:   "create image update flux-system --git-repo-ref=flux-system --checkout-branch=main --author-name=flux --author-email=flux@example.com --signing-key-secret=k --signing-key-type=pgp --namespace=flux-system --export",
-			assert: assertError("--signing-key-type must be one of: gpg, ssh"),
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			cmd := cmdTestCase{
-				args:   tt.args,
-				assert: tt.assert,
-			}
-			cmd.runTestCmd(t)
-		})
-	}
-}

cmd/flux/create_kustomization.go

@@ -172,7 +172,7 @@ func createKsCmdRun(cmd *cobra.Command, args []string) error {
 	}
 
 	if len(kustomizationArgs.dependsOn) > 0 {
-		ls := meta.MakeDependsOn(kustomizationArgs.dependsOn)
+		ls := utils.MakeDependsOn(kustomizationArgs.dependsOn)
 		ksDependsOn := make([]kustomizev1.DependencyReference, 0, len(ls))
 		for _, d := range ls {
 			ksDependsOn = append(ksDependsOn, kustomizev1.DependencyReference{

cmd/flux/create_receiver.go

@@ -77,18 +77,16 @@ func createReceiverCmdRun(cmd *cobra.Command, args []string) error {
 		return fmt.Errorf("secret ref is required")
 	}
 
-	resources := []notificationv1.ReceiverResource{}
+	resources := []notificationv1.CrossNamespaceObjectReference{}
 	for _, resource := range receiverArgs.resources {
 		kind, name := utils.ParseObjectKindName(resource)
 		if kind == "" {
 			return fmt.Errorf("invalid event source '%s', must be in format <kind>/<name>", resource)
 		}
 
-		resources = append(resources, notificationv1.ReceiverResource{
-			CrossNamespaceObjectReference: notificationv1.CrossNamespaceObjectReference{
-				Kind: kind,
-				Name: name,
-			},
+		resources = append(resources, notificationv1.CrossNamespaceObjectReference{
+			Kind: kind,
+			Name: name,
 		})
 	}
 
@@ -115,7 +113,7 @@ func createReceiverCmdRun(cmd *cobra.Command, args []string) error {
 			Type:      receiverArgs.receiverType.String(),
 			Events:    receiverArgs.events,
 			Resources: resources,
-			SecretRef: &meta.LocalObjectReference{
+			SecretRef: meta.LocalObjectReference{
 				Name: receiverArgs.secretRef,
 			},
 			Suspend: false,

cmd/flux/create_source_chart.go

@@ -130,7 +130,7 @@ func createSourceChartCmdRun(cmd *cobra.Command, args []string) error {
 	}
 
 	if provider := sourceChartArgs.verifyProvider.String(); provider != "" {
-		helmChart.Spec.Verify = &sourcev1.HelmChartVerification{
+		helmChart.Spec.Verify = &sourcev1.OCIRepositoryVerification{
 			Provider: provider,
 		}
 		if secretName := sourceChartArgs.verifySecretRef; secretName != "" {

cmd/flux/create_source_git.go

@@ -124,12 +124,6 @@ For private Git repositories, the basic authentication credentials are stored in
     --username=username \
     --password=password
 
-  # Create a source for a Git repository using AWS CodeCommit with IAM credentials
-  flux create source git podinfo \
-    --url=https://git-codecommit.<region>.amazonaws.com/v1/repos/podinfo \
-    --branch=master \
-    --provider=aws
-
   # Create a source for a Git repository using azure provider
   flux create source git podinfo \
     --url=https://dev.azure.com/foo/bar/_git/podinfo \

cmd/flux/create_source_git_test.go

@@ -152,7 +152,7 @@ func TestCreateSourceGitExport(t *testing.T) {
 		{
 			name:   "source with invalid provider",
 			args:   "create source git podinfo --namespace=flux-system --url=https://dev.azure.com/foo/bar/_git/podinfo --provider dummy --branch=test --interval=1m0s --export",
-			assert: assertError("invalid argument \"dummy\" for \"--provider\" flag: source Git provider 'dummy' is not supported, must be one of: generic|github|aws|azure"),
+			assert: assertError("invalid argument \"dummy\" for \"--provider\" flag: source Git provider 'dummy' is not supported, must be one of: generic|azure|github"),
 		},
 		{
 			name:   "source with empty provider",

cmd/flux/create_source_helm.go

@@ -114,16 +114,9 @@ func createSourceHelmCmdRun(cmd *cobra.Command, args []string) error {
 		return err
 	}
 
-	helmURL, err := url.Parse(sourceHelmArgs.url)
-	if err != nil {
+	if _, err := url.Parse(sourceHelmArgs.url); err != nil {
 		return fmt.Errorf("url parse failed: %w", err)
 	}
-	if helmURL.Scheme != "http" && helmURL.Scheme != "https" && helmURL.Scheme != sourcev1.HelmRepositoryTypeOCI {
-		return fmt.Errorf("url scheme '%s' not supported, can be: http, https and oci", helmURL.Scheme)
-	}
-	if helmURL.Host == "" {
-		return fmt.Errorf("url host is required")
-	}
 
 	helmRepository := &sourcev1.HelmRepository{
 		ObjectMeta: metav1.ObjectMeta{
@@ -139,7 +132,11 @@ func createSourceHelmCmdRun(cmd *cobra.Command, args []string) error {
 		},
 	}
 
-	if helmURL.Scheme == sourcev1.HelmRepositoryTypeOCI {
+	url, err := url.Parse(sourceHelmArgs.url)
+	if err != nil {
+		return fmt.Errorf("failed to parse URL: %w", err)
+	}
+	if url.Scheme == sourcev1.HelmRepositoryTypeOCI {
 		helmRepository.Spec.Type = sourcev1.HelmRepositoryTypeOCI
 		helmRepository.Spec.Provider = sourceHelmArgs.ociProvider
 	}

cmd/flux/create_source_helm_test.go

@@ -36,12 +36,6 @@ func TestCreateSourceHelm(t *testing.T) {
 			resultFile: "name is required",
 			assertFunc: "assertError",
 		},
-		{
-			name:       "unsupported URL scheme",
-			args:       "create source helm podinfo --url=git://example.com/charts --export",
-			resultFile: "url scheme 'git' not supported, can be: http, https and oci",
-			assertFunc: "assertError",
-		},
 		{
 			name:       "OCI repo",
 			args:       "create source helm podinfo --url=oci://ghcr.io/stefanprodan/charts/podinfo --interval 5m --export",

cmd/flux/diff_kustomization.go

@@ -62,8 +62,6 @@ type diffKsFlags struct {
 	strictSubst       bool
 	recursive         bool
 	localSources      map[string]string
-	inMemoryBuild     bool
-	ignoreNotFound    bool
 }
 
 var diffKsArgs diffKsFlags
@@ -77,10 +75,6 @@ func init() {
 		"When enabled, the post build substitutions will fail if a var without a default value is declared in files but is missing from the input vars.")
 	diffKsCmd.Flags().BoolVarP(&diffKsArgs.recursive, "recursive", "r", false, "Recursively diff Kustomizations")
 	diffKsCmd.Flags().StringToStringVar(&diffKsArgs.localSources, "local-sources", nil, "Comma-separated list of repositories in format: Kind/namespace/name=path")
-	diffKsCmd.Flags().BoolVar(&diffKsArgs.inMemoryBuild, "in-memory-build", true,
-		"Use in-memory filesystem during build.")
-	diffKsCmd.Flags().BoolVar(&diffKsArgs.ignoreNotFound, "ignore-not-found", false,
-		"Ignore Kustomization not found errors on the cluster when diffing.")
 	diffCmd.AddCommand(diffKsCmd)
 }
 
@@ -119,8 +113,6 @@ func diffKsCmdRun(cmd *cobra.Command, args []string) error {
 			build.WithRecursive(diffKsArgs.recursive),
 			build.WithLocalSources(diffKsArgs.localSources),
 			build.WithSingleKustomization(),
-			build.WithInMemoryBuild(diffKsArgs.inMemoryBuild),
-			build.WithIgnoreNotFound(diffKsArgs.ignoreNotFound),
 		)
 	} else {
 		builder, err = build.NewBuilder(name, diffKsArgs.path,
@@ -132,8 +124,6 @@ func diffKsCmdRun(cmd *cobra.Command, args []string) error {
 			build.WithRecursive(diffKsArgs.recursive),
 			build.WithLocalSources(diffKsArgs.localSources),
 			build.WithSingleKustomization(),
-			build.WithInMemoryBuild(diffKsArgs.inMemoryBuild),
-			build.WithIgnoreNotFound(diffKsArgs.ignoreNotFound),
 		)
 	}
 

cmd/flux/diff_kustomization_test.go

@@ -48,7 +48,7 @@ func TestDiffKustomization(t *testing.T) {
 			name:       "diff nothing deployed",
 			args:       "diff kustomization podinfo --path ./testdata/build-kustomization/podinfo --progress-bar=false",
 			objectFile: "",
-			assert:     assertGoldenFile("./testdata/diff-kustomization/diff-new-kustomization.golden"),
+			assert:     assertGoldenFile("./testdata/diff-kustomization/nothing-is-deployed.golden"),
 		},
 		{
 			name:       "diff with a deployment object",
@@ -96,7 +96,7 @@ func TestDiffKustomization(t *testing.T) {
 			name:       "diff where kustomization file has multiple objects with the same name",
 			args:       "diff kustomization podinfo --path ./testdata/build-kustomization/podinfo --progress-bar=false --kustomization-file ./testdata/diff-kustomization/flux-kustomization-multiobj.yaml",
 			objectFile: "",
-			assert:     assertGoldenFile("./testdata/diff-kustomization/diff-new-kustomization.golden"),
+			assert:     assertGoldenFile("./testdata/diff-kustomization/nothing-is-deployed.golden"),
 		},
 		{
 			name:       "diff with recursive",
@@ -138,118 +138,6 @@ func TestDiffKustomization(t *testing.T) {
 	}
 }
 
-// TestDiffKustomizationNotDeployed tests `flux diff ks` when the Kustomization
-// CR does not exist in the cluster but is provided via --kustomization-file.
-// Reproduces https://github.com/fluxcd/flux2/issues/5439
-func TestDiffKustomizationNotDeployed(t *testing.T) {
-	// Use a dedicated namespace with NO setup() -- the Kustomization CR
-	// intentionally does not exist in the cluster.
-	tmpl := map[string]string{
-		"fluxns": allocateNamespace("flux-system"),
-	}
-	setupTestNamespace(tmpl["fluxns"], t)
-
-	tests := []struct {
-		name   string
-		args   string
-		assert assertFunc
-	}{
-		{
-			name: "fails without --ignore-not-found",
-			args: "diff kustomization podinfo --path ./testdata/build-kustomization/podinfo --progress-bar=false " +
-				"--kustomization-file ./testdata/diff-kustomization/flux-kustomization-local-only.yaml",
-			assert: assertError("failed to get kustomization object: kustomizations.kustomize.toolkit.fluxcd.io \"podinfo\" not found"),
-		},
-		{
-			name: "succeeds with --ignore-not-found and --kustomization-file",
-			args: "diff kustomization podinfo --path ./testdata/build-kustomization/podinfo --progress-bar=false " +
-				"--kustomization-file ./testdata/diff-kustomization/flux-kustomization-local-only.yaml " +
-				"--ignore-not-found",
-			assert: assertGoldenFile("./testdata/diff-kustomization/diff-new-kustomization.golden"),
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			cmd := cmdTestCase{
-				args:   tt.args + " -n " + tmpl["fluxns"],
-				assert: tt.assert,
-			}
-			cmd.runTestCmd(t)
-		})
-	}
-}
-
-// TestDiffKustomizationTakeOwnership tests `flux diff ks` when taking ownership
-// of existing resources on the cluster. A "pre-existing" configmap is applied
-// to the cluster, and the kustomization contains a matching configmap; the
-// diff should show the labels added by flux
-func TestDiffKustomizationTakeOwnership(t *testing.T) {
-	tmpl := map[string]string{
-		"fluxns": allocateNamespace("flux-system"),
-	}
-	setupTestNamespace(tmpl["fluxns"], t)
-
-	b, _ := build.NewBuilder("configmaps", "", build.WithClientConfig(kubeconfigArgs, kubeclientOptions))
-	resourceManager, err := b.Manager()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// Pre-create the "existing" configmap in the cluster without Flux labels
-	if _, err := resourceManager.ApplyAll(context.Background(), createObjectFromFile("./testdata/diff-kustomization/existing-configmap.yaml", tmpl, t), ssa.DefaultApplyOptions()); err != nil {
-		t.Fatal(err)
-	}
-
-	cmd := cmdTestCase{
-		args: "diff kustomization configmaps --path ./testdata/build-kustomization/configmaps --progress-bar=false " +
-			"--kustomization-file ./testdata/diff-kustomization/flux-kustomization-configmaps.yaml " +
-			"--ignore-not-found" +
-			" -n " + tmpl["fluxns"],
-		assert: assertGoldenFile("./testdata/diff-kustomization/diff-taking-ownership.golden"),
-	}
-	cmd.runTestCmd(t)
-}
-
-// TestDiffKustomizationNewNamespaceAndConfigmap runs `flux diff ks` when the
-// kustomization creates a new namespace and resources inside it. The server-side
-// dry-run cannot resolve resources in a namespace that doesn't exist yet,
-// consistent with `kubectl diff --server-side` behavior.
-func TestDiffKustomizationNewNamespaceAndConfigmap(t *testing.T) {
-	tmpl := map[string]string{
-		"fluxns": allocateNamespace("flux-system"),
-	}
-	setupTestNamespace(tmpl["fluxns"], t)
-
-	cmd := cmdTestCase{
-		args: "diff kustomization new-namespace-and-configmap --path ./testdata/build-kustomization/new-namespace-and-configmap --progress-bar=false " +
-			"--kustomization-file ./testdata/diff-kustomization/flux-kustomization-new-namespace-and-configmap.yaml " +
-			"--ignore-not-found" +
-			" -n " + tmpl["fluxns"],
-		assert: assertError("ConfigMap/new-ns/app-config not found: namespaces \"new-ns\" not found"),
-	}
-	cmd.runTestCmd(t)
-}
-
-// TestDiffKustomizationNewNamespaceOnly runs `flux diff ks` when the
-// kustomization creates only a new namespace. The diff should show the
-// namespace as created.
-func TestDiffKustomizationNewNamespaceOnly(t *testing.T) {
-	tmpl := map[string]string{
-		"fluxns": allocateNamespace("flux-system"),
-	}
-	setupTestNamespace(tmpl["fluxns"], t)
-
-	cmd := cmdTestCase{
-		args: "diff kustomization new-namespace-only --path ./testdata/build-kustomization/new-namespace-only --progress-bar=false " +
-			"--kustomization-file ./testdata/diff-kustomization/flux-kustomization-new-namespace-only.yaml " +
-			"--ignore-not-found" +
-			" -n " + tmpl["fluxns"],
-		assert: assertGoldenFile("./testdata/diff-kustomization/diff-new-namespace-only.golden"),
-	}
-	cmd.runTestCmd(t)
-}
-
 func createObjectFromFile(objectFile string, templateValues map[string]string, t *testing.T) []*unstructured.Unstructured {
 	buf, err := os.ReadFile(objectFile)
 	if err != nil {
@@ -270,36 +158,3 @@ func createObjectFromFile(objectFile string, templateValues map[string]string, t
 
 	return clientObjects
 }
-
-// TestDiffKustomizationDriftIgnoreRules tests `flux diff ks` with drift ignore
-// rules. A service with a drifted port is pre-applied to the cluster, and the
-// kustomization specifies driftIgnoreRules that ignore /spec/ports on Services.
-// The diff should not show the service as drifted.
-func TestDiffKustomizationDriftIgnoreRules(t *testing.T) {
-	tmpl := map[string]string{
-		"fluxns": allocateNamespace("flux-system"),
-	}
-	setupTestNamespace(tmpl["fluxns"], t)
-
-	b, _ := build.NewBuilder("podinfo", "", build.WithClientConfig(kubeconfigArgs, kubeclientOptions))
-	resourceManager, err := b.Manager()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// Pre-apply the drifted service (port 9899 instead of 9898) without Flux labels.
-	if _, err := resourceManager.ApplyAll(context.Background(), createObjectFromFile("./testdata/diff-kustomization/drifted-service-no-labels.yaml", tmpl, t), ssa.DefaultApplyOptions()); err != nil {
-		t.Fatal(err)
-	}
-
-	cmd := cmdTestCase{
-		args: "diff kustomization podinfo --path ./testdata/build-kustomization/podinfo --progress-bar=false " +
-			"--kustomization-file ./testdata/diff-kustomization/flux-kustomization-drift-ignore.yaml " +
-			"--ignore-not-found" +
-			" -n " + tmpl["fluxns"],
-		assert: assertGoldenFile("./testdata/diff-kustomization/diff-with-drift-ignore.golden"),
-	}
-	cmd.runTestCmd(t)
-
-	testEnv.DeleteObjectFile("./testdata/diff-kustomization/drifted-service-no-labels.yaml", tmpl, t)
-}

cmd/flux/get.go

@@ -78,7 +78,7 @@ func init() {
 	getCmd.PersistentFlags().BoolVarP(&getArgs.noHeader, "no-header", "", false, "skip the header when printing the results")
 	getCmd.PersistentFlags().BoolVarP(&getArgs.watch, "watch", "w", false, "After listing/getting the requested object, watch for changes.")
 	getCmd.PersistentFlags().StringVar(&getArgs.statusSelector, "status-selector", "",
-		"specify the status condition name and the desired state to filter the get result, e.g. ready=false or ready!=true")
+		"specify the status condition name and the desired state to filter the get result, e.g. ready=false")
 	getCmd.PersistentFlags().StringVarP(&getArgs.labelSelector, "label-selector", "l", "",
 		"filter objects by label selector")
 	rootCmd.AddCommand(getCmd)
@@ -114,11 +114,6 @@ func statusMatches(conditionType, conditionStatus string, conditions []metav1.Co
 	return false
 }
 
-func readyStatusMatches(conditionType, conditionStatus string) bool {
-	return strings.EqualFold(conditionType, meta.ReadyCondition) &&
-		strings.EqualFold(conditionStatus, string(metav1.ConditionTrue))
-}
-
 func nameColumns(item named, includeNamespace bool, includeKind bool) []string {
 	name := item.GetName()
 	if includeKind {
@@ -212,9 +207,6 @@ func (get getCommand) run(cmd *cobra.Command, args []string) error {
 	if err != nil {
 		return err
 	}
-	if getAll && len(rows) == 0 {
-		return nil
-	}
 
 	err = printers.TablePrinter(header).Print(cmd.OutOrStdout(), rows)
 	if err != nil {
@@ -236,31 +228,20 @@ func namespaceNameOrAny(allNamespaces bool, namespaceName string) string {
 }
 
 func getRowsToPrint(getAll bool, list summarisable) ([][]string, error) {
-	filter := func(i int) bool { return true }
+	noFilter := true
 	var conditionType, conditionStatus string
 	if getArgs.statusSelector != "" {
-		// Support both type=status (match) and type!=status (negated match).
-		// "!=" must be checked first since it also contains "=".
-		separator := "="
-		filter = func(i int) bool {
-			return list.statusSelectorMatches(i, conditionType, conditionStatus)
-		}
-		if strings.Contains(getArgs.statusSelector, "!=") {
-			separator = "!="
-			filter = func(i int) bool {
-				return !list.statusSelectorMatches(i, conditionType, conditionStatus)
-			}
-		}
-		parts := strings.SplitN(getArgs.statusSelector, separator, 2)
+		parts := strings.SplitN(getArgs.statusSelector, "=", 2)
 		if len(parts) != 2 {
-			return nil, fmt.Errorf("expected status selector in type=status or type!=status format, but found: %s", getArgs.statusSelector)
+			return nil, fmt.Errorf("expected status selector in type=status format, but found: %s", getArgs.statusSelector)
 		}
 		conditionType = parts[0]
 		conditionStatus = parts[1]
+		noFilter = false
 	}
 	var rows [][]string
 	for i := 0; i < list.len(); i++ {
-		if filter(i) {
+		if noFilter || list.statusSelectorMatches(i, conditionType, conditionStatus) {
 			row := list.summariseItem(i, getArgs.allNamespaces, getAll)
 			rows = append(rows, row)
 		}

cmd/flux/get_alert.go

@@ -92,5 +92,5 @@ func (s alertListAdapter) headers(includeNamespace bool) []string {
 }
 
 func (s alertListAdapter) statusSelectorMatches(i int, conditionType, conditionStatus string) bool {
-	return readyStatusMatches(conditionType, conditionStatus)
+	return false
 }

cmd/flux/get_alertprovider.go

@@ -88,5 +88,5 @@ func (s alertProviderListAdapter) headers(includeNamespace bool) []string {
 }
 
 func (s alertProviderListAdapter) statusSelectorMatches(i int, conditionType, conditionStatus string) bool {
-	return readyStatusMatches(conditionType, conditionStatus)
+	return false
 }

cmd/flux/get_artifact_generator.go

@@ -38,7 +38,7 @@ var getArtifactGeneratorCmd = &cobra.Command{
 	ValidArgsFunction: resourceNamesCompletionFunc(swapi.GroupVersion.WithKind(swapi.ArtifactGeneratorKind)),
 	RunE: func(cmd *cobra.Command, args []string) error {
 		get := getCommand{
-			apiType: artifactGeneratorType,
+			apiType: receiverType,
 			list:    artifactGeneratorListAdapter{&swapi.ArtifactGeneratorList{}},
 			funcMap: make(typeMap),
 		}

cmd/flux/get_helmrelease.go

@@ -28,22 +28,13 @@ import (
 	helmv2 "github.com/fluxcd/helm-controller/api/v2"
 )
 
-type getHelmReleaseFlags struct {
-	showSource bool
-}
-
-var getHrArgs getHelmReleaseFlags
-
 var getHelmReleaseCmd = &cobra.Command{
 	Use:     "helmreleases",
 	Aliases: []string{"hr", "helmrelease"},
 	Short:   "Get HelmRelease statuses",
 	Long:    "The get helmreleases command prints the statuses of the resources.",
 	Example: `  # List all Helm releases and their status
-  flux get helmreleases
-
-  # List all Helm releases with source information
-  flux get helmreleases --show-source`,
+  flux get helmreleases`,
 	ValidArgsFunction: resourceNamesCompletionFunc(helmv2.GroupVersion.WithKind(helmv2.HelmReleaseKind)),
 	RunE: func(cmd *cobra.Command, args []string) error {
 		get := getCommand{
@@ -78,7 +69,6 @@ var getHelmReleaseCmd = &cobra.Command{
 }
 
 func init() {
-	getHelmReleaseCmd.Flags().BoolVar(&getHrArgs.showSource, "show-source", false, "show the source reference for each helmrelease")
 	getCmd.AddCommand(getHelmReleaseCmd)
 }
 
@@ -89,45 +79,16 @@ func getHelmReleaseRevision(helmRelease helmv2.HelmRelease) string {
 	return helmRelease.Status.LastAttemptedRevision
 }
 
-func getHelmReleaseSource(item helmv2.HelmRelease) string {
-	if item.Spec.ChartRef != nil {
-		ns := item.Spec.ChartRef.Namespace
-		if ns == "" {
-			ns = item.GetNamespace()
-		}
-		return fmt.Sprintf("%s/%s/%s",
-			item.Spec.ChartRef.Kind,
-			ns,
-			item.Spec.ChartRef.Name)
-	}
-	ns := item.Spec.Chart.Spec.SourceRef.Namespace
-	if ns == "" {
-		ns = item.GetNamespace()
-	}
-	return fmt.Sprintf("%s/%s/%s",
-		item.Spec.Chart.Spec.SourceRef.Kind,
-		ns,
-		item.Spec.Chart.Spec.SourceRef.Name)
-}
-
 func (a helmReleaseListAdapter) summariseItem(i int, includeNamespace bool, includeKind bool) []string {
 	item := a.Items[i]
 	revision := getHelmReleaseRevision(item)
 	status, msg := statusAndMessage(item.Status.Conditions)
-	row := nameColumns(&item, includeNamespace, includeKind)
-	if getHrArgs.showSource {
-		row = append(row, getHelmReleaseSource(item))
-	}
-	return append(row,
+	return append(nameColumns(&item, includeNamespace, includeKind),
 		revision, cases.Title(language.English).String(strconv.FormatBool(item.Spec.Suspend)), status, msg)
 }
 
 func (a helmReleaseListAdapter) headers(includeNamespace bool) []string {
-	headers := []string{"Name"}
-	if getHrArgs.showSource {
-		headers = append(headers, "Source")
-	}
-	headers = append(headers, "Revision", "Suspended", "Ready", "Message")
+	headers := []string{"Name", "Revision", "Suspended", "Ready", "Message"}
 	if includeNamespace {
 		headers = append([]string{"Namespace"}, headers...)
 	}

cmd/flux/get_kustomization.go

@@ -30,22 +30,13 @@ import (
 	"github.com/fluxcd/flux2/v2/internal/utils"
 )
 
-type getKustomizationFlags struct {
-	showSource bool
-}
-
-var getKsArgs getKustomizationFlags
-
 var getKsCmd = &cobra.Command{
 	Use:     "kustomizations",
 	Aliases: []string{"ks", "kustomization"},
 	Short:   "Get Kustomization statuses",
 	Long:    `The get kustomizations command prints the statuses of the resources.`,
 	Example: `  # List all kustomizations and their status
-  flux get kustomizations
-
-  # List all kustomizations with source information
-  flux get kustomizations --show-source`,
+  flux get kustomizations`,
 	ValidArgsFunction: resourceNamesCompletionFunc(kustomizev1.GroupVersion.WithKind(kustomizev1.KustomizationKind)),
 	RunE: func(cmd *cobra.Command, args []string) error {
 		get := getCommand{
@@ -83,7 +74,6 @@ var getKsCmd = &cobra.Command{
 }
 
 func init() {
-	getKsCmd.Flags().BoolVar(&getKsArgs.showSource, "show-source", false, "show the source reference for each kustomization")
 	getCmd.AddCommand(getKsCmd)
 }
 
@@ -93,27 +83,12 @@ func (a kustomizationListAdapter) summariseItem(i int, includeNamespace bool, in
 	status, msg := statusAndMessage(item.Status.Conditions)
 	revision = utils.TruncateHex(revision)
 	msg = utils.TruncateHex(msg)
-	row := nameColumns(&item, includeNamespace, includeKind)
-	if getKsArgs.showSource {
-		sourceNs := item.Spec.SourceRef.Namespace
-		if sourceNs == "" {
-			sourceNs = item.GetNamespace()
-		}
-		row = append(row, fmt.Sprintf("%s/%s/%s",
-			item.Spec.SourceRef.Kind,
-			sourceNs,
-			item.Spec.SourceRef.Name))
-	}
-	return append(row,
+	return append(nameColumns(&item, includeNamespace, includeKind),
 		revision, cases.Title(language.English).String(strconv.FormatBool(item.Spec.Suspend)), status, msg)
 }
 
 func (a kustomizationListAdapter) headers(includeNamespace bool) []string {
-	headers := []string{"Name"}
-	if getKsArgs.showSource {
-		headers = append(headers, "Source")
-	}
-	headers = append(headers, "Revision", "Suspended", "Ready", "Message")
+	headers := []string{"Name", "Revision", "Suspended", "Ready", "Message"}
 	if includeNamespace {
 		headers = append([]string{"Namespace"}, headers...)
 	}

cmd/flux/get_test.go

@@ -63,141 +63,6 @@ func Test_GetCmd(t *testing.T) {
 	}
 }
 
-func Test_GetCmdStatusSelector(t *testing.T) {
-	tmpl := map[string]string{
-		"fluxns": allocateNamespace("flux-system"),
-	}
-	testEnv.CreateObjectFile("./testdata/get/status_objects.yaml", tmpl, t)
-
-	tests := []struct {
-		name     string
-		args     string
-		expected string
-	}{
-		{
-			name:     "equal status selector matches one",
-			args:     "--status-selector Ready=True",
-			expected: "testdata/get/get_status_ready_true.golden",
-		},
-		{
-			name:     "equal status selector matches false",
-			args:     "--status-selector Ready=False",
-			expected: "testdata/get/get_status_ready_false.golden",
-		},
-		{
-			name:     "not-equal status selector matches all not-true",
-			args:     "--status-selector Ready!=True",
-			expected: "testdata/get/get_status_ready_not_true.golden",
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			cmd := cmdTestCase{
-				args:   "get sources git " + tt.args + " -n " + tmpl["fluxns"],
-				assert: assertGoldenTemplateFile(tt.expected, nil),
-			}
-
-			cmd.runTestCmd(t)
-		})
-	}
-}
-
-func Test_GetCmdStatusSelectorSyntheticReady(t *testing.T) {
-	tmpl := map[string]string{
-		"fluxns": allocateNamespace("flux-system"),
-	}
-	testEnv.CreateObjectFile("./testdata/get/notification_objects.yaml", tmpl, t)
-
-	commands := []string{
-		"get alerts",
-		"get alert-providers",
-		"get all",
-	}
-	for _, command := range commands {
-		t.Run(command, func(t *testing.T) {
-			unfilteredOutput, err := executeCommand(command + " -n " + tmpl["fluxns"])
-			if err != nil {
-				t.Fatalf("%s failed: %v", command, err)
-			}
-			if unfilteredOutput == "" {
-				t.Fatalf("expected %s output for namespace with notification objects", command)
-			}
-
-			filteredOutput, err := executeCommand(command + " --status-selector Ready=True -n " + tmpl["fluxns"])
-			if err != nil {
-				t.Fatalf("%s with Ready=True status selector failed: %v", command, err)
-			}
-
-			if filteredOutput != unfilteredOutput {
-				t.Fatalf("expected Ready=True filtered output to match unfiltered output:\nfiltered:\n%s\nunfiltered:\n%s", filteredOutput, unfilteredOutput)
-			}
-		})
-	}
-}
-
-func Test_GetAllCmdStatusSelectorNoMatches(t *testing.T) {
-	tmpl := map[string]string{
-		"fluxns": allocateNamespace("flux-system"),
-	}
-	testEnv.CreateObjectFile("./testdata/get/status_objects.yaml", tmpl, t)
-
-	cmd := cmdTestCase{
-		args:   "get all --status-selector foo=bar -n " + tmpl["fluxns"],
-		assert: assertGoldenValue(""),
-	}
-
-	cmd.runTestCmd(t)
-}
-
-func Test_GetAllCmdStatusSelectorKustomizationOnlyMatches(t *testing.T) {
-	tmpl := map[string]string{
-		"fluxns": allocateNamespace("flux-system"),
-	}
-	testEnv.CreateObjectFile("./testdata/get/kustomization_only.yaml", tmpl, t)
-
-	unfilteredOutput, err := executeCommand("get all -n " + tmpl["fluxns"])
-	if err != nil {
-		t.Fatalf("get all failed: %v", err)
-	}
-	if unfilteredOutput == "" {
-		t.Fatal("expected get all output for namespace with one Kustomization")
-	}
-
-	filteredOutput, err := executeCommand("get all --status-selector Ready=True -n " + tmpl["fluxns"])
-	if err != nil {
-		t.Fatalf("get all with matching status selector failed: %v", err)
-	}
-
-	if filteredOutput != unfilteredOutput {
-		t.Fatalf("expected filtered output to match unfiltered output:\nfiltered:\n%s\nunfiltered:\n%s", filteredOutput, unfilteredOutput)
-	}
-}
-
-func Test_GetAllCmdStatusSelectorKustomizationOnlyNoMatch(t *testing.T) {
-	tmpl := map[string]string{
-		"fluxns": allocateNamespace("flux-system"),
-	}
-	testEnv.CreateObjectFile("./testdata/get/kustomization_only.yaml", tmpl, t)
-
-	emptyNamespace := allocateNamespace("empty")
-	setupTestNamespace(emptyNamespace, t)
-
-	emptyOutput, err := executeCommand("get all -n " + emptyNamespace)
-	if err != nil {
-		t.Fatalf("get all in empty namespace failed: %v", err)
-	}
-
-	filteredOutput, err := executeCommand("get all --status-selector Ready=False -n " + tmpl["fluxns"])
-	if err != nil {
-		t.Fatalf("get all with non-matching status selector failed: %v", err)
-	}
-
-	if filteredOutput != emptyOutput {
-		t.Fatalf("expected filtered output to match empty namespace output:\nfiltered:\n%s\nempty namespace:\n%s", filteredOutput, emptyOutput)
-	}
-}
-
 func Test_GetCmdErrors(t *testing.T) {
 	tmpl := map[string]string{
 		"fluxns": allocateNamespace("flux-system"),
@@ -219,16 +84,6 @@ func Test_GetCmdErrors(t *testing.T) {
 			args:   "get helmrelease -n " + tmpl["fluxns"],
 			assert: assertError(fmt.Sprintf("no HelmRelease objects found in \"%s\" namespace", tmpl["fluxns"])),
 		},
-		{
-			name:   "no artifact generators found in namespace",
-			args:   "get artifact generators -n " + tmpl["fluxns"],
-			assert: assertError(fmt.Sprintf("no ArtifactGenerator objects found in \"%s\" namespace", tmpl["fluxns"])),
-		},
-		{
-			name:   "malformed status selector",
-			args:   "get sources git --status-selector Ready -n " + tmpl["fluxns"],
-			assert: assertError("expected status selector in type=status or type!=status format, but found: Ready"),
-		},
 	}
 
 	for _, tt := range tests {

cmd/flux/main.go

@@ -100,16 +100,6 @@ Command line utility for assembling Kubernetes CD pipelines the GitOps way.`,
   # Uninstall Flux and delete CRDs
   flux uninstall`,
 	PersistentPreRunE: func(cmd *cobra.Command, args []string) error {
-		// If opted in via --ns-follows-kube-context flag or
-		// FLUX_NS_FOLLOWS_KUBE_CONTEXT env var, and --namespace was not
-		// explicitly set, respect the namespace from the kubeconfig context.
-		if !cmd.Flags().Changed("namespace") &&
-			(rootArgs.nsFollowsKubeContext || os.Getenv("FLUX_NS_FOLLOWS_KUBE_CONTEXT") != "") {
-			if ctxNs := getKubeconfigContextNamespace(kubeconfigArgs); ctxNs != "" {
-				*kubeconfigArgs.Namespace = ctxNs
-			}
-		}
-
 		ns, err := cmd.Flags().GetString("namespace")
 		if err != nil {
 			return fmt.Errorf("error getting namespace: %w", err)
@@ -126,11 +116,10 @@ Command line utility for assembling Kubernetes CD pipelines the GitOps way.`,
 var logger = stderrLogger{stderr: os.Stderr}
 
 type rootFlags struct {
-	timeout              time.Duration
-	verbose              bool
-	pollInterval         time.Duration
-	nsFollowsKubeContext bool
-	defaults             install.Options
+	timeout      time.Duration
+	verbose      bool
+	pollInterval time.Duration
+	defaults     install.Options
 }
 
 // RequestError is a custom error type that wraps an error returned by the flux api.
@@ -150,8 +139,6 @@ var kubeclientOptions = new(runclient.Options)
 func init() {
 	rootCmd.PersistentFlags().DurationVar(&rootArgs.timeout, "timeout", 5*time.Minute, "timeout for this operation")
 	rootCmd.PersistentFlags().BoolVar(&rootArgs.verbose, "verbose", false, "print generated objects")
-	rootCmd.PersistentFlags().BoolVar(&rootArgs.nsFollowsKubeContext, "ns-follows-kube-context", false,
-		"use the namespace from the kubeconfig context instead of the default flux-system namespace, can also be set via FLUX_NS_FOLLOWS_KUBE_CONTEXT env var")
 
 	configureDefaultNamespace()
 	kubeconfigArgs.APIServer = nil // prevent AddFlags from configuring --server flag
@@ -199,8 +186,6 @@ func main() {
 	// logger, we configure it's logger to do nothing.
 	ctrllog.SetLogger(logr.New(ctrllog.NullLogSink{}))
 
-	registerPlugins()
-
 	if err := rootCmd.Execute(); err != nil {
 
 		if err, ok := err.(*RequestError); ok {
@@ -218,26 +203,6 @@ func main() {
 	}
 }
 
-// getKubeconfigContextNamespace returns the namespace from the current
-// kubeconfig context, or an empty string if it cannot be determined.
-func getKubeconfigContextNamespace(cf *genericclioptions.ConfigFlags) string {
-	rawConfig, err := cf.ToRawKubeConfigLoader().RawConfig()
-	if err != nil {
-		return ""
-	}
-
-	currentContext := rawConfig.CurrentContext
-	if cf.Context != nil && *cf.Context != "" {
-		currentContext = *cf.Context
-	}
-
-	if ctx, ok := rawConfig.Contexts[currentContext]; ok {
-		return ctx.Namespace
-	}
-
-	return ""
-}
-
 func configureDefaultNamespace() {
 	*kubeconfigArgs.Namespace = rootArgs.defaults.Namespace
 	fromEnv := os.Getenv("FLUX_SYSTEM_NAMESPACE")

cmd/flux/main_context_ns_test.go

@@ -1,221 +0,0 @@
-/*
-Copyright 2026 The Flux authors
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package main
-
-import (
-	"os"
-	"path/filepath"
-	"testing"
-
-	. "github.com/onsi/gomega"
-	"k8s.io/cli-runtime/pkg/genericclioptions"
-)
-
-func TestGetKubeconfigContextNamespace(t *testing.T) {
-	tests := []struct {
-		name           string
-		kubeconfig     string
-		context        string
-		expectedResult string
-	}{
-		{
-			name: "returns namespace from current context",
-			kubeconfig: `apiVersion: v1
-kind: Config
-current-context: my-context
-contexts:
-- name: my-context
-  context:
-    cluster: my-cluster
-    namespace: custom-ns
-clusters:
-- name: my-cluster
-  cluster:
-    server: https://localhost:6443
-`,
-			expectedResult: "custom-ns",
-		},
-		{
-			name: "returns empty when context has no namespace",
-			kubeconfig: `apiVersion: v1
-kind: Config
-current-context: my-context
-contexts:
-- name: my-context
-  context:
-    cluster: my-cluster
-clusters:
-- name: my-cluster
-  cluster:
-    server: https://localhost:6443
-`,
-			expectedResult: "",
-		},
-		{
-			name: "returns namespace from context specified via --context flag",
-			kubeconfig: `apiVersion: v1
-kind: Config
-current-context: default-context
-contexts:
-- name: default-context
-  context:
-    cluster: my-cluster
-    namespace: default-ns
-- name: other-context
-  context:
-    cluster: my-cluster
-    namespace: other-ns
-clusters:
-- name: my-cluster
-  cluster:
-    server: https://localhost:6443
-`,
-			context:        "other-context",
-			expectedResult: "other-ns",
-		},
-		{
-			name: "returns empty when context does not exist",
-			kubeconfig: `apiVersion: v1
-kind: Config
-current-context: non-existent
-contexts: []
-clusters: []
-`,
-			expectedResult: "",
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			g := NewWithT(t)
-
-			// Write temporary kubeconfig.
-			tmpDir := t.TempDir()
-			kcPath := filepath.Join(tmpDir, "kubeconfig")
-			g.Expect(os.WriteFile(kcPath, []byte(tt.kubeconfig), 0o600)).To(Succeed())
-
-			// Use a local ConfigFlags instance to avoid polluting the
-			// package-global kubeconfigArgs (which caches a clientConfig
-			// internally and would leak state across tests).
-			cf := genericclioptions.NewConfigFlags(false)
-			cf.KubeConfig = &kcPath
-			cf.Context = &tt.context
-
-			got := getKubeconfigContextNamespace(cf)
-			g.Expect(got).To(Equal(tt.expectedResult))
-		})
-	}
-}
-
-func TestContextNamespaceOptIn(t *testing.T) {
-	kubeconfig := `apiVersion: v1
-kind: Config
-current-context: my-context
-contexts:
-- name: my-context
-  context:
-    cluster: my-cluster
-    namespace: context-ns
-clusters:
-- name: my-cluster
-  cluster:
-    server: https://localhost:6443
-`
-
-	tests := []struct {
-		name              string
-		nsFollowsFlag     bool
-		nsFollowsEnv      string
-		envNamespace      string
-		flagNamespace     string
-		expectedNamespace string
-	}{
-		{
-			name:              "ignores context namespace when not opted in",
-			expectedNamespace: rootArgs.defaults.Namespace,
-		},
-		{
-			name:              "uses context namespace when opted in via flag",
-			nsFollowsFlag:     true,
-			expectedNamespace: "context-ns",
-		},
-		{
-			name:              "uses context namespace when opted in via env var",
-			nsFollowsEnv:      "1",
-			expectedNamespace: "context-ns",
-		},
-		{
-			name:              "context namespace takes precedence over FLUX_SYSTEM_NAMESPACE when opted in",
-			nsFollowsFlag:     true,
-			envNamespace:      "env-ns",
-			expectedNamespace: "context-ns",
-		},
-		{
-			name:              "FLUX_SYSTEM_NAMESPACE used when not opted in",
-			envNamespace:      "env-ns",
-			expectedNamespace: "env-ns",
-		},
-		{
-			name:              "--namespace flag takes precedence over context namespace",
-			nsFollowsFlag:     true,
-			flagNamespace:     "flag-ns",
-			expectedNamespace: "flag-ns",
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			g := NewWithT(t)
-
-			// Write temporary kubeconfig.
-			tmpDir := t.TempDir()
-			kcPath := filepath.Join(tmpDir, "kubeconfig")
-			g.Expect(os.WriteFile(kcPath, []byte(kubeconfig), 0o600)).To(Succeed())
-
-			// Use a local ConfigFlags instance to avoid polluting the
-			// package-global kubeconfigArgs.
-			cf := genericclioptions.NewConfigFlags(false)
-			cf.KubeConfig = &kcPath
-			emptyCtx := ""
-			cf.Context = &emptyCtx
-
-			// Mirror configureDefaultNamespace behavior on the local instance.
-			defaultNs := rootArgs.defaults.Namespace
-			cf.Namespace = &defaultNs
-
-			if tt.envNamespace != "" {
-				t.Setenv("FLUX_SYSTEM_NAMESPACE", tt.envNamespace)
-				envNs := tt.envNamespace
-				cf.Namespace = &envNs
-			}
-			if tt.nsFollowsEnv != "" {
-				t.Setenv("FLUX_NS_FOLLOWS_KUBE_CONTEXT", tt.nsFollowsEnv)
-			}
-
-			// Simulate PersistentPreRunE behavior.
-			if tt.flagNamespace != "" {
-				*cf.Namespace = tt.flagNamespace
-			} else if tt.nsFollowsFlag || os.Getenv("FLUX_NS_FOLLOWS_KUBE_CONTEXT") != "" {
-				if ctxNs := getKubeconfigContextNamespace(cf); ctxNs != "" {
-					*cf.Namespace = ctxNs
-				}
-			}
-
-			g.Expect(*cf.Namespace).To(Equal(tt.expectedNamespace))
-		})
-	}
-}

cmd/flux/main_test.go

@@ -374,12 +374,6 @@ func executeCommand(cmd string) (string, error) {
 		// in subsequent executions which causes tests to fail that rely on the value
 		// of "Changed".
 		resumeCmd.PersistentFlags().Lookup("wait").Changed = false
-		// Reset the help flag value and Changed state so that a prior
-		// "--help" invocation does not leak into subsequent test runs.
-		if hf := rootCmd.Flags().Lookup("help"); hf != nil {
-			hf.Value.Set("false")
-			hf.Changed = false
-		}
 	}()
 	args, err := shellwords.Parse(cmd)
 	if err != nil {

cmd/flux/plugin.go

@@ -1,118 +0,0 @@
-/*
-Copyright 2026 The Flux authors
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package main
-
-import (
-	"fmt"
-	"strings"
-	"time"
-
-	"github.com/briandowns/spinner"
-	"github.com/spf13/cobra"
-
-	"github.com/fluxcd/flux2/v2/internal/plugin"
-)
-
-var pluginHandler = plugin.NewHandler()
-
-var pluginCmd = &cobra.Command{
-	Use:   "plugin",
-	Short: "Manage Flux CLI plugins",
-	Long:  `The plugin sub-commands manage Flux CLI plugins.`,
-	PersistentPreRunE: func(cmd *cobra.Command, args []string) error {
-		// No-op: skip root's namespace DNS validation for plugin commands.
-		return nil
-	},
-}
-
-func init() {
-	rootCmd.AddCommand(pluginCmd)
-}
-
-// builtinCommandNames returns the names of all non-plugin commands on rootCmd.
-func builtinCommandNames() []string {
-	var names []string
-	for _, c := range rootCmd.Commands() {
-		if c.GroupID != "plugin" {
-			names = append(names, c.Name())
-		}
-	}
-	return names
-}
-
-// registerPlugins scans the plugin directory and registers discovered
-// plugins as Cobra subcommands on rootCmd.
-func registerPlugins() {
-	plugins := pluginHandler.Discover(builtinCommandNames())
-	if len(plugins) == 0 {
-		return
-	}
-
-	if !rootCmd.ContainsGroup("plugin") {
-		rootCmd.AddGroup(&cobra.Group{
-			ID:    "plugin",
-			Title: "Plugin Commands:",
-		})
-	}
-
-	for _, p := range plugins {
-		cmd := &cobra.Command{
-			Use:                p.Name,
-			Short:              fmt.Sprintf("Runs the %s plugin", p.Name),
-			Long:               fmt.Sprintf("This command runs the %s plugin.\nUse 'flux %s --help' for full plugin help.", p.Name, p.Name),
-			DisableFlagParsing: true,
-			GroupID:            "plugin",
-			ValidArgsFunction:  plugin.CompleteFunc(p.Path),
-			PersistentPreRunE: func(cmd *cobra.Command, args []string) error {
-				return nil
-			},
-			RunE: func(cmd *cobra.Command, args []string) error {
-				return plugin.Exec(p.Path, args)
-			},
-		}
-		rootCmd.AddCommand(cmd)
-	}
-}
-
-// parseNameVersion splits "operator@0.45.0" into ("operator", "0.45.0").
-// If no @ is present, version is empty (latest).
-func parseNameVersion(s string) (string, string) {
-	name, version, found := strings.Cut(s, "@")
-	if found {
-		return name, version
-	}
-	return s, ""
-}
-
-// isDigestRef reports whether ref is a content-addressable digest
-// (e.g. "sha256:06e0a38...").
-func isDigestRef(ref string) bool {
-	return strings.HasPrefix(ref, "sha256:")
-}
-
-// newCatalogClient creates a CatalogClient that respects FLUXCD_PLUGIN_CATALOG.
-func newCatalogClient() *plugin.CatalogClient {
-	client := plugin.NewCatalogClient()
-	client.GetEnv = pluginHandler.GetEnv
-	return client
-}
-
-func newPluginSpinner(message string) *spinner.Spinner {
-	s := spinner.New(spinner.CharSets[14], 100*time.Millisecond)
-	s.Suffix = " " + message
-	return s
-}

cmd/flux/plugin_install.go

@@ -1,96 +0,0 @@
-/*
-Copyright 2026 The Flux authors
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package main
-
-import (
-	"fmt"
-	"runtime"
-
-	"github.com/spf13/cobra"
-
-	"github.com/fluxcd/flux2/v2/internal/plugin"
-	plugintypes "github.com/fluxcd/flux2/v2/pkg/plugin"
-)
-
-var pluginInstallCmd = &cobra.Command{
-	Use:   "install <name>[@<version>|@<digest>]",
-	Short: "Install a plugin from the catalog",
-	Long: `The plugin install command downloads and installs a plugin from the Flux plugin catalog.
-
-Examples:
-  # Install the latest version
-  flux plugin install operator
-
-  # Install a specific version
-  flux plugin install operator@0.45.0
-
-  # Install pinned to a specific digest
-  flux plugin install operator@sha256:06e0a38db4fa6bc9f705a577c7e58dc020bfe2618e45488599e5ef7bb62e3a8a`,
-	Args: cobra.ExactArgs(1),
-	RunE: pluginInstallCmdRun,
-}
-
-func init() {
-	pluginCmd.AddCommand(pluginInstallCmd)
-}
-
-func pluginInstallCmdRun(cmd *cobra.Command, args []string) error {
-	nameVersion := args[0]
-	name, ref := parseNameVersion(nameVersion)
-
-	catalogClient := newCatalogClient()
-	manifest, err := catalogClient.FetchManifest(name)
-	if err != nil {
-		return err
-	}
-
-	var pv *plugintypes.Version
-	var plat *plugintypes.Platform
-
-	if isDigestRef(ref) {
-		dm, err := plugin.ResolveByDigest(manifest, ref, runtime.GOOS, runtime.GOARCH)
-		if err != nil {
-			return err
-		}
-		pv = dm.Version
-		plat = dm.Platform
-	} else {
-		pv, err = plugin.ResolveVersion(manifest, ref)
-		if err != nil {
-			return err
-		}
-
-		plat, err = plugin.ResolvePlatform(pv, runtime.GOOS, runtime.GOARCH)
-		if err != nil {
-			return fmt.Errorf("plugin %q v%s has no binary for %s/%s", name, pv.Version, runtime.GOOS, runtime.GOARCH)
-		}
-	}
-
-	pluginDir := pluginHandler.EnsurePluginDir()
-
-	installer := plugin.NewInstaller()
-	sp := newPluginSpinner(fmt.Sprintf("installing %s v%s", name, pv.Version))
-	sp.Start()
-	if err := installer.Install(pluginDir, manifest, pv, plat); err != nil {
-		sp.Stop()
-		return err
-	}
-	sp.Stop()
-
-	logger.Successf("installed %s v%s", name, pv.Version)
-	return nil
-}

cmd/flux/plugin_list.go

@@ -1,57 +0,0 @@
-/*
-Copyright 2026 The Flux authors
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package main
-
-import (
-	"github.com/spf13/cobra"
-
-	"github.com/fluxcd/flux2/v2/internal/plugin"
-	"github.com/fluxcd/flux2/v2/pkg/printers"
-)
-
-var pluginListCmd = &cobra.Command{
-	Use:     "list",
-	Aliases: []string{"ls"},
-	Short:   "List installed plugins",
-	Long:    `The plugin list command shows all installed plugins with their versions and paths.`,
-	RunE:    pluginListCmdRun,
-}
-
-func init() {
-	pluginCmd.AddCommand(pluginListCmd)
-}
-
-func pluginListCmdRun(cmd *cobra.Command, args []string) error {
-	pluginDir := pluginHandler.PluginDir()
-	plugins := pluginHandler.Discover(builtinCommandNames())
-	if len(plugins) == 0 {
-		cmd.Println("No plugins found")
-		return nil
-	}
-
-	header := []string{"NAME", "VERSION", "PATH"}
-	var rows [][]string
-	for _, p := range plugins {
-		version := "manual"
-		if receipt := plugin.ReadReceipt(pluginDir, p.Name); receipt != nil {
-			version = receipt.Version
-		}
-		rows = append(rows, []string{p.Name, version, p.Path})
-	}
-
-	return printers.TablePrinter(header).Print(cmd.OutOrStdout(), rows)
-}

cmd/flux/plugin_search.go

@@ -1,81 +0,0 @@
-/*
-Copyright 2026 The Flux authors
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package main
-
-import (
-	"strings"
-
-	"github.com/spf13/cobra"
-
-	"github.com/fluxcd/flux2/v2/internal/plugin"
-	"github.com/fluxcd/flux2/v2/pkg/printers"
-)
-
-var pluginSearchCmd = &cobra.Command{
-	Use:   "search [query]",
-	Short: "Search the plugin catalog",
-	Long:  `The plugin search command lists available plugins from the Flux plugin catalog.`,
-	Args:  cobra.MaximumNArgs(1),
-	RunE:  pluginSearchCmdRun,
-}
-
-func init() {
-	pluginCmd.AddCommand(pluginSearchCmd)
-}
-
-func pluginSearchCmdRun(cmd *cobra.Command, args []string) error {
-	catalogClient := newCatalogClient()
-	catalog, err := catalogClient.FetchCatalog()
-	if err != nil {
-		return err
-	}
-
-	var query string
-	if len(args) == 1 {
-		query = strings.ToLower(args[0])
-	}
-
-	pluginDir := pluginHandler.PluginDir()
-	header := []string{"NAME", "DESCRIPTION", "INSTALLED"}
-	var rows [][]string
-	for _, entry := range catalog.Plugins {
-		if query != "" {
-			if !strings.Contains(strings.ToLower(entry.Name), query) &&
-				!strings.Contains(strings.ToLower(entry.Description), query) {
-				continue
-			}
-		}
-
-		installed := ""
-		if receipt := plugin.ReadReceipt(pluginDir, entry.Name); receipt != nil {
-			installed = receipt.Version
-		}
-
-		rows = append(rows, []string{entry.Name, entry.Description, installed})
-	}
-
-	if len(rows) == 0 {
-		if query != "" {
-			cmd.Printf("No plugins matching %q found in catalog\n", query)
-		} else {
-			cmd.Println("No plugins found in catalog")
-		}
-		return nil
-	}
-
-	return printers.TablePrinter(header).Print(cmd.OutOrStdout(), rows)
-}

cmd/flux/plugin_test.go

@@ -1,286 +0,0 @@
-/*
-Copyright 2026 The Flux authors
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package main
-
-import (
-	"fmt"
-	"os"
-	"strings"
-	"testing"
-
-	"github.com/fluxcd/flux2/v2/internal/plugin"
-)
-
-func TestPluginAppearsInHelp(t *testing.T) {
-	origHandler := pluginHandler
-	defer func() { pluginHandler = origHandler }()
-
-	pluginDir := t.TempDir()
-
-	fakeBin := pluginDir + "/flux-testplugin"
-	os.WriteFile(fakeBin, []byte("#!/bin/sh\necho test"), 0o755)
-
-	pluginHandler = &plugin.Handler{
-		ReadDir: os.ReadDir,
-		Stat:    os.Stat,
-		GetEnv: func(key string) string {
-			if key == "FLUXCD_PLUGINS" {
-				return pluginDir
-			}
-			return ""
-		},
-		HomeDir: func() (string, error) { return t.TempDir(), nil },
-	}
-
-	registerPlugins()
-	defer func() {
-		cmds := rootCmd.Commands()
-		for _, cmd := range cmds {
-			if cmd.Name() == "testplugin" {
-				rootCmd.RemoveCommand(cmd)
-				break
-			}
-		}
-	}()
-
-	output, err := executeCommand("--help")
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-
-	if !strings.Contains(output, "Plugin Commands:") {
-		t.Error("expected 'Plugin Commands:' in help output")
-	}
-	if !strings.Contains(output, "testplugin") {
-		t.Error("expected 'testplugin' in help output")
-	}
-}
-
-func TestPluginListOutput(t *testing.T) {
-	origHandler := pluginHandler
-	defer func() { pluginHandler = origHandler }()
-
-	pluginDir := t.TempDir()
-
-	fakeBin := pluginDir + "/flux-myplugin"
-	os.WriteFile(fakeBin, []byte("#!/bin/sh\necho test"), 0o755)
-
-	pluginHandler = &plugin.Handler{
-		ReadDir: os.ReadDir,
-		Stat:    os.Stat,
-		GetEnv: func(key string) string {
-			if key == "FLUXCD_PLUGINS" {
-				return pluginDir
-			}
-			return ""
-		},
-		HomeDir: func() (string, error) { return t.TempDir(), nil },
-	}
-
-	output, err := executeCommand("plugin list")
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-
-	if !strings.Contains(output, "myplugin") {
-		t.Errorf("expected 'myplugin' in output, got: %s", output)
-	}
-	if !strings.Contains(output, "manual") {
-		t.Errorf("expected 'manual' in output (no receipt), got: %s", output)
-	}
-}
-
-func TestPluginListWithReceipt(t *testing.T) {
-	origHandler := pluginHandler
-	defer func() { pluginHandler = origHandler }()
-
-	pluginDir := t.TempDir()
-
-	fakeBin := pluginDir + "/flux-myplugin"
-	os.WriteFile(fakeBin, []byte("#!/bin/sh\necho test"), 0o755)
-	receipt := pluginDir + "/flux-myplugin.yaml"
-	os.WriteFile(receipt, []byte("name: myplugin\nversion: \"1.2.3\"\n"), 0o644)
-
-	pluginHandler = &plugin.Handler{
-		ReadDir: os.ReadDir,
-		Stat:    os.Stat,
-		GetEnv: func(key string) string {
-			if key == "FLUXCD_PLUGINS" {
-				return pluginDir
-			}
-			return ""
-		},
-		HomeDir: func() (string, error) { return t.TempDir(), nil },
-	}
-
-	output, err := executeCommand("plugin list")
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-
-	if !strings.Contains(output, "1.2.3") {
-		t.Errorf("expected version '1.2.3' in output, got: %s", output)
-	}
-}
-
-func TestPluginListEmpty(t *testing.T) {
-	origHandler := pluginHandler
-	defer func() { pluginHandler = origHandler }()
-
-	pluginDir := t.TempDir()
-
-	pluginHandler = &plugin.Handler{
-		ReadDir: os.ReadDir,
-		Stat:    os.Stat,
-		GetEnv: func(key string) string {
-			if key == "FLUXCD_PLUGINS" {
-				return pluginDir
-			}
-			return ""
-		},
-		HomeDir: func() (string, error) { return t.TempDir(), nil },
-	}
-
-	output, err := executeCommand("plugin list")
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-
-	if !strings.Contains(output, "No plugins found") {
-		t.Errorf("expected 'No plugins found', got: %s", output)
-	}
-}
-
-func TestNoPluginsNoRegistration(t *testing.T) {
-	origHandler := pluginHandler
-	defer func() { pluginHandler = origHandler }()
-
-	pluginHandler = &plugin.Handler{
-		ReadDir: func(name string) ([]os.DirEntry, error) {
-			return nil, fmt.Errorf("no dir")
-		},
-		Stat: os.Stat,
-		GetEnv: func(key string) string {
-			if key == "FLUXCD_PLUGINS" {
-				return "/nonexistent"
-			}
-			return ""
-		},
-		HomeDir: func() (string, error) { return t.TempDir(), nil },
-	}
-
-	// Verify that registerPlugins with no plugins doesn't add any commands.
-	before := len(rootCmd.Commands())
-	registerPlugins()
-	after := len(rootCmd.Commands())
-	if after != before {
-		t.Errorf("expected no new commands, got %d new", after-before)
-	}
-}
-
-func TestPluginSkipsPersistentPreRun(t *testing.T) {
-	// Plugin commands override root's PersistentPreRunE with a no-op,
-	// so an invalid namespace should not trigger a validation error.
-	_, err := executeCommand("plugin list")
-	if err != nil {
-		t.Fatalf("plugin list should not trigger root's namespace validation: %v", err)
-	}
-}
-
-func TestParseNameVersion(t *testing.T) {
-	tests := []struct {
-		input       string
-		wantName    string
-		wantVersion string
-	}{
-		{"operator", "operator", ""},
-		{"operator@0.45.0", "operator", "0.45.0"},
-		{"my-tool@1.0.0", "my-tool", "1.0.0"},
-		{"plugin@", "plugin", ""},
-		{"operator@sha256:abc123", "operator", "sha256:abc123"},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.input, func(t *testing.T) {
-			name, version := parseNameVersion(tt.input)
-			if name != tt.wantName {
-				t.Errorf("name: got %q, want %q", name, tt.wantName)
-			}
-			if version != tt.wantVersion {
-				t.Errorf("version: got %q, want %q", version, tt.wantVersion)
-			}
-		})
-	}
-}
-
-func TestIsDigestRef(t *testing.T) {
-	tests := []struct {
-		input string
-		want  bool
-	}{
-		{"sha256:06e0a38db4fa6bc9f705a577c7e58dc020bfe2618e45488599e5ef7bb62e3a8a", true},
-		{"0.45.0", false},
-		{"", false},
-		{"sha256", false},
-		{"SHA256:abc", false}, // case-sensitive
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.input, func(t *testing.T) {
-			if got := isDigestRef(tt.input); got != tt.want {
-				t.Errorf("isDigestRef(%q) = %v, want %v", tt.input, got, tt.want)
-			}
-		})
-	}
-}
-
-func TestPluginDiscoverSkipsBuiltins(t *testing.T) {
-	origHandler := pluginHandler
-	defer func() { pluginHandler = origHandler }()
-
-	pluginDir := t.TempDir()
-
-	for _, name := range []string{"flux-get", "flux-create", "flux-version"} {
-		os.WriteFile(pluginDir+"/"+name, []byte("#!/bin/sh"), 0o755)
-	}
-	os.WriteFile(pluginDir+"/flux-myplugin", []byte("#!/bin/sh"), 0o755)
-
-	pluginHandler = &plugin.Handler{
-		ReadDir: os.ReadDir,
-		Stat:    os.Stat,
-		GetEnv: func(key string) string {
-			if key == "FLUXCD_PLUGINS" {
-				return pluginDir
-			}
-			return ""
-		},
-		HomeDir: func() (string, error) { return t.TempDir(), nil },
-	}
-
-	plugins := pluginHandler.Discover(builtinCommandNames())
-
-	if len(plugins) != 1 {
-		names := make([]string, len(plugins))
-		for i, p := range plugins {
-			names[i] = p.Name
-		}
-		t.Fatalf("expected 1 plugin, got %d: %v", len(plugins), names)
-	}
-	if plugins[0].Name != "myplugin" {
-		t.Errorf("expected 'myplugin', got %q", plugins[0].Name)
-	}
-}

cmd/flux/plugin_uninstall.go

@@ -1,48 +0,0 @@
-/*
-Copyright 2026 The Flux authors
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package main
-
-import (
-	"github.com/spf13/cobra"
-
-	"github.com/fluxcd/flux2/v2/internal/plugin"
-)
-
-var pluginUninstallCmd = &cobra.Command{
-	Use:     "uninstall <name>",
-	Aliases: []string{"delete"},
-	Short:   "Uninstall a plugin",
-	Long:    `The plugin uninstall command removes a plugin binary and its receipt from the plugin directory.`,
-	Args:    cobra.ExactArgs(1),
-	RunE:    pluginUninstallCmdRun,
-}
-
-func init() {
-	pluginCmd.AddCommand(pluginUninstallCmd)
-}
-
-func pluginUninstallCmdRun(cmd *cobra.Command, args []string) error {
-	name := args[0]
-	pluginDir := pluginHandler.PluginDir()
-
-	if err := plugin.Uninstall(pluginDir, name); err != nil {
-		return err
-	}
-
-	logger.Successf("uninstalled %s", name)
-	return nil
-}

cmd/flux/plugin_update.go

@@ -1,102 +0,0 @@
-/*
-Copyright 2026 The Flux authors
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package main
-
-import (
-	"fmt"
-	"runtime"
-
-	"github.com/spf13/cobra"
-
-	"github.com/fluxcd/flux2/v2/internal/plugin"
-)
-
-var pluginUpdateCmd = &cobra.Command{
-	Use:     "update [name]",
-	Aliases: []string{"upgrade"},
-	Short:   "Update installed plugins",
-	Long: `The plugin update command updates installed plugins to their latest versions.
-
-Examples:
-  # Update a single plugin
-  flux plugin update operator
-
-  # Update all installed plugins
-  flux plugin update`,
-	Args: cobra.MaximumNArgs(1),
-	RunE: pluginUpdateCmdRun,
-}
-
-func init() {
-	pluginCmd.AddCommand(pluginUpdateCmd)
-}
-
-func pluginUpdateCmdRun(cmd *cobra.Command, args []string) error {
-	catalogClient := newCatalogClient()
-
-	plugins := pluginHandler.Discover(builtinCommandNames())
-	if len(plugins) == 0 {
-		cmd.Println("No plugins found")
-		return nil
-	}
-
-	// If a specific plugin is requested, filter to just that one.
-	if len(args) == 1 {
-		name := args[0]
-		var found bool
-		for _, p := range plugins {
-			if p.Name == name {
-				plugins = []plugin.Plugin{p}
-				found = true
-				break
-			}
-		}
-		if !found {
-			return fmt.Errorf("plugin %q is not installed", name)
-		}
-	}
-
-	pluginDir := pluginHandler.EnsurePluginDir()
-	installer := plugin.NewInstaller()
-	for _, p := range plugins {
-		result := plugin.CheckUpdate(pluginDir, p.Name, catalogClient, runtime.GOOS, runtime.GOARCH)
-		if result.Err != nil {
-			logger.Failuref("error checking %s: %v", p.Name, result.Err)
-			continue
-		}
-		if result.Skipped {
-			if result.SkipReason == plugin.SkipReasonManual {
-				logger.Warningf("skipping %s (%s)", p.Name, result.SkipReason)
-			} else {
-				logger.Successf("%s already up to date (v%s)", p.Name, result.FromVersion)
-			}
-			continue
-		}
-
-		sp := newPluginSpinner(fmt.Sprintf("updating %s v%s → v%s", p.Name, result.FromVersion, result.ToVersion))
-		sp.Start()
-		if err := installer.Install(pluginDir, result.Manifest, result.Version, result.Platform); err != nil {
-			sp.Stop()
-			logger.Failuref("error updating %s: %v", p.Name, err)
-			continue
-		}
-		sp.Stop()
-		logger.Successf("updated %s v%s → v%s", p.Name, result.FromVersion, result.ToVersion)
-	}
-
-	return nil
-}

cmd/flux/push_artifact.go

@@ -103,18 +103,17 @@ The command can read the credentials from '~/.docker/config.json' but they can a
 }
 
 type pushArtifactFlags struct {
-	path            string
-	source          string
-	revision        string
-	creds           string
-	provider        flags.SourceOCIProvider
-	ignorePaths     []string
-	annotations     []string
-	output          string
-	debug           bool
-	reproducible    bool
-	insecure        bool
-	resolveSymlinks bool
+	path         string
+	source       string
+	revision     string
+	creds        string
+	provider     flags.SourceOCIProvider
+	ignorePaths  []string
+	annotations  []string
+	output       string
+	debug        bool
+	reproducible bool
+	insecure     bool
 }
 
 var pushArtifactArgs = newPushArtifactFlags()
@@ -138,7 +137,6 @@ func init() {
 	pushArtifactCmd.Flags().BoolVarP(&pushArtifactArgs.debug, "debug", "", false, "display logs from underlying library")
 	pushArtifactCmd.Flags().BoolVar(&pushArtifactArgs.reproducible, "reproducible", false, "ensure reproducible image digests by setting the created timestamp to '1970-01-01T00:00:00Z'")
 	pushArtifactCmd.Flags().BoolVar(&pushArtifactArgs.insecure, "insecure-registry", false, "allows artifacts to be pushed without TLS")
-	pushArtifactCmd.Flags().BoolVar(&pushArtifactArgs.resolveSymlinks, "resolve-symlinks", false, "resolve symlinks by copying their targets into the artifact")
 
 	pushCmd.AddCommand(pushArtifactCmd)
 }
@@ -185,15 +183,6 @@ func pushArtifactCmdRun(cmd *cobra.Command, args []string) error {
 		return fmt.Errorf("invalid path '%s', must point to an existing directory or file: %w", path, err)
 	}
 
-	if pushArtifactArgs.resolveSymlinks {
-		resolved, cleanupDir, err := resolveSymlinks(path)
-		if err != nil {
-			return fmt.Errorf("resolving symlinks failed: %w", err)
-		}
-		defer os.RemoveAll(cleanupDir)
-		path = resolved
-	}
-
 	annotations := map[string]string{}
 	for _, annotation := range pushArtifactArgs.annotations {
 		kv := strings.Split(annotation, "=")

cmd/flux/reconcile.go

@@ -152,14 +152,7 @@ func reconciliationHandled(kubeClient client.Client, namespacedName types.Namesp
 			return false, err
 		}
 
-		switch result.Status {
-		case kstatus.CurrentStatus:
-			return true, nil
-		case kstatus.InProgressStatus:
-			return false, nil
-		default:
-			return false, fmt.Errorf("%s", result.Message)
-		}
+		return result.Status == kstatus.CurrentStatus, nil
 	}
 }
 

cmd/flux/resume.go

@@ -126,17 +126,6 @@ func (resume resumeCommand) run(cmd *cobra.Command, args []string) error {
 
 	resume.printMessage(reconcileResps)
 
-	// Return an error if any reconciliation failed
-	var failedCount int
-	for _, r := range reconcileResps {
-		if r.resumable != nil && r.err != nil {
-			failedCount++
-		}
-	}
-	if failedCount > 0 {
-		return fmt.Errorf("reconciliation failed for %d %s(s)", failedCount, resume.kind)
-	}
-
 	return nil
 }
 

cmd/flux/testdata/bootstrap/ed25519-encrypted.private

@@ -1,8 +0,0 @@
------BEGIN OPENSSH PRIVATE KEY-----
-b3BlbnNzaC1rZXktdjEAAAAACmFlczI1Ni1jdHIAAAAGYmNyeXB0AAAAGAAAABDuUiEMA0
-eUvKlmOsur2w9FAAAAGAAAAAEAAAAzAAAAC3NzaC1lZDI1NTE5AAAAIDF/w86ZQb5qmZtv
-m1GvyLojiJdhmPtI9hJ9XPcP7HBoAAAAkG2cIOuSVdWInSC0P81ExiorUpiAGOjxxpgvKW
-VYERfU1zU72Z/c9n1+z/IH5cJOhZ1vlqBO0rubl4s0KQFvY/LKcsc4N0x0uzpqrvcJP4tO
-9VW8LrMnrPp7b6KVJPsbeSW1SBcUM24aCMzF4/wV03mN/Uqz30s+YgS9SU4Lz8AOkX58xX
-yAV0gkmndIzZl+Og==
------END OPENSSH PRIVATE KEY-----

cmd/flux/testdata/bootstrap/ed25519.private

@@ -1,7 +0,0 @@
------BEGIN OPENSSH PRIVATE KEY-----
-b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW
-QyNTUxOQAAACAWDldtCFdSMXIV1vLwXvRwk4eEmSoDCpxNkcbNph3dCAAAAIjjSDmx40g5
-sQAAAAtzc2gtZWQyNTUxOQAAACAWDldtCFdSMXIV1vLwXvRwk4eEmSoDCpxNkcbNph3dCA
-AAAEAGpzSFuLkCNDD49+tysxSFFwdOsRnDj67vDT9bfwoSDhYOV20IV1IxchXW8vBe9HCT
-h4SZKgMKnE2Rxs2mHd0IAAAABHRlc3QB
------END OPENSSH PRIVATE KEY-----

cmd/flux/testdata/bootstrap/malformed.private

@@ -1 +0,0 @@
-not a real ssh key

cmd/flux/testdata/build-kustomization/configmaps/existing.yaml

@@ -1,7 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: existing-config
-  namespace: default
-data:
-  key: value

cmd/flux/testdata/build-kustomization/configmaps/kustomization.yaml

@@ -1,5 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
-- ./existing.yaml
-- ./new.yaml

cmd/flux/testdata/build-kustomization/configmaps/new.yaml

@@ -1,7 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: new-config
-  namespace: default
-data:
-  key: value

cmd/flux/testdata/build-kustomization/new-namespace-and-configmap/configmap.yaml

@@ -1,7 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: app-config
-  namespace: new-ns
-data:
-  key: value

cmd/flux/testdata/build-kustomization/new-namespace-and-configmap/kustomization.yaml

@@ -1,5 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
-- ./namespace.yaml
-- ./configmap.yaml

cmd/flux/testdata/build-kustomization/new-namespace-and-configmap/namespace.yaml

@@ -1,4 +0,0 @@
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: new-ns

cmd/flux/testdata/build-kustomization/new-namespace-only/kustomization.yaml

@@ -1,4 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
-- ./namespace.yaml

cmd/flux/testdata/build-kustomization/new-namespace-only/namespace.yaml

@@ -1,4 +0,0 @@
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: new-ns

cmd/flux/testdata/create_image_update/no-signing.yaml

@@ -1,19 +0,0 @@
----
-apiVersion: image.toolkit.fluxcd.io/v1
-kind: ImageUpdateAutomation
-metadata:
-  name: flux-system
-  namespace: flux-system
-spec:
-  git:
-    checkout:
-      ref:
-        branch: main
-    commit:
-      author:
-        email: flux@example.com
-        name: flux
-  interval: 1m0s
-  sourceRef:
-    kind: GitRepository
-    name: flux-system

cmd/flux/testdata/create_image_update/signing-default-gpg.yaml

@@ -1,22 +0,0 @@
----
-apiVersion: image.toolkit.fluxcd.io/v1
-kind: ImageUpdateAutomation
-metadata:
-  name: flux-system
-  namespace: flux-system
-spec:
-  git:
-    checkout:
-      ref:
-        branch: main
-    commit:
-      author:
-        email: flux@example.com
-        name: flux
-      signingKey:
-        secretRef:
-          name: my-key
-  interval: 1m0s
-  sourceRef:
-    kind: GitRepository
-    name: flux-system

cmd/flux/testdata/create_image_update/signing-ssh.yaml

@@ -1,23 +0,0 @@
----
-apiVersion: image.toolkit.fluxcd.io/v1
-kind: ImageUpdateAutomation
-metadata:
-  name: flux-system
-  namespace: flux-system
-spec:
-  git:
-    checkout:
-      ref:
-        branch: main
-    commit:
-      author:
-        email: flux@example.com
-        name: flux
-      signingKey:
-        secretRef:
-          name: my-deploy-key
-        type: ssh
-  interval: 1m0s
-  sourceRef:
-    kind: GitRepository
-    name: flux-system

cmd/flux/testdata/diff-kustomization/diff-new-namespace-only.golden

@@ -1 +0,0 @@
-► Namespace/new-ns created

cmd/flux/testdata/diff-kustomization/diff-taking-ownership.golden

@@ -1,9 +0,0 @@
-► ConfigMap/default/existing-config drifted
-
-metadata
-+ one map entry added:
-  labels:
-    kustomize.toolkit.fluxcd.io/name: configmaps
-    kustomize.toolkit.fluxcd.io/namespace:
-
-► ConfigMap/default/new-config created

cmd/flux/testdata/diff-kustomization/diff-with-drift-ignore.golden

@@ -1,14 +0,0 @@
-► Deployment/default/podinfo created
-► HorizontalPodAutoscaler/default/podinfo created
-► Service/default/podinfo drifted
-
-metadata
-+ one map entry added:
-  labels:
-    kustomize.toolkit.fluxcd.io/name: podinfo
-    kustomize.toolkit.fluxcd.io/namespace:
-
-► Secret/default/docker-secret created
-► Secret/default/secret-basic-auth-stringdata created
-► Secret/default/podinfo-token-77t89m9b67 created
-► Secret/default/db-user-pass-bkbd782d2c created

cmd/flux/testdata/diff-kustomization/drifted-service-no-labels.yaml

@@ -1,18 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: podinfo
-  namespace: default
-spec:
-  type: ClusterIP
-  selector:
-    app: podinfo
-  ports:
-    - name: http
-      port: 9899
-      protocol: TCP
-      targetPort: http
-    - port: 9999
-      targetPort: grpc
-      protocol: TCP
-      name: grpc

cmd/flux/testdata/diff-kustomization/existing-configmap.yaml

@@ -1,7 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: existing-config
-  namespace: default
-data:
-  key: value

cmd/flux/testdata/diff-kustomization/flux-kustomization-configmaps.yaml

@@ -1,14 +0,0 @@
----
-apiVersion: kustomize.toolkit.fluxcd.io/v1
-kind: Kustomization
-metadata:
-  name: configmaps
-spec:
-  interval: 5m0s
-  path: ./kustomize
-  force: true
-  prune: true
-  sourceRef:
-    kind: GitRepository
-    name: configmaps
-  targetNamespace: default

cmd/flux/testdata/diff-kustomization/flux-kustomization-drift-ignore.yaml

@@ -1,19 +0,0 @@
----
-apiVersion: kustomize.toolkit.fluxcd.io/v1
-kind: Kustomization
-metadata:
-  name: podinfo
-spec:
-  interval: 5m0s
-  path: ./kustomize
-  force: true
-  prune: true
-  sourceRef:
-    kind: GitRepository
-    name: podinfo
-  targetNamespace: default
-  ignore:
-    - paths:
-        - "/spec/ports"
-      target:
-        kind: Service

cmd/flux/testdata/diff-kustomization/flux-kustomization-local-only.yaml

@@ -1,14 +0,0 @@
----
-apiVersion: kustomize.toolkit.fluxcd.io/v1
-kind: Kustomization
-metadata:
-  name: podinfo
-spec:
-  interval: 5m0s
-  path: ./kustomize
-  force: true
-  prune: true
-  sourceRef:
-    kind: GitRepository
-    name: podinfo
-  targetNamespace: default

cmd/flux/testdata/diff-kustomization/flux-kustomization-new-namespace-and-configmap.yaml

@@ -1,13 +0,0 @@
----
-apiVersion: kustomize.toolkit.fluxcd.io/v1
-kind: Kustomization
-metadata:
-  name: new-namespace-and-configmap
-spec:
-  interval: 5m0s
-  path: ./kustomize
-  force: true
-  prune: true
-  sourceRef:
-    kind: GitRepository
-    name: new-namespace-and-configmap

cmd/flux/testdata/diff-kustomization/flux-kustomization-new-namespace-only.yaml

@@ -1,13 +0,0 @@
----
-apiVersion: kustomize.toolkit.fluxcd.io/v1
-kind: Kustomization
-metadata:
-  name: new-namespace-only
-spec:
-  interval: 5m0s
-  path: ./kustomize
-  force: true
-  prune: true
-  sourceRef:
-    kind: GitRepository
-    name: new-namespace-only

cmd/flux/testdata/export/image-update.yaml

@@ -10,10 +10,6 @@ spec:
       author:
         email: fluxcdbot@users.noreply.github.com
         name: fluxcdbot
-      signingKey:
-        secretRef:
-          name: my-signing-key
-        type: ssh
   interval: 1m0s
   sourceRef:
     kind: GitRepository

cmd/flux/testdata/export/objects.yaml

@@ -67,10 +67,6 @@ spec:
         email: fluxcdbot@users.noreply.github.com
         name: fluxcdbot
       messageTemplate: '{{range .Updated.Images}}{{println .}}{{end}}'
-      signingKey:
-        secretRef:
-          name: my-signing-key
-        type: ssh
   update:
     path: ./clusters/my-cluster
     strategy: Setters

cmd/flux/testdata/get/get_status_ready_false.golden

@@ -1,2 +0,0 @@
-NAME     	REVISION	SUSPENDED	READY	MESSAGE                                   
-gr-failed	        	False    	False	failed to checkout and determine revision	

cmd/flux/testdata/get/get_status_ready_not_true.golden

@@ -1,3 +0,0 @@
-NAME      	REVISION	SUSPENDED	READY  	MESSAGE                                   
-gr-failed 	        	False    	False  	failed to checkout and determine revision	
-gr-unknown	        	False    	Unknown	reconciliation in progress               	

cmd/flux/testdata/get/get_status_ready_true.golden

@@ -1,2 +0,0 @@
-NAME    	REVISION          	SUSPENDED	READY	MESSAGE                              
-gr-ready	main@sha1:696f056d	False    	True 	Fetched revision: main@sha1:696f056d	

cmd/flux/testdata/get/kustomization_only.yaml

@@ -1,26 +0,0 @@
----
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: {{ .fluxns }}
----
-apiVersion: kustomize.toolkit.fluxcd.io/v1
-kind: Kustomization
-metadata:
-  name: podinfo
-  namespace: {{ .fluxns }}
-spec:
-  interval: 5m
-  path: ./clusters/production
-  prune: true
-  sourceRef:
-    kind: GitRepository
-    name: podinfo
-status:
-  lastAppliedRevision: main@sha1:696f056df216eea4f9401adbee0ff744d4df390f
-  conditions:
-    - lastTransitionTime: "2021-08-01T04:52:56Z"
-      message: 'Applied revision: main@sha1:696f056df216eea4f9401adbee0ff744d4df390f'
-      reason: ReconciliationSucceeded
-      status: "True"
-      type: Ready

cmd/flux/testdata/get/notification_objects.yaml

@@ -1,31 +0,0 @@
----
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: {{ .fluxns }}
----
-apiVersion: notification.toolkit.fluxcd.io/v1beta3
-kind: Provider
-metadata:
-  name: slack
-  namespace: {{ .fluxns }}
-spec:
-  address: https://hooks.slack.com/services/mock
-  channel: alerts
-  type: slack
----
-apiVersion: notification.toolkit.fluxcd.io/v1beta3
-kind: Alert
-metadata:
-  name: flux-system
-  namespace: {{ .fluxns }}
-spec:
-  eventSeverity: info
-  eventSources:
-    - kind: GitRepository
-      name: '*'
-    - kind: Kustomization
-      name: '*'
-  providerRef:
-    name: slack
-  summary: Slack notification

cmd/flux/testdata/get/status_objects.yaml

@@ -1,71 +0,0 @@
----
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: {{ .fluxns }}
----
-apiVersion: source.toolkit.fluxcd.io/v1
-kind: GitRepository
-metadata:
-  name: gr-failed
-  namespace: {{ .fluxns }}
-spec:
-  ref:
-    branch: main
-  secretRef:
-    name: flux-system
-  url: ssh://git@github.com/example/repo
-  interval: 5m
-status:
-  conditions:
-    - lastTransitionTime: "2021-07-20T00:48:16Z"
-      message: 'failed to checkout and determine revision'
-      reason: GitOperationFailed
-      status: "False"
-      type: Ready
----
-apiVersion: source.toolkit.fluxcd.io/v1
-kind: GitRepository
-metadata:
-  name: gr-ready
-  namespace: {{ .fluxns }}
-spec:
-  ref:
-    branch: main
-  secretRef:
-    name: flux-system
-  url: ssh://git@github.com/example/repo
-  interval: 5m
-status:
-  artifact:
-    lastUpdateTime: "2021-08-01T04:28:42Z"
-    revision: main@sha1:696f056df216eea4f9401adbee0ff744d4df390f
-    path: "example"
-    url: "example"
-    digest: sha1:696f056df216eea4f9401adbee0ff744d4df390f
-  conditions:
-    - lastTransitionTime: "2021-07-20T00:48:16Z"
-      message: 'Fetched revision: main@sha1:696f056df216eea4f9401adbee0ff744d4df390f'
-      reason: GitOperationSucceed
-      status: "True"
-      type: Ready
----
-apiVersion: source.toolkit.fluxcd.io/v1
-kind: GitRepository
-metadata:
-  name: gr-unknown
-  namespace: {{ .fluxns }}
-spec:
-  ref:
-    branch: main
-  secretRef:
-    name: flux-system
-  url: ssh://git@github.com/example/repo
-  interval: 5m
-status:
-  conditions:
-    - lastTransitionTime: "2021-07-20T00:48:16Z"
-      message: 'reconciliation in progress'
-      reason: Progressing
-      status: "Unknown"
-      type: Ready

cmd/flux/trigger.go

@@ -1,31 +0,0 @@
-/*
-Copyright 2026 The Flux authors
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package main
-
-import (
-	"github.com/spf13/cobra"
-)
-
-var triggerCmd = &cobra.Command{
-	Use:   "trigger",
-	Short: "Trigger Flux resources from outside the cluster",
-	Long:  `The trigger sub-commands invoke Flux resources from outside the cluster, such as a Receiver's incoming webhook.`,
-}
-
-func init() {
-	rootCmd.AddCommand(triggerCmd)
-}

cmd/flux/trigger_receiver.go

@@ -1,368 +0,0 @@
-/*
-Copyright 2026 The Flux authors
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package main
-
-import (
-	"bytes"
-	"context"
-	"crypto/hmac"
-	"crypto/sha256"
-	"encoding/hex"
-	"fmt"
-	"io"
-	"net/http"
-	"os"
-	"strings"
-	"time"
-
-	"github.com/spf13/cobra"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-
-	"github.com/fluxcd/pkg/auth/actionsoidc"
-
-	notificationv1 "github.com/fluxcd/notification-controller/api/v1"
-)
-
-const (
-	// genericOIDCReceiver mirrors notificationv1.GenericOIDCReceiver from the
-	// upcoming notification-controller release.
-	// TODO: Replace it with the constant from the api module once the dependency
-	// is bumped.
-	genericOIDCReceiver = "generic-oidc"
-
-	// defaultOIDCAudience mirrors notificationv1.DefaultOIDCAudience.
-	// TODO: Replace it with the constant from the api module once the dependency
-	// is bumped.
-	defaultOIDCAudience = "notification-controller"
-
-	// defaultOIDCTokenEnvVar is the environment variable the OIDC token is read
-	// from when neither --oidc-provider nor --oidc-token is set.
-	defaultOIDCTokenEnvVar = "FLUX_TRIGGER_RECEIVER_OIDC_TOKEN"
-)
-
-const (
-	oidcProviderGitHub  = "github"
-	oidcProviderForgejo = "forgejo"
-)
-
-var triggerReceiverCmd = &cobra.Command{
-	Use:   "receiver [name]",
-	Short: "Trigger the webhook of a Receiver",
-	Long: `The trigger receiver command sends a request to the incoming webhook of a Receiver.
-
-The command computes the webhook path from the Receiver name, namespace and token,
-appends it to the base URL and sends an HTTP POST request with the given payload.
-It does not require access to the Kubernetes cluster.`,
-	Example: `  # Trigger a generic Receiver
-  flux trigger receiver my-receiver \
-    --token=my-token \
-    --url=https://flux-webhook.example.com
-
-  # Trigger a generic Receiver with a custom JSON payload
-  flux trigger receiver my-receiver \
-    --token=my-token \
-    --url=https://flux-webhook.example.com \
-    --payload='{"image":"ghcr.io/org/app:v1.0.0"}'
-
-  # Trigger a generic-hmac Receiver
-  flux trigger receiver my-receiver \
-    --type=generic-hmac \
-    --token=my-token \
-    --url=https://flux-webhook.example.com \
-    --payload='{"image":"ghcr.io/org/app:v1.0.0"}'
-
-  # Trigger a generic-oidc Receiver from a GitHub Actions workflow.
-  # The job needs 'permissions: id-token: write'. The OIDC token is fetched
-  # automatically and the receiver token is not used by this type.
-  flux trigger receiver my-receiver \
-    --type=generic-oidc \
-    --oidc-provider=github \
-    --url=https://flux-webhook.example.com
-
-  # Trigger a generic-oidc Receiver from a GitHub Actions workflow with a custom OIDC audience
-  flux trigger receiver my-receiver \
-    --type=generic-oidc \
-    --oidc-provider=github \
-    --oidc-audience=my-flux-instance \
-    --url=https://flux-webhook.example.com
-
-  # Trigger a generic-oidc Receiver from a Forgejo Actions workflow
-  flux trigger receiver my-receiver \
-    --type=generic-oidc \
-    --oidc-provider=forgejo \
-    --url=https://flux-webhook.example.com
-
-  # Trigger a generic-oidc Receiver from a GitLab CI/CD job, reading the OIDC
-  # token from an id_token environment variable defined in the job spec.
-  flux trigger receiver my-receiver \
-    --type=generic-oidc \
-    --oidc-token="${MY_ID_TOKEN}" \
-    --url=https://flux-webhook.example.com
-
-  # Trigger a generic-oidc Receiver from a GitLab CI/CD job, reading the OIDC
-  # token from the default FLUX_TRIGGER_RECEIVER_OIDC_TOKEN environment variable,
-  # e.g. defined as:
-  #   job:
-  #     id_tokens:
-  #       FLUX_TRIGGER_RECEIVER_OIDC_TOKEN:
-  #         aud: notification-controller
-  flux trigger receiver my-receiver \
-    --type=generic-oidc \
-    --url=https://flux-webhook.example.com
-
-  # Trigger a Receiver in a specific namespace
-  flux trigger receiver my-receiver -n apps \
-    --token=my-token \
-    --url=https://flux-webhook.example.com
-
-  # Trigger a Receiver in the namespace of the current kubeconfig context
-  flux trigger receiver my-receiver \
-    --ns-follows-kube-context \
-    --token=my-token \
-    --url=https://flux-webhook.example.com`,
-	Args: cobra.ExactArgs(1),
-	RunE: triggerReceiverCmdRun,
-}
-
-type triggerReceiverFlags struct {
-	token        string
-	url          string
-	receiverType string
-	oidcProvider string
-	oidcToken    string
-	oidcAudience string
-	payload      string
-	retries      int
-	retryDelay   time.Duration
-}
-
-var triggerReceiverArgs triggerReceiverFlags
-
-func init() {
-	triggerReceiverCmd.Flags().StringVar(&triggerReceiverArgs.token, "token", "",
-		"the Receiver token, required for all types except generic-oidc where it must not be set")
-	triggerReceiverCmd.Flags().StringVar(&triggerReceiverArgs.url, "url", "",
-		"the base URL of the notification-controller webhook receiver, may contain a base path")
-	triggerReceiverCmd.Flags().StringVar(&triggerReceiverArgs.receiverType, "type", notificationv1.GenericReceiver,
-		fmt.Sprintf("the Receiver type, one of: %s, %s, %s",
-			notificationv1.GenericReceiver, notificationv1.GenericHMACReceiver, genericOIDCReceiver))
-	triggerReceiverCmd.Flags().StringVar(&triggerReceiverArgs.oidcProvider, "oidc-provider", "",
-		fmt.Sprintf("the OIDC provider to fetch the token from, one of: %s, %s (generic-oidc only, mutually exclusive with --oidc-token)",
-			oidcProviderGitHub, oidcProviderForgejo))
-	triggerReceiverCmd.Flags().StringVar(&triggerReceiverArgs.oidcToken, "oidc-token", "",
-		fmt.Sprintf("the OIDC token to authenticate the request (generic-oidc only, mutually exclusive with --oidc-provider); defaults to the %s environment variable", defaultOIDCTokenEnvVar))
-	triggerReceiverCmd.Flags().StringVar(&triggerReceiverArgs.oidcAudience, "oidc-audience", "",
-		fmt.Sprintf("the audience of the OIDC token to fetch (requires --oidc-provider); defaults to %q", defaultOIDCAudience))
-	triggerReceiverCmd.Flags().StringVar(&triggerReceiverArgs.payload, "payload", "{}",
-		"the JSON payload to send in the request body")
-	triggerReceiverCmd.Flags().IntVar(&triggerReceiverArgs.retries, "retries", 10,
-		"the number of times to retry on connection errors or retryable HTTP status codes (404, 408, 429, 5xx); set to 0 to disable")
-	triggerReceiverCmd.Flags().DurationVar(&triggerReceiverArgs.retryDelay, "retry-delay", 10*time.Second,
-		"the delay between retries")
-
-	triggerCmd.AddCommand(triggerReceiverCmd)
-}
-
-func triggerReceiverCmdRun(cmd *cobra.Command, args []string) error {
-	name := args[0]
-
-	if triggerReceiverArgs.url == "" {
-		return fmt.Errorf("--url is required")
-	}
-
-	if err := validateTriggerReceiverArgs(); err != nil {
-		return err
-	}
-
-	ctx, cancel := context.WithTimeout(context.Background(), rootArgs.timeout)
-	defer cancel()
-
-	// For generic-oidc the Receiver has no secretRef, so the webhook path is
-	// salted with an empty token. For all other types the token is required.
-	pathToken := triggerReceiverArgs.token
-	if triggerReceiverArgs.receiverType == genericOIDCReceiver {
-		pathToken = ""
-	}
-
-	receiver := &notificationv1.Receiver{
-		ObjectMeta: metav1.ObjectMeta{
-			Name:      name,
-			Namespace: *kubeconfigArgs.Namespace,
-		},
-	}
-	webhookURL := strings.TrimRight(triggerReceiverArgs.url, "/") + receiver.GetWebhookPath(pathToken)
-
-	payload := []byte(triggerReceiverArgs.payload)
-
-	// Compute the request headers once; the auth material does not change between
-	// attempts, so they are applied to a fresh request on each retry.
-	headers := map[string]string{
-		"Content-Type": "application/json",
-		"User-Agent":   fmt.Sprintf("flux/v%s", VERSION),
-	}
-	switch triggerReceiverArgs.receiverType {
-	case notificationv1.GenericReceiver:
-		// No authentication, the payload is sent as-is.
-	case notificationv1.GenericHMACReceiver:
-		mac := hmac.New(sha256.New, []byte(triggerReceiverArgs.token))
-		mac.Write(payload)
-		headers["X-Signature"] = "sha256=" + hex.EncodeToString(mac.Sum(nil))
-	case genericOIDCReceiver:
-		oidcToken, err := resolveOIDCToken(ctx)
-		if err != nil {
-			return err
-		}
-		headers["Authorization"] = "Bearer " + oidcToken
-	}
-
-	// send performs a single attempt. It reports retryable=true for transient
-	// failures (connection errors and retryable HTTP status codes) so the caller
-	// can retry; permanent failures (e.g. authentication or validation errors)
-	// report retryable=false and fail immediately.
-	send := func() (retryable bool, err error) {
-		req, err := http.NewRequestWithContext(ctx, http.MethodPost, webhookURL, bytes.NewReader(payload))
-		if err != nil {
-			return false, fmt.Errorf("unable to create request: %w", err)
-		}
-		for k, v := range headers {
-			req.Header.Set(k, v)
-		}
-
-		resp, err := http.DefaultClient.Do(req)
-		if err != nil {
-			return true, fmt.Errorf("request to %s failed: %w", webhookURL, err)
-		}
-		defer resp.Body.Close()
-
-		body, _ := io.ReadAll(resp.Body)
-		if resp.StatusCode < http.StatusOK || resp.StatusCode >= http.StatusMultipleChoices {
-			statusErr := fmt.Errorf("request to %s failed with status %s", webhookURL, resp.Status)
-			if msg := strings.TrimSpace(string(body)); msg != "" {
-				statusErr = fmt.Errorf("request to %s failed with status %s: %s", webhookURL, resp.Status, msg)
-			}
-			return isRetryableStatus(resp.StatusCode), statusErr
-		}
-		return false, nil
-	}
-
-	logger.Actionf("triggering Receiver %s/%s", *kubeconfigArgs.Namespace, name)
-	for attempt := 0; ; attempt++ {
-		retryable, err := send()
-		if err == nil {
-			logger.Successf("Receiver %s/%s triggered", *kubeconfigArgs.Namespace, name)
-			return nil
-		}
-		if !retryable || attempt >= triggerReceiverArgs.retries {
-			return err
-		}
-		logger.Waitingf("%s; retrying in %s (%d/%d)",
-			err, triggerReceiverArgs.retryDelay, attempt+1, triggerReceiverArgs.retries)
-		select {
-		case <-ctx.Done():
-			return ctx.Err()
-		case <-time.After(triggerReceiverArgs.retryDelay):
-		}
-	}
-}
-
-// isRetryableStatus reports whether an HTTP status returned by the webhook
-// receiver is worth retrying. 404 is included because the Receiver's webhook
-// path may not be registered yet right after the notification-controller starts
-// or while the Receiver reconciles.
-func isRetryableStatus(code int) bool {
-	switch code {
-	case http.StatusNotFound, // 404
-		http.StatusRequestTimeout,      // 408
-		http.StatusTooManyRequests,     // 429
-		http.StatusInternalServerError, // 500
-		http.StatusBadGateway,          // 502
-		http.StatusServiceUnavailable,  // 503
-		http.StatusGatewayTimeout:      // 504
-		return true
-	default:
-		return false
-	}
-}
-
-// validateTriggerReceiverArgs validates the receiver type and the combination of
-// token and OIDC flags.
-func validateTriggerReceiverArgs() error {
-	isOIDC := triggerReceiverArgs.receiverType == genericOIDCReceiver
-
-	switch triggerReceiverArgs.receiverType {
-	case notificationv1.GenericReceiver, notificationv1.GenericHMACReceiver, genericOIDCReceiver:
-	default:
-		return fmt.Errorf("invalid --type %q, must be one of: %s, %s, %s",
-			triggerReceiverArgs.receiverType,
-			notificationv1.GenericReceiver, notificationv1.GenericHMACReceiver, genericOIDCReceiver)
-	}
-
-	if !isOIDC {
-		if triggerReceiverArgs.token == "" {
-			return fmt.Errorf("--token is required for --type=%s", triggerReceiverArgs.receiverType)
-		}
-		if triggerReceiverArgs.oidcProvider != "" || triggerReceiverArgs.oidcToken != "" || triggerReceiverArgs.oidcAudience != "" {
-			return fmt.Errorf("--oidc-provider, --oidc-token and --oidc-audience can only be set for --type=%s", genericOIDCReceiver)
-		}
-		return nil
-	}
-
-	// generic-oidc.
-	if triggerReceiverArgs.token != "" {
-		return fmt.Errorf("--token must not be set for --type=%s, the Receiver of this type has no secret", genericOIDCReceiver)
-	}
-	if triggerReceiverArgs.oidcProvider != "" && triggerReceiverArgs.oidcToken != "" {
-		return fmt.Errorf("--oidc-provider and --oidc-token are mutually exclusive")
-	}
-	if triggerReceiverArgs.oidcProvider != "" {
-		switch triggerReceiverArgs.oidcProvider {
-		case oidcProviderGitHub, oidcProviderForgejo:
-		default:
-			return fmt.Errorf("invalid --oidc-provider %q, must be one of: %s, %s",
-				triggerReceiverArgs.oidcProvider, oidcProviderGitHub, oidcProviderForgejo)
-		}
-	}
-	if triggerReceiverArgs.oidcAudience != "" && triggerReceiverArgs.oidcProvider == "" {
-		return fmt.Errorf("--oidc-audience can only be set together with --oidc-provider")
-	}
-
-	return nil
-}
-
-// resolveOIDCToken returns the OIDC token used to authenticate the request,
-// either by fetching it from the configured provider or by reading it from the
-// --oidc-token flag or the default environment variable.
-func resolveOIDCToken(ctx context.Context) (string, error) {
-	switch {
-	case triggerReceiverArgs.oidcProvider != "":
-		audience := triggerReceiverArgs.oidcAudience
-		if audience == "" {
-			audience = defaultOIDCAudience
-		}
-		// GitHub and Forgejo Actions expose the same token request endpoint.
-		token, err := actionsoidc.FetchToken(ctx, audience)
-		return token, err
-	case triggerReceiverArgs.oidcToken != "":
-		return triggerReceiverArgs.oidcToken, nil
-	default:
-		token := os.Getenv(defaultOIDCTokenEnvVar)
-		if token == "" {
-			return "", fmt.Errorf("no OIDC token provided: set --oidc-provider, --oidc-token or the %s environment variable", defaultOIDCTokenEnvVar)
-		}
-		return token, nil
-	}
-}

cmd/flux/trigger_receiver_test.go

@@ -1,353 +0,0 @@
-//go:build unit
-// +build unit
-
-/*
-Copyright 2026 The Flux authors
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package main
-
-import (
-	"crypto/hmac"
-	"crypto/sha256"
-	"encoding/hex"
-	"io"
-	"net/http"
-	"net/http/httptest"
-	"strings"
-	"sync/atomic"
-	"testing"
-	"time"
-
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-
-	notificationv1 "github.com/fluxcd/notification-controller/api/v1"
-)
-
-// resetTriggerReceiverArgs restores the package-global flags to their defaults
-// so tests do not leak state into each other.
-func resetTriggerReceiverArgs(t *testing.T) {
-	t.Helper()
-	prev := triggerReceiverArgs
-	prevNS := kubeconfigArgs.Namespace
-	prevTimeout := rootArgs.timeout
-
-	triggerReceiverArgs = triggerReceiverFlags{
-		receiverType: notificationv1.GenericReceiver,
-		payload:      "{}",
-	}
-	ns := "default"
-	kubeconfigArgs.Namespace = &ns
-	rootArgs.timeout = time.Minute
-
-	t.Cleanup(func() {
-		triggerReceiverArgs = prev
-		kubeconfigArgs.Namespace = prevNS
-		rootArgs.timeout = prevTimeout
-	})
-}
-
-func TestValidateTriggerReceiverArgs(t *testing.T) {
-	tests := []struct {
-		name    string
-		args    triggerReceiverFlags
-		wantErr string
-	}{
-		{
-			name:    "generic requires token",
-			args:    triggerReceiverFlags{receiverType: notificationv1.GenericReceiver},
-			wantErr: "--token is required",
-		},
-		{
-			name: "generic with token is valid",
-			args: triggerReceiverFlags{receiverType: notificationv1.GenericReceiver, token: "t"},
-		},
-		{
-			name:    "generic rejects oidc flags",
-			args:    triggerReceiverFlags{receiverType: notificationv1.GenericReceiver, token: "t", oidcProvider: "github"},
-			wantErr: "can only be set for --type=generic-oidc",
-		},
-		{
-			name: "hmac with token is valid",
-			args: triggerReceiverFlags{receiverType: notificationv1.GenericHMACReceiver, token: "t"},
-		},
-		{
-			name:    "unknown type",
-			args:    triggerReceiverFlags{receiverType: "bogus", token: "t"},
-			wantErr: "invalid --type",
-		},
-		{
-			name:    "oidc rejects token",
-			args:    triggerReceiverFlags{receiverType: genericOIDCReceiver, token: "t"},
-			wantErr: "--token must not be set",
-		},
-		{
-			name:    "oidc provider and token mutually exclusive",
-			args:    triggerReceiverFlags{receiverType: genericOIDCReceiver, oidcProvider: "github", oidcToken: "x"},
-			wantErr: "mutually exclusive",
-		},
-		{
-			name:    "oidc invalid provider",
-			args:    triggerReceiverFlags{receiverType: genericOIDCReceiver, oidcProvider: "gitlab"},
-			wantErr: "invalid --oidc-provider",
-		},
-		{
-			name:    "oidc audience requires provider",
-			args:    triggerReceiverFlags{receiverType: genericOIDCReceiver, oidcToken: "x", oidcAudience: "aud"},
-			wantErr: "--oidc-audience can only be set together with --oidc-provider",
-		},
-		{
-			name: "oidc with provider is valid",
-			args: triggerReceiverFlags{receiverType: genericOIDCReceiver, oidcProvider: "forgejo", oidcAudience: "aud"},
-		},
-		{
-			name: "oidc with token is valid",
-			args: triggerReceiverFlags{receiverType: genericOIDCReceiver, oidcToken: "x"},
-		},
-		{
-			name: "oidc without provider or token is valid (env fallback)",
-			args: triggerReceiverFlags{receiverType: genericOIDCReceiver},
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			resetTriggerReceiverArgs(t)
-			triggerReceiverArgs = tt.args
-
-			err := validateTriggerReceiverArgs()
-			if tt.wantErr == "" {
-				if err != nil {
-					t.Fatalf("expected no error, got: %v", err)
-				}
-				return
-			}
-			if err == nil {
-				t.Fatalf("expected error containing %q, got nil", tt.wantErr)
-			}
-			if !strings.Contains(err.Error(), tt.wantErr) {
-				t.Fatalf("expected error containing %q, got: %v", tt.wantErr, err)
-			}
-		})
-	}
-}
-
-func TestTriggerReceiverRun(t *testing.T) {
-	const name = "my-receiver"
-	const ns = "default"
-	const token = "my-token"
-
-	expectedPath := (&notificationv1.Receiver{
-		ObjectMeta: metav1.ObjectMeta{Name: name, Namespace: ns},
-	}).GetWebhookPath(token)
-	expectedOIDCPath := (&notificationv1.Receiver{
-		ObjectMeta: metav1.ObjectMeta{Name: name, Namespace: ns},
-	}).GetWebhookPath("")
-
-	t.Run("generic sends payload with default headers", func(t *testing.T) {
-		resetTriggerReceiverArgs(t)
-		var got *http.Request
-		var gotBody string
-		srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-			got = r
-			b, _ := io.ReadAll(r.Body)
-			gotBody = string(b)
-			w.WriteHeader(http.StatusOK)
-		}))
-		defer srv.Close()
-
-		triggerReceiverArgs.url = srv.URL
-		triggerReceiverArgs.token = token
-		triggerReceiverArgs.payload = `{"hello":"world"}`
-
-		if err := triggerReceiverCmdRun(nil, []string{name}); err != nil {
-			t.Fatalf("unexpected error: %v", err)
-		}
-		if got.URL.Path != expectedPath {
-			t.Errorf("path = %q, want %q", got.URL.Path, expectedPath)
-		}
-		if got.Method != http.MethodPost {
-			t.Errorf("method = %q, want POST", got.Method)
-		}
-		if ct := got.Header.Get("Content-Type"); ct != "application/json" {
-			t.Errorf("Content-Type = %q, want application/json", ct)
-		}
-		if ua := got.Header.Get("User-Agent"); !strings.HasPrefix(ua, "flux/v") {
-			t.Errorf("User-Agent = %q, want prefix flux/v", ua)
-		}
-		if gotBody != `{"hello":"world"}` {
-			t.Errorf("body = %q", gotBody)
-		}
-	})
-
-	t.Run("generic-hmac sets X-Signature", func(t *testing.T) {
-		resetTriggerReceiverArgs(t)
-		var sig string
-		payload := `{"a":1}`
-		srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-			sig = r.Header.Get("X-Signature")
-			w.WriteHeader(http.StatusOK)
-		}))
-		defer srv.Close()
-
-		triggerReceiverArgs.url = srv.URL
-		triggerReceiverArgs.token = token
-		triggerReceiverArgs.receiverType = notificationv1.GenericHMACReceiver
-		triggerReceiverArgs.payload = payload
-
-		if err := triggerReceiverCmdRun(nil, []string{name}); err != nil {
-			t.Fatalf("unexpected error: %v", err)
-		}
-
-		mac := hmac.New(sha256.New, []byte(token))
-		mac.Write([]byte(payload))
-		want := "sha256=" + hex.EncodeToString(mac.Sum(nil))
-		if sig != want {
-			t.Errorf("X-Signature = %q, want %q", sig, want)
-		}
-	})
-
-	t.Run("generic-oidc with --oidc-token sets bearer and empty-token path", func(t *testing.T) {
-		resetTriggerReceiverArgs(t)
-		var auth, path string
-		srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-			auth = r.Header.Get("Authorization")
-			path = r.URL.Path
-			w.WriteHeader(http.StatusOK)
-		}))
-		defer srv.Close()
-
-		triggerReceiverArgs.url = srv.URL
-		triggerReceiverArgs.receiverType = genericOIDCReceiver
-		triggerReceiverArgs.oidcToken = "the-oidc-token"
-
-		if err := triggerReceiverCmdRun(nil, []string{name}); err != nil {
-			t.Fatalf("unexpected error: %v", err)
-		}
-		if auth != "Bearer the-oidc-token" {
-			t.Errorf("Authorization = %q, want Bearer the-oidc-token", auth)
-		}
-		if path != expectedOIDCPath {
-			t.Errorf("path = %q, want %q (empty token salt)", path, expectedOIDCPath)
-		}
-	})
-
-	t.Run("generic-oidc reads default env var", func(t *testing.T) {
-		resetTriggerReceiverArgs(t)
-		t.Setenv(defaultOIDCTokenEnvVar, "env-oidc-token")
-		var auth string
-		srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-			auth = r.Header.Get("Authorization")
-			w.WriteHeader(http.StatusOK)
-		}))
-		defer srv.Close()
-
-		triggerReceiverArgs.url = srv.URL
-		triggerReceiverArgs.receiverType = genericOIDCReceiver
-
-		if err := triggerReceiverCmdRun(nil, []string{name}); err != nil {
-			t.Fatalf("unexpected error: %v", err)
-		}
-		if auth != "Bearer env-oidc-token" {
-			t.Errorf("Authorization = %q, want Bearer env-oidc-token", auth)
-		}
-	})
-
-	t.Run("non-2xx response is an error", func(t *testing.T) {
-		resetTriggerReceiverArgs(t)
-		srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-			w.WriteHeader(http.StatusBadRequest)
-			_, _ = w.Write([]byte("nope"))
-		}))
-		defer srv.Close()
-
-		triggerReceiverArgs.url = srv.URL
-		triggerReceiverArgs.token = token
-
-		err := triggerReceiverCmdRun(nil, []string{name})
-		if err == nil || !strings.Contains(err.Error(), "nope") {
-			t.Fatalf("expected error containing response body, got: %v", err)
-		}
-	})
-
-	t.Run("retries on retryable status then succeeds", func(t *testing.T) {
-		resetTriggerReceiverArgs(t)
-		var attempts int32
-		srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-			if atomic.AddInt32(&attempts, 1) < 3 {
-				w.WriteHeader(http.StatusNotFound) // transient: path not registered yet
-				return
-			}
-			w.WriteHeader(http.StatusOK)
-		}))
-		defer srv.Close()
-
-		triggerReceiverArgs.url = srv.URL
-		triggerReceiverArgs.token = token
-		triggerReceiverArgs.retries = 5
-		triggerReceiverArgs.retryDelay = time.Millisecond
-
-		if err := triggerReceiverCmdRun(nil, []string{name}); err != nil {
-			t.Fatalf("unexpected error: %v", err)
-		}
-		if got := atomic.LoadInt32(&attempts); got != 3 {
-			t.Errorf("attempts = %d, want 3", got)
-		}
-	})
-
-	t.Run("does not retry non-retryable status", func(t *testing.T) {
-		resetTriggerReceiverArgs(t)
-		var attempts int32
-		srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-			atomic.AddInt32(&attempts, 1)
-			w.WriteHeader(http.StatusForbidden)
-		}))
-		defer srv.Close()
-
-		triggerReceiverArgs.url = srv.URL
-		triggerReceiverArgs.token = token
-		triggerReceiverArgs.retries = 5
-		triggerReceiverArgs.retryDelay = time.Millisecond
-
-		if err := triggerReceiverCmdRun(nil, []string{name}); err == nil {
-			t.Fatal("expected error")
-		}
-		if got := atomic.LoadInt32(&attempts); got != 1 {
-			t.Errorf("attempts = %d, want 1 (no retry on 403)", got)
-		}
-	})
-
-	t.Run("returns error after exhausting retries", func(t *testing.T) {
-		resetTriggerReceiverArgs(t)
-		var attempts int32
-		srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-			atomic.AddInt32(&attempts, 1)
-			w.WriteHeader(http.StatusServiceUnavailable)
-		}))
-		defer srv.Close()
-
-		triggerReceiverArgs.url = srv.URL
-		triggerReceiverArgs.token = token
-		triggerReceiverArgs.retries = 2
-		triggerReceiverArgs.retryDelay = time.Millisecond
-
-		if err := triggerReceiverCmdRun(nil, []string{name}); err == nil {
-			t.Fatal("expected error after exhausting retries")
-		}
-		if got := atomic.LoadInt32(&attempts); got != 3 {
-			t.Errorf("attempts = %d, want 3 (1 initial + 2 retries)", got)
-		}
-	})
-}

docs/release/release-notes-template.md

@@ -26,8 +26,6 @@ The following template can be used for the GitHub release page:
 
 <!-- Text describing the most important changes in this release -->
 
-ℹ️ Please follow the [Upgrade Procedure for Flux v2.7+](https://github.com/fluxcd/flux2/discussions/5572) for a smooth upgrade from Flux v2.6 to the latest version.
-
 ### Fixes and improvements
 
 <!-- List of fixes and improvements to the controllers and CLI -->
@@ -38,7 +36,7 @@ The following template can be used for the GitHub release page:
 
 ## Components changelog
 
-- <name>-controller [v<version>](https://github.com/fluxcd/<name>-controller/blob/<version>/CHANGELOG.md)
+- <name>-controller [v<version>](https://github.com/fluxcd/<name>-controller/blob/<version>/CHANGELOG.md
 
 ## CLI changelog