Debug SSH not working

Signed-off-by: Matheus Pimenta <matheuscscp@gmail.com>

.github/workflows/e2e-azure.yaml

@@ -23,6 +23,8 @@ permissions:
 jobs:
   e2e-aks:
     runs-on: ubuntu-latest
+    env:
+      SSH_SECRET_SMOKE_TEST_ONLY: "true"
     defaults:
       run:
         working-directory: ./tests/integration
@@ -30,17 +32,72 @@ jobs:
     steps:
       - name: CheckoutD
         uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+      - name: Smoke test Git SSH secrets
+        env:
+          GITREPO_SSH_CONTENTS: ${{ secrets.GIT_SSH_IDENTITY }}
+          GITREPO_SSH_PUB_CONTENTS: ${{ secrets.GIT_SSH_IDENTITY_PUB }}
+        run: |
+          set -euo pipefail
+
+          mkdir -p ./build/ssh
+          cat <<EOF > build/ssh/key
+          $GITREPO_SSH_CONTENTS
+          EOF
+          cat <<EOF > build/ssh/key.pub
+          $GITREPO_SSH_PUB_CONTENTS
+          EOF
+          chmod 600 build/ssh/key
+
+          key_lines=$(wc -l < build/ssh/key)
+          pub_lines=$(wc -l < build/ssh/key.pub)
+          echo "private key lines: ${key_lines}"
+          echo "public key lines: ${pub_lines}"
+
+          ssh-keygen -y -f build/ssh/key > build/ssh/derived.pub
+          if ! cmp -s build/ssh/derived.pub build/ssh/key.pub; then
+            echo "::error::derived public key does not match GIT_SSH_IDENTITY_PUB"
+            echo "derived public key fingerprint:"
+            ssh-keygen -lf build/ssh/derived.pub
+            echo "configured public key fingerprint:"
+            ssh-keygen -lf build/ssh/key.pub
+            exit 1
+          fi
+
+          echo "SSH key fingerprint:"
+          ssh-keygen -lf build/ssh/derived.pub
+
+          set +e
+          ssh_output=$(ssh -i build/ssh/key -o BatchMode=yes -o StrictHostKeyChecking=accept-new -o UserKnownHostsFile=build/ssh/known_hosts -T git@ssh.dev.azure.com 2>&1)
+          ssh_status=$?
+          set -e
+          echo "${ssh_output}"
+
+          if echo "${ssh_output}" | grep -q "Shell access is not supported"; then
+            echo "Azure DevOps SSH accepted the key"
+            exit 0
+          fi
+          if echo "${ssh_output}" | grep -Eq "Public key authentication failed|Permission denied"; then
+            echo "::error::Azure DevOps SSH rejected the key"
+            exit 1
+          fi
+
+          echo "::error::unexpected Azure DevOps SSH probe result, exit status ${ssh_status}"
+          exit 1
       - name: Setup Go
+        if: ${{ env.SSH_SECRET_SMOKE_TEST_ONLY != 'true' }}
         uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
         with:
           go-version: 1.26.x
           cache-dependency-path: tests/integration/go.sum
       - name: Setup Terraform
+        if: ${{ env.SSH_SECRET_SMOKE_TEST_ONLY != 'true' }}
         uses: hashicorp/setup-terraform@dfe3c3f87815947d99a8997f908cb6525fc44e9e # v4.0.1
       - name: Setup Flux CLI
+        if: ${{ env.SSH_SECRET_SMOKE_TEST_ONLY != 'true' }}
         run: make build
         working-directory: ./
       - name: Setup SOPS
+        if: ${{ env.SSH_SECRET_SMOKE_TEST_ONLY != 'true' }}
         run: |
           mkdir -p $HOME/.local/bin
           wget -O $HOME/.local/bin/sops https://github.com/mozilla/sops/releases/download/v$SOPS_VER/sops-v$SOPS_VER.linux
@@ -48,17 +105,21 @@ jobs:
         env:
           SOPS_VER: 3.7.1
       - name: Authenticate to Azure
