Merge pull request #762 from fluxcd/update-components

Update Flux to v2.6.1

Author: stefanprodan

.golangci.yml

@@ -1,45 +1,50 @@
+version: "2"
 run:
-  timeout: 5m
   allow-parallel-runners: true
-
-issues:
-  # don't skip warning about doc comments
-  # don't exclude the default set of lint
-  exclude-use-default: false
-  # restore some of the defaults
-  # (fill in the rest as needed)
-  exclude-rules:
-    - path: "api/*"
-      linters:
-        - lll
-    - path: "internal/*"
-      linters:
-        - dupl
-        - lll
-  exclude-dirs:
-    - "cmd/cli"
-linters-settings:
-  gocyclo:
-    min-complexity: 40
 linters:
-  disable-all: true
+  default: none
   enable:
     - dupl
     - errcheck
     - ginkgolinter
     - goconst
     - gocyclo
-    - gofmt
-    - goimports
-    - gosimple
     - govet
     - ineffassign
     - lll
     - misspell
     - nakedret
     - prealloc
     - staticcheck
-    - typecheck
     - unconvert
     - unparam
     - unused
+  settings:
+    gocyclo:
+      min-complexity: 40
+  exclusions:
+    generated: lax
+    rules:
+      - linters:
+          - lll
+        path: api/*
+      - linters:
+          - dupl
+          - lll
+        path: internal/*
+    paths:
+      - cmd/cli
+      - third_party$
+      - builtin$
+      - examples$
+formatters:
+  enable:
+    - gofmt
+    - goimports
+  exclusions:
+    generated: lax
+    paths:
+      - cmd/cli
+      - third_party$
+      - builtin$
+      - examples$

CHANGELOG.md

@@ -2,9 +2,15 @@
 
 All notable changes to this project are documented in this file.
 
+## 1.6.1
+
+**Release date:** 2025-06-02
+
+This release includes flux2 [v2.6.1](https://github.com/fluxcd/flux2/releases/tag/v2.6.1).
+
 ## 1.6.0
 
-**Release date:** 2025-02-29
+**Release date:** 2025-05-29
 
 This release includes flux2 [v2.6.0](https://github.com/fluxcd/flux2/releases/tag/v2.6.0).
 

docs/resources/bootstrap_git.md

@@ -49,7 +49,7 @@ The following examples are available to help you use the provider:
 - `secret_name` (String) Name of the secret the sync credentials can be found in or stored to. Defaults to `flux-system`.
 - `timeouts` (Attributes) (see [below for nested schema](#nestedatt--timeouts))
 - `toleration_keys` (Set of String) List of toleration keys used to schedule the components pods onto nodes with matching taints.
-- `version` (String) Flux version. Defaults to `v2.6.0`. Has no effect when `embedded_manifests` is enabled.
+- `version` (String) Flux version. Defaults to `v2.6.1`. Has no effect when `embedded_manifests` is enabled.
 - `watch_all_namespaces` (Boolean) If true watch for custom resources in all namespaces. Defaults to `true`.
 
 ### Read-Only

go.mod

@@ -17,10 +17,10 @@ require (
 	github.com/docker/docker v27.5.1+incompatible
 	github.com/docker/go-connections v0.5.0
 	github.com/fluxcd/cli-utils v0.36.0-flux.13
-	github.com/fluxcd/flux2/v2 v2.6.0
+	github.com/fluxcd/flux2/v2 v2.6.1
 	github.com/fluxcd/helm-controller/api v1.3.0
 	github.com/fluxcd/image-automation-controller/api v0.41.0
-	github.com/fluxcd/image-reflector-controller/api v0.35.0
+	github.com/fluxcd/image-reflector-controller/api v0.35.1
 	github.com/fluxcd/kustomize-controller/api v1.6.0
 	github.com/fluxcd/notification-controller/api v1.6.0
 	github.com/fluxcd/pkg/apis/meta v1.12.0

go.sum

@@ -99,8 +99,8 @@ github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2
 github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
 github.com/fluxcd/cli-utils v0.36.0-flux.13 h1:2X5yjz/rk9mg7+bMFBDZKGKzeZpAmY2s6iwbNZz7OzM=
 github.com/fluxcd/cli-utils v0.36.0-flux.13/go.mod h1:b2iSoIeDTtjfCB0IKtGgqlhhvWa1oux3e90CjOf81oA=
-github.com/fluxcd/flux2/v2 v2.6.0 h1:pOo9JCY4k2ZRuuMlQgu/4C8gLPtkzvccdo2QcQRurWc=
-github.com/fluxcd/flux2/v2 v2.6.0/go.mod h1:WaGrWX3bGVfzziibeItDjgZBFXx+XWRRHCaVMQJR9dc=
+github.com/fluxcd/flux2/v2 v2.6.1 h1:aBYwuMrfwMxlHwxO40L6g4tzC0gmjHesBCrpdQ7xeKU=
+github.com/fluxcd/flux2/v2 v2.6.1/go.mod h1:vKNyKQbn3Fuqm95nCJMxZyhiowB0f29g6iQt/Q4llf8=
 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.23.0 h1:7IkXIOzdMQZO98daCyFWORMMceA/eIDnq63qIXC04NM=
@@ -109,8 +109,8 @@ github.com/fluxcd/helm-controller/api v1.3.0 h1:PupXPuQbksmU0g2Lc6NjIYal2HJGL+6x
 github.com/fluxcd/helm-controller/api v1.3.0/go.mod h1:4b8PfdH0e/9Pfol2ogdMYbQ1nLjcVu9gAv27cQzIPK4=
 github.com/fluxcd/image-automation-controller/api v0.41.0 h1:wItzHTo0w50NKaJ4wV6iXKbWo5vvjDpl6bY9NOK6Rs8=
 github.com/fluxcd/image-automation-controller/api v0.41.0/go.mod h1:u1L/gztaeJgwRQrPEx2DqE4mlYoAfSeKTWx/JLUxRbA=
-github.com/fluxcd/image-reflector-controller/api v0.35.0 h1:PYPqDmo8BOu3B2vtNkp/KIdGotYAN1zwVJ0+7wumhaE=
-github.com/fluxcd/image-reflector-controller/api v0.35.0/go.mod h1:mjpokoQhFs2RxfFjY4rHpn3ZAUvee8TiELyROFN4wiA=
+github.com/fluxcd/image-reflector-controller/api v0.35.1 h1:QpnLjPR4BMRQN2C+cL6NhjvsUCQoQS00Qq40DC85OtY=
+github.com/fluxcd/image-reflector-controller/api v0.35.1/go.mod h1:mjpokoQhFs2RxfFjY4rHpn3ZAUvee8TiELyROFN4wiA=
 github.com/fluxcd/kustomize-controller/api v1.6.0 h1:8p230vpJy7giisoBNuI3CX99O+XKKVLLxXuJmv3sOHQ=
 github.com/fluxcd/kustomize-controller/api v1.6.0/go.mod h1:b0i/KVz28tV8iuqlNHx7MW6ZtTcIbBELGLoKdaK+X8M=
 github.com/fluxcd/notification-controller/api v1.6.0 h1:t0k662zxnUZlnDvFrk4DBDl6iivFmJxbwuRdyhH9Ot4=

internal/provider/resource_bootstrap_git.go

@@ -800,7 +800,7 @@ func (r bootstrapGitResource) Delete(ctx context.Context, req resource.DeleteReq
 		}
 	}
 
-	if !(data.DeleteGitManifests.IsNull() || data.DeleteGitManifests.ValueBool()) {
+	if !(data.DeleteGitManifests.IsNull() || data.DeleteGitManifests.ValueBool()) { //nolint:all
 		tflog.Debug(ctx, "Skipping git repository removal", map[string]interface{}{})
 		return
 	}
@@ -1238,7 +1238,7 @@ func isFluxReady(ctx context.Context, kubeClient client.Client, data bootstrapGi
 	}
 	if conditions.IsFalse(rootSync, meta.ReadyCondition) {
 		conditions.GetMessage(rootSync, meta.ReadyCondition)
-		return false, fmt.Errorf("Kustomization/%s: %s", ns, conditions.GetMessage(rootSync, meta.ReadyCondition))
+		return false, fmt.Errorf("Kustomization/%s: %s", ns, conditions.GetMessage(rootSync, meta.ReadyCondition)) //nolint:all
 	}
 
 	return true, nil

internal/provider/resource_bootstrap_git_test.go

@@ -716,7 +716,7 @@ func setupEnvironment(t *testing.T) environment {
 	f, err := os.OpenFile(hostAliases, os.O_CREATE|os.O_WRONLY|os.O_APPEND, os.ModePerm)
 	require.NoError(t, err)
 	defer func() { _ = f.Close() }()
-	_, err = f.WriteString(fmt.Sprintf("%s localhost\n", giteaName))
+	_, err = f.WriteString(fmt.Sprintf("%s localhost\n", giteaName)) //nolint:all
 	require.NoError(t, err)
 
 	// Run Gitea server.

internal/utils/flux.go

@@ -16,4 +16,4 @@ limitations under the License.
 
 package utils
 
-const DefaultFluxVersion string = "v2.6.0"
+const DefaultFluxVersion string = "v2.6.1"