Skip to content

Commit 48e569e

Browse files
authored
Merge pull request #772 from fluxcd/update-components
Update Flux to v2.6.4
2 parents 0668b06 + 7574bf9 commit 48e569e

File tree

5 files changed

+14
-8
lines changed

5 files changed

+14
-8
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22

33
All notable changes to this project are documented in this file.
44

5+
## 1.6.4
6+
7+
**Release date:** 2025-07-08
8+
9+
This release includes flux2 [v2.6.4](https://github.com/fluxcd/flux2/releases/tag/v2.6.4).
10+
511
## 1.6.3
612

713
**Release date:** 2025-06-27

docs/resources/bootstrap_git.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ The following examples are available to help you use the provider:
4949
- `secret_name` (String) Name of the secret the sync credentials can be found in or stored to. Defaults to `flux-system`.
5050
- `timeouts` (Attributes) (see [below for nested schema](#nestedatt--timeouts))
5151
- `toleration_keys` (Set of String) List of toleration keys used to schedule the components pods onto nodes with matching taints.
52-
- `version` (String) Flux version. Defaults to `v2.6.3`. Has no effect when `embedded_manifests` is enabled.
52+
- `version` (String) Flux version. Defaults to `v2.6.4`. Has no effect when `embedded_manifests` is enabled.
5353
- `watch_all_namespaces` (Boolean) If true watch for custom resources in all namespaces. Defaults to `true`.
5454

5555
### Read-Only

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ require (
1717
github.com/docker/docker v27.5.1+incompatible
1818
github.com/docker/go-connections v0.5.0
1919
github.com/fluxcd/cli-utils v0.36.0-flux.13
20-
github.com/fluxcd/flux2/v2 v2.6.3
20+
github.com/fluxcd/flux2/v2 v2.6.4
2121
github.com/fluxcd/helm-controller/api v1.3.0
2222
github.com/fluxcd/image-automation-controller/api v0.41.2
2323
github.com/fluxcd/image-reflector-controller/api v0.35.2
24-
github.com/fluxcd/kustomize-controller/api v1.6.0
24+
github.com/fluxcd/kustomize-controller/api v1.6.1
2525
github.com/fluxcd/notification-controller/api v1.6.0
2626
github.com/fluxcd/pkg/apis/meta v1.12.0
2727
github.com/fluxcd/pkg/git v0.32.0

go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,8 @@ github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2
101101
github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
102102
github.com/fluxcd/cli-utils v0.36.0-flux.13 h1:2X5yjz/rk9mg7+bMFBDZKGKzeZpAmY2s6iwbNZz7OzM=
103103
github.com/fluxcd/cli-utils v0.36.0-flux.13/go.mod h1:b2iSoIeDTtjfCB0IKtGgqlhhvWa1oux3e90CjOf81oA=
104-
github.com/fluxcd/flux2/v2 v2.6.3 h1:pi2S2BJFfg3lURQ/q7WuOHaLhdPX3NhY0Pi66O4Epks=
105-
github.com/fluxcd/flux2/v2 v2.6.3/go.mod h1:H638p5YbIetl64wnpybeWf+NT3S273byQ9uHeNg1bnk=
104+
github.com/fluxcd/flux2/v2 v2.6.4 h1:RHv3fZclZRMh9Szok4tmN2/aLOOkkKcr7S8//BfF4zg=
105+
github.com/fluxcd/flux2/v2 v2.6.4/go.mod h1:9S1t2KYOH7km9JJgnIvH+OJCCYPJpx7O/+ZQkEUjrj4=
106106
github.com/fluxcd/gitkit v0.6.0 h1:iNg5LTx6ePo+Pl0ZwqHTAkhbUHxGVSY3YCxCdw7VIFg=
107107
github.com/fluxcd/gitkit v0.6.0/go.mod h1:svOHuKi0fO9HoawdK4HfHAJJseZDHHjk7I3ihnCIqNo=
108108
github.com/fluxcd/go-git-providers v0.23.0 h1:7IkXIOzdMQZO98daCyFWORMMceA/eIDnq63qIXC04NM=
@@ -113,8 +113,8 @@ github.com/fluxcd/image-automation-controller/api v0.41.2 h1:miYjID4Mg51xcObVLQP
113113
github.com/fluxcd/image-automation-controller/api v0.41.2/go.mod h1:TaCaXnDu0a6uWyF41WkyskH0gg6dFyniftvdCELcEKU=
114114
github.com/fluxcd/image-reflector-controller/api v0.35.2 h1:EzjtUpyx8kbTFx7ugdi5LRMaCpQW4kX/vjFCIPpPD38=
115115
github.com/fluxcd/image-reflector-controller/api v0.35.2/go.mod h1:mjpokoQhFs2RxfFjY4rHpn3ZAUvee8TiELyROFN4wiA=
116-
github.com/fluxcd/kustomize-controller/api v1.6.0 h1:8p230vpJy7giisoBNuI3CX99O+XKKVLLxXuJmv3sOHQ=
117-
github.com/fluxcd/kustomize-controller/api v1.6.0/go.mod h1:b0i/KVz28tV8iuqlNHx7MW6ZtTcIbBELGLoKdaK+X8M=
116+
github.com/fluxcd/kustomize-controller/api v1.6.1 h1:8AOD+BWQwCLT+u5jgtGryZWkCeslgr+cnQAfUzgWmGk=
117+
github.com/fluxcd/kustomize-controller/api v1.6.1/go.mod h1:b0i/KVz28tV8iuqlNHx7MW6ZtTcIbBELGLoKdaK+X8M=
118118
github.com/fluxcd/notification-controller/api v1.6.0 h1:t0k662zxnUZlnDvFrk4DBDl6iivFmJxbwuRdyhH9Ot4=
119119
github.com/fluxcd/notification-controller/api v1.6.0/go.mod h1:b1gwfsygqnasQVdn/iMCFDI81LeOeY/ibLul+Z6W8U0=
120120
github.com/fluxcd/pkg/apis/acl v0.7.0 h1:dMhZJH+g6ZRPjs4zVOAN9vHBd1DcavFgcIFkg5ooOE0=

internal/utils/flux.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ limitations under the License.
1616

1717
package utils
1818

19-
const DefaultFluxVersion string = "v2.6.3"
19+
const DefaultFluxVersion string = "v2.6.4"

0 commit comments

Comments
 (0)