+        if: ${{ env.SSH_SECRET_SMOKE_TEST_ONLY != 'true' }}
         uses: Azure/login@532459ea530d8321f2fb9bb10d1e0bcf23869a43 # 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
+        if: ${{ env.SSH_SECRET_SMOKE_TEST_ONLY != 'true' }}
         run: |
           cat > .env <<EOF
           export TF_VAR_tags='{ "environment"="github", "ci"="true", "repo"="flux2", "createdat"="$(date -u +x%Y-%m-%d_%Hh%Mm%Ss)" }'
           EOF
       - name: Print .env for dynamic tag value reference
+        if: ${{ env.SSH_SECRET_SMOKE_TEST_ONLY != 'true' }}
         run: cat .env
       - name: Run Azure e2e tests
+        if: ${{ env.SSH_SECRET_SMOKE_TEST_ONLY != 'true' }}
         env:
           ARM_CLIENT_ID: ${{ secrets.ARM_CLIENT_ID }}
           ARM_CLIENT_SECRET: ${{ secrets.ARM_CLIENT_SECRET }}
@@ -82,7 +143,7 @@ jobs:
           export GITREPO_SSH_PUB_PATH=build/ssh/key.pub
           make test-azure
       - name: Ensure resource cleanup
-        if: ${{ always() }}
+        if: ${{ always() && env.SSH_SECRET_SMOKE_TEST_ONLY != 'true' }}
         env:
           ARM_CLIENT_ID: ${{ secrets.ARM_CLIENT_ID }}
           ARM_CLIENT_SECRET: ${{ secrets.ARM_CLIENT_SECRET }}

cmd/flux/build_kustomization.go

@@ -86,7 +86,7 @@ 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", false,
+	buildKsCmd.Flags().BoolVar(&buildKsArgs.inMemoryBuild, "in-memory-build", true,
 		"Use in-memory filesystem during build.")
 	buildCmd.AddCommand(buildKsCmd)
 }

cmd/flux/build_kustomization_test.go

@@ -23,8 +23,6 @@ import (
 	"bytes"
 	"os"
 	"path/filepath"
-	"strconv"
-	"strings"
 	"testing"
 	"text/template"
 )
@@ -55,8 +53,8 @@ func TestBuildKustomization(t *testing.T) {
 			assertFunc: "assertGoldenTemplateFile",
 		},
 		{
-			name:       "build podinfo (in-memory)",
-			args:       "build kustomization podinfo --path ./testdata/build-kustomization/podinfo --in-memory-build=true",
+			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",
 		},
@@ -79,8 +77,8 @@ func TestBuildKustomization(t *testing.T) {
 			assertFunc: "assertGoldenTemplateFile",
 		},
 		{
-			name:       "build ignore (in-memory)",
-			args:       "build kustomization podinfo --path ./testdata/build-kustomization/ignore --ignore-paths \"!configmap.yaml,!secret.yaml\" --in-memory-build=true",
+			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",
 		},
@@ -91,8 +89,8 @@ func TestBuildKustomization(t *testing.T) {
 			assertFunc: "assertGoldenTemplateFile",
 		},
 		{
-			name:       "build with recursive (in-memory)",
-			args:       "build kustomization podinfo --path ./testdata/build-kustomization/podinfo-with-my-app --recursive --local-sources GitRepository/default/podinfo=./testdata/build-kustomization --in-memory-build=true",
+			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",
 		},
@@ -166,8 +164,8 @@ spec:
 			assertFunc: "assertGoldenTemplateFile",
 		},
 		{
-			name:       "build podinfo (in-memory)",
-			args:       "build kustomization podinfo --kustomization-file " + tmpFile + " --path ./testdata/build-kustomization/podinfo --in-memory-build=true",
+			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",
 		},
@@ -202,14 +200,14 @@ spec:
 			assertFunc: "assertGoldenTemplateFile",
 		},
 		{
-			name:       "build with recursive (in-memory)",
-			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=true",
+			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 (in-memory)",
-			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=true --dry-run",
+			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",
 		},
@@ -257,104 +255,6 @@ spec:
 	}
 }
 
-func TestBuildKustomizationDefaultBuildsAbsolutePathOutsideCwd(t *testing.T) {
-	cwdDir, sourceDir, kustomizationFile := newOutsideCwdKustomization(t, "default", "")
-
-	restore := chdirForTest(t, cwdDir)
-	defer restore()
-
-	flag := buildKsCmd.Flags().Lookup("in-memory-build")
-	if flag == nil {
-		t.Fatal("missing in-memory-build flag")
-	}
-	defaultValue, err := strconv.ParseBool(flag.DefValue)
-	if err != nil {
-		t.Fatal(err)
-	}
-	buildKsArgs.inMemoryBuild = defaultValue
-
-	output, err := executeCommand("build kustomization app --path " + sourceDir +
-		" --kustomization-file " + kustomizationFile +
-		" --namespace default --dry-run")
-	if err != nil {
-		t.Fatalf("expected build to succeed with default backend, got: %v", err)
-	}
-	if !strings.Contains(output, "name: outside-cwd") {
-		t.Fatalf("expected rendered ConfigMap in output, got:\n%s", output)
-	}
-}
-
-func chdirForTest(t *testing.T, dir string) func() {
-	t.Helper()
-	orig, err := os.Getwd()
-	if err != nil {
-		t.Fatal(err)
-	}
-	if err := os.Chdir(dir); err != nil {
-		t.Fatal(err)
-	}
-	return func() {
-		if err := os.Chdir(orig); err != nil {
-			t.Fatal(err)
-		}
-	}
-}
-
-func newOutsideCwdKustomization(t *testing.T, namespace, targetNamespace string) (string, string, string) {
-	t.Helper()
-	parentDir := t.TempDir()
-
-	cwdDir := filepath.Join(parentDir, "cwd")
-	if err := os.MkdirAll(cwdDir, 0o755); err != nil {
-		t.Fatal(err)
-	}
-
-	sourceDir := filepath.Join(parentDir, "source")
-	if err := os.MkdirAll(sourceDir, 0o755); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := os.WriteFile(filepath.Join(sourceDir, "kustomization.yaml"), []byte(`apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
-- configmap.yaml
-`), 0o644); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := os.WriteFile(filepath.Join(sourceDir, "configmap.yaml"), []byte(`apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: outside-cwd
-`), 0o644); err != nil {
-		t.Fatal(err)
-	}
-
-	targetNamespaceField := ""
-	if targetNamespace != "" {
-		targetNamespaceField = "\n  targetNamespace: " + targetNamespace
-	}
-
-	kustomizationFile := filepath.Join(parentDir, "app.yaml")
-	if err := os.WriteFile(kustomizationFile, []byte(`apiVersion: kustomize.toolkit.fluxcd.io/v1
-kind: Kustomization
-metadata:
-  name: app
-  namespace: `+namespace+`
-spec:
-  interval: 5m
-  path: ./source
-  prune: true`+targetNamespaceField+`
-  sourceRef:
-    kind: GitRepository
-    name: app
-`), 0o644); err != nil {
-		t.Fatal(err)
-	}
-
-	return cwdDir, sourceDir, kustomizationFile
-}
-
 // TestBuildKustomizationPathNormalization verifies that absolute and complex
 // paths are normalized to prevent path concatenation bugs (issue #5673).
 // Without normalization, paths could be duplicated like: /path/test/path/test/file
@@ -378,8 +278,8 @@ func TestBuildKustomizationPathNormalization(t *testing.T) {
 			assertFunc: "assertGoldenTemplateFile",
 		},
 		{
-			name:       "build with absolute path (in-memory)",
-			args:       "build kustomization podinfo --path " + absTestDataPath + " --in-memory-build=true",
+			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",
 		},

cmd/flux/diff_kustomization.go

@@ -77,7 +77,7 @@ 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", false,
+	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.")

cmd/flux/diff_kustomization_test.go

@@ -22,7 +22,6 @@ package main
 import (
 	"context"
 	"os"
-	"strconv"
 	"strings"
 	"testing"
 
@@ -181,41 +180,6 @@ func TestDiffKustomizationNotDeployed(t *testing.T) {
 	}
 }
 
-func TestDiffKustomizationDefaultBuildsAbsolutePathOutsideCwd(t *testing.T) {
-	fluxNS := allocateNamespace("flux-system")
-	targetNS := allocateNamespace("target")
-	setupTestNamespace(fluxNS, t)
-	setupTestNamespace(targetNS, t)
-
-	cwdDir, sourceDir, kustomizationFile := newOutsideCwdKustomization(t, fluxNS, targetNS)
-
-	restore := chdirForTest(t, cwdDir)
-	defer restore()
-
-	flag := diffKsCmd.Flags().Lookup("in-memory-build")
-	if flag == nil {
-		t.Fatal("missing in-memory-build flag")
-	}
-	defaultValue, err := strconv.ParseBool(flag.DefValue)
-	if err != nil {
-		t.Fatal(err)
-	}
-	diffKsArgs.inMemoryBuild = defaultValue
-
-	output, err := executeCommand("diff kustomization app --path " + sourceDir +
-		" --kustomization-file " + kustomizationFile +
-		" --ignore-not-found --progress-bar=false -n " + fluxNS)
-	if isChangeError(err) {
-		err = nil
-	}
-	if err != nil {
-		t.Fatalf("expected diff to build with default backend, got: %v", err)
-	}
-	if !strings.Contains(output, "ConfigMap/"+targetNS+"/outside-cwd created") {
-		t.Fatalf("expected created ConfigMap in diff output, got:\n%s", output)
-	}
-}
-
 // 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

go.mod

@@ -13,18 +13,18 @@ require (
 	github.com/distribution/distribution/v3 v3.1.1
 	github.com/fluxcd/cli-utils v1.2.2
 	github.com/fluxcd/go-git-providers v0.27.0
-	github.com/fluxcd/helm-controller/api v1.6.2
-	github.com/fluxcd/image-automation-controller/api v1.2.2
-	github.com/fluxcd/image-reflector-controller/api v1.2.2
-	github.com/fluxcd/kustomize-controller/api v1.9.2
-	github.com/fluxcd/notification-controller/api v1.9.2
+	github.com/fluxcd/helm-controller/api v1.6.1
+	github.com/fluxcd/image-automation-controller/api v1.2.1
+	github.com/fluxcd/image-reflector-controller/api v1.2.1
+	github.com/fluxcd/kustomize-controller/api v1.9.1
+	github.com/fluxcd/notification-controller/api v1.9.1
 	github.com/fluxcd/pkg/apis/event v0.27.1
 	github.com/fluxcd/pkg/apis/meta v1.30.1
 	github.com/fluxcd/pkg/auth v0.54.1
 	github.com/fluxcd/pkg/chartutil v1.27.1
 	github.com/fluxcd/pkg/envsubst v1.7.0
 	github.com/fluxcd/pkg/git v0.52.0
-	github.com/fluxcd/pkg/kustomize v1.35.3
+	github.com/fluxcd/pkg/kustomize v1.35.1
 	github.com/fluxcd/pkg/oci v0.68.0
 	github.com/fluxcd/pkg/runtime v0.110.1
 	github.com/fluxcd/pkg/sourceignore v0.18.0
@@ -32,8 +32,8 @@ require (
 	github.com/fluxcd/pkg/ssh v0.25.0
 	github.com/fluxcd/pkg/tar v1.2.0
 	github.com/fluxcd/pkg/version v0.16.0
-	github.com/fluxcd/source-controller/api v1.9.2
-	github.com/fluxcd/source-watcher/api/v2 v2.2.2
+	github.com/fluxcd/source-controller/api v1.9.1
+	github.com/fluxcd/source-watcher/api/v2 v2.2.1
 	github.com/go-git/go-git/v5 v5.19.1
 	github.com/go-logr/logr v1.4.3
 	github.com/gonvenience/bunt v1.4.2

go.sum

@@ -176,16 +176,16 @@ github.com/fluxcd/gitkit v0.6.0 h1:iNg5LTx6ePo+Pl0ZwqHTAkhbUHxGVSY3YCxCdw7VIFg=
 github.com/fluxcd/gitkit v0.6.0/go.mod h1:svOHuKi0fO9HoawdK4HfHAJJseZDHHjk7I3ihnCIqNo=
 github.com/fluxcd/go-git-providers v0.27.0 h1:ll7qL4xYW6JtlcdRCpLYKQPqqXNs3je+J7xyEAF+fgw=
 github.com/fluxcd/go-git-providers v0.27.0/go.mod h1:l1ODx/sh0/pJ0LM8K3HJHhiMBR9dxaJcNUazT+I7VRM=
-github.com/fluxcd/helm-controller/api v1.6.2 h1:oH3kXfiSVDKB5Mmh7tF4ywC2yK1Ui7enjt7GKWJbTxM=
-github.com/fluxcd/helm-controller/api v1.6.2/go.mod h1:CaI5bHedusLcXYj1+pkd4RkSE8TtiEHI3ReHNsUySbg=
-github.com/fluxcd/image-automation-controller/api v1.2.2 h1:d/I6yMrJZGEafWUOr+2/Zahp7D99GNIDrRZJX2c7ap0=
-github.com/fluxcd/image-automation-controller/api v1.2.2/go.mod h1:LmGIeIsxdrmzJbXpexrRUaBLjJCPrNY3XhaDu6osKQY=
-github.com/fluxcd/image-reflector-controller/api v1.2.2 h1:jcO8/83mfg62N+VoBuZMKZFzUHr96B0UzsJ+qKDYzec=
-github.com/fluxcd/image-reflector-controller/api v1.2.2/go.mod h1:1dZKQPfQdjdCYWOUA2UUYlF9+xhfosfsGgWaNI875Ts=
-github.com/fluxcd/kustomize-controller/api v1.9.2 h1:qUhXlh8QA65wyKOv3R6xMBVuNTr949kUr7u3M9fCcFI=
-github.com/fluxcd/kustomize-controller/api v1.9.2/go.mod h1:utxc483AZDArFeBW5XeD/wiD0+E1oQbPi3b/TZc+v10=
-github.com/fluxcd/notification-controller/api v1.9.2 h1:Ga4kMy6Q+BS1P2CqtQr97pozNK179MKAHdN8UC1ehq0=
-github.com/fluxcd/notification-controller/api v1.9.2/go.mod h1:TpGuKZjeo2yXXKZ/X3oPIxMm/YGFQkccO31CDeXzrv4=
+github.com/fluxcd/helm-controller/api v1.6.1 h1:h48BXjp/hvN8pIst5KfU++3oyLlO2OpigXfclSj7NW4=
+github.com/fluxcd/helm-controller/api v1.6.1/go.mod h1:CaI5bHedusLcXYj1+pkd4RkSE8TtiEHI3ReHNsUySbg=
+github.com/fluxcd/image-automation-controller/api v1.2.1 h1:RgJzncZf/aZpGlySOkqztOoDaQjm0afyFzMC4gTJbjw=
+github.com/fluxcd/image-automation-controller/api v1.2.1/go.mod h1:LmGIeIsxdrmzJbXpexrRUaBLjJCPrNY3XhaDu6osKQY=
+github.com/fluxcd/image-reflector-controller/api v1.2.1 h1:MfaLweSrJjR7YTahHKB8xPhx0Iq2KvcNPsboSjYLRGM=
+github.com/fluxcd/image-reflector-controller/api v1.2.1/go.mod h1:1dZKQPfQdjdCYWOUA2UUYlF9+xhfosfsGgWaNI875Ts=
+github.com/fluxcd/kustomize-controller/api v1.9.1 h1:QiGAlrjJh8RzderBavB6Z8MoJgzU0SWi0pK3+uYhZSw=
+github.com/fluxcd/kustomize-controller/api v1.9.1/go.mod h1:utxc483AZDArFeBW5XeD/wiD0+E1oQbPi3b/TZc+v10=
+github.com/fluxcd/notification-controller/api v1.9.1 h1:XGg9Muj0x/t5wmeqZh/8ZAgTpz4NIylP0wIhNI3cN+M=
+github.com/fluxcd/notification-controller/api v1.9.1/go.mod h1:TpGuKZjeo2yXXKZ/X3oPIxMm/YGFQkccO31CDeXzrv4=
 github.com/fluxcd/pkg/apis/acl v0.10.0 h1:KPfAmELNvtvaz8wixnm/MYXqa+MJf7ntVVMUU93Aenk=
 github.com/fluxcd/pkg/apis/acl v0.10.0/go.mod h1:a87i2A7AlFO5N2J8CxtzaUCCDmuLLWOHwkKu3eJF5fY=
 github.com/fluxcd/pkg/apis/event v0.27.1 h1:bFnP6gcZzCVm/Dxf/ByFz6BW+FzSn4RoWUkf7ri2bOs=
@@ -206,8 +206,8 @@ github.com/fluxcd/pkg/git v0.52.0 h1:dgsliHdaLADUcDO4pI0pc11N4dZ21NfDdhNcgRNuAkM
 github.com/fluxcd/pkg/git v0.52.0/go.mod h1:mOvFDxoiuz+Mm4Ux1wKeTTckvBgZFvbTK8lNxmVHzKs=
 github.com/fluxcd/pkg/gittestserver v0.29.0 h1:2j03zKVL6iVn6oiUuecG/O/3Q1pULWM9JrF/HSjkpnc=
 github.com/fluxcd/pkg/gittestserver v0.29.0/go.mod h1:O8151jV0ppBZTb9IUXMjxh6hZpkiuLq8JQHDBPOkZFw=
-github.com/fluxcd/pkg/kustomize v1.35.3 h1:ufvU0W5oNS1KyIE7VHlxt80YkIMOeP/gTDoWsa8ublU=
-github.com/fluxcd/pkg/kustomize v1.35.3/go.mod h1:LKjh2x9MjoJ8Ry0WTgB84WWgF999VwA4jWDix2x+QmE=
+github.com/fluxcd/pkg/kustomize v1.35.1 h1:qAGikUZE9eDtY2EXSXl56ueWy8420Sdg8s8s0IwEa1E=
+github.com/fluxcd/pkg/kustomize v1.35.1/go.mod h1:LKjh2x9MjoJ8Ry0WTgB84WWgF999VwA4jWDix2x+QmE=
 github.com/fluxcd/pkg/oci v0.68.0 h1:eykB9HrMGOmCTT6MSKRIBMxTiieBigah1wFedMMyhYM=
 github.com/fluxcd/pkg/oci v0.68.0/go.mod h1:lNxvxqjGSGfEKI4Lnpj8mHTVDMy4Fdiico6Oml0tafU=
 github.com/fluxcd/pkg/runtime v0.110.1 h1:O7eVI/R40MQMQpi6cAlWsNka2hZ0YfMXzETmui9D06c=
@@ -222,10 +222,10 @@ github.com/fluxcd/pkg/tar v1.2.0 h1:T6WFB5M0YRHktlrgdKNskqpdp76TVDdWTOeuWz33CFs=
 github.com/fluxcd/pkg/tar v1.2.0/go.mod h1:Wlalp5vIVe+BbckkKkqExKcoHAeeWJPAzwK7ONeFcS0=
 github.com/fluxcd/pkg/version v0.16.0 h1:VR9+143LAwbyUSAaMhiJHbfsiU+fTjA9L/3dr1ucfrI=
 github.com/fluxcd/pkg/version v0.16.0/go.mod h1:2M/l90CmbDaD21JTh77hjwaUbd/YM96+Fo8x4fMdxLI=
-github.com/fluxcd/source-controller/api v1.9.2 h1:t7P7gzbVE66sfw6oHMSzsp0bH0WdMFf6RvgUW1clCI4=
-github.com/fluxcd/source-controller/api v1.9.2/go.mod h1:qO98L20gw0MvLpSPapJKypyxHP7PejmJN5KxWXxDjCA=
-github.com/fluxcd/source-watcher/api/v2 v2.2.2 h1:D9zHdmLoLl8VI+DgsgAaa6Vc2e1mXGDBn8OaToAhMT4=
-github.com/fluxcd/source-watcher/api/v2 v2.2.2/go.mod h1:v84ckEC92IRw9HZVHzUamwkgIv1Vh38NQn/jCwo8Sro=
+github.com/fluxcd/source-controller/api v1.9.1 h1:04Elx6/iFwgNOmrymfetaDfFFBqw5/LfoiTgyeLlrqQ=
+github.com/fluxcd/source-controller/api v1.9.1/go.mod h1:qO98L20gw0MvLpSPapJKypyxHP7PejmJN5KxWXxDjCA=
+github.com/fluxcd/source-watcher/api/v2 v2.2.1 h1:eRQnrksg/CylJSBFTHXMUpADRB0B2YC11YaUjSW9ZWE=
+github.com/fluxcd/source-watcher/api/v2 v2.2.1/go.mod h1:v84ckEC92IRw9HZVHzUamwkgIv1Vh38NQn/jCwo8Sro=
 github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k=
 github.com/fsnotify/fsnotify v1.9.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
 github.com/fxamacker/cbor/v2 v2.9.2 h1:X4Ksno9+x3cz0TZv69ec1hxP/+tymuR8PXQJyDwfh78=

manifests/bases/helm-controller/kustomization.yaml

@@ -1,8 +1,8 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-- https://github.com/fluxcd/helm-controller/releases/download/v1.6.2/helm-controller.crds.yaml
-- https://github.com/fluxcd/helm-controller/releases/download/v1.6.2/helm-controller.deployment.yaml
+- https://github.com/fluxcd/helm-controller/releases/download/v1.6.1/helm-controller.crds.yaml
+- https://github.com/fluxcd/helm-controller/releases/download/v1.6.1/helm-controller.deployment.yaml
 - account.yaml
 transformers:
 - labels.yaml

manifests/bases/image-automation-controller/kustomization.yaml

@@ -1,8 +1,8 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-- https://github.com/fluxcd/image-automation-controller/releases/download/v1.2.2/image-automation-controller.crds.yaml
-- https://github.com/fluxcd/image-automation-controller/releases/download/v1.2.2/image-automation-controller.deployment.yaml
+- https://github.com/fluxcd/image-automation-controller/releases/download/v1.2.1/image-automation-controller.crds.yaml
+- https://github.com/fluxcd/image-automation-controller/releases/download/v1.2.1/image-automation-controller.deployment.yaml
 - account.yaml
 transformers:
 - labels.yaml

manifests/bases/image-reflector-controller/kustomization.yaml

@@ -1,8 +1,8 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-- https://github.com/fluxcd/image-reflector-controller/releases/download/v1.2.2/image-reflector-controller.crds.yaml
-- https://github.com/fluxcd/image-reflector-controller/releases/download/v1.2.2/image-reflector-controller.deployment.yaml
+- https://github.com/fluxcd/image-reflector-controller/releases/download/v1.2.1/image-reflector-controller.crds.yaml
+- https://github.com/fluxcd/image-reflector-controller/releases/download/v1.2.1/image-reflector-controller.deployment.yaml
 - account.yaml
 transformers:
 - labels.yaml

manifests/bases/kustomize-controller/kustomization.yaml

@@ -1,8 +1,8 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-- https://github.com/fluxcd/kustomize-controller/releases/download/v1.9.2/kustomize-controller.crds.yaml
-- https://github.com/fluxcd/kustomize-controller/releases/download/v1.9.2/kustomize-controller.deployment.yaml
+- https://github.com/fluxcd/kustomize-controller/releases/download/v1.9.1/kustomize-controller.crds.yaml
+- https://github.com/fluxcd/kustomize-controller/releases/download/v1.9.1/kustomize-controller.deployment.yaml
 - account.yaml
 transformers:
 - labels.yaml

manifests/bases/notification-controller/kustomization.yaml

@@ -1,8 +1,8 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-- https://github.com/fluxcd/notification-controller/releases/download/v1.9.2/notification-controller.crds.yaml
-- https://github.com/fluxcd/notification-controller/releases/download/v1.9.2/notification-controller.deployment.yaml
+- https://github.com/fluxcd/notification-controller/releases/download/v1.9.1/notification-controller.crds.yaml
+- https://github.com/fluxcd/notification-controller/releases/download/v1.9.1/notification-controller.deployment.yaml
 - account.yaml
 transformers:
 - labels.yaml

manifests/bases/source-controller/kustomization.yaml

@@ -1,8 +1,8 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-- https://github.com/fluxcd/source-controller/releases/download/v1.9.2/source-controller.crds.yaml
-- https://github.com/fluxcd/source-controller/releases/download/v1.9.2/source-controller.deployment.yaml
+- https://github.com/fluxcd/source-controller/releases/download/v1.9.1/source-controller.crds.yaml
+- https://github.com/fluxcd/source-controller/releases/download/v1.9.1/source-controller.deployment.yaml
 - account.yaml
 transformers:
 - labels.yaml

manifests/bases/source-watcher/kustomization.yaml

@@ -1,8 +1,8 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-- https://github.com/fluxcd/source-watcher/releases/download/v2.2.2/source-watcher.crds.yaml
-- https://github.com/fluxcd/source-watcher/releases/download/v2.2.2/source-watcher.deployment.yaml
+- https://github.com/fluxcd/source-watcher/releases/download/v2.2.1/source-watcher.crds.yaml
+- https://github.com/fluxcd/source-watcher/releases/download/v2.2.1/source-watcher.deployment.yaml
 - account.yaml
 transformers:
 - labels.yaml

manifests/crds/kustomization.yaml

@@ -1,10 +1,10 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-- https://github.com/fluxcd/source-controller/releases/download/v1.9.2/source-controller.crds.yaml
-- https://github.com/fluxcd/kustomize-controller/releases/download/v1.9.2/kustomize-controller.crds.yaml
-- https://github.com/fluxcd/helm-controller/releases/download/v1.6.2/helm-controller.crds.yaml
-- https://github.com/fluxcd/notification-controller/releases/download/v1.9.2/notification-controller.crds.yaml
-- https://github.com/fluxcd/image-reflector-controller/releases/download/v1.2.2/image-reflector-controller.crds.yaml
-- https://github.com/fluxcd/image-automation-controller/releases/download/v1.2.2/image-automation-controller.crds.yaml
-- https://github.com/fluxcd/source-watcher/releases/download/v2.2.2/source-watcher.crds.yaml
+- https://github.com/fluxcd/source-controller/releases/download/v1.9.1/source-controller.crds.yaml
+- https://github.com/fluxcd/kustomize-controller/releases/download/v1.9.1/kustomize-controller.crds.yaml
+- https://github.com/fluxcd/helm-controller/releases/download/v1.6.1/helm-controller.crds.yaml
+- https://github.com/fluxcd/notification-controller/releases/download/v1.9.1/notification-controller.crds.yaml
+- https://github.com/fluxcd/image-reflector-controller/releases/download/v1.2.1/image-reflector-controller.crds.yaml
+- https://github.com/fluxcd/image-automation-controller/releases/download/v1.2.1/image-automation-controller.crds.yaml
+- https://github.com/fluxcd/source-watcher/releases/download/v2.2.1/source-watcher.crds.yaml