Skip to content

Commit 0d91819

Browse files
authored
Merge pull request #766 from fluxcd/update-components
Update Flux to v2.6.3
2 parents f65bbeb + d7002cb commit 0d91819

File tree

5 files changed

+20
-14
lines changed

5 files changed

+20
-14
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.3
6+
7+
**Release date:** 2025-06-27
8+
9+
This release includes flux2 [v2.6.3](https://github.com/fluxcd/flux2/releases/tag/v2.6.3).
10+
511
## 1.6.2
612

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

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.2`. Has no effect when `embedded_manifests` is enabled.
52+
- `version` (String) Flux version. Defaults to `v2.6.3`. 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: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,19 @@ 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.2
20+
github.com/fluxcd/flux2/v2 v2.6.3
2121
github.com/fluxcd/helm-controller/api v1.3.0
22-
github.com/fluxcd/image-automation-controller/api v0.41.1
22+
github.com/fluxcd/image-automation-controller/api v0.41.2
2323
github.com/fluxcd/image-reflector-controller/api v0.35.2
2424
github.com/fluxcd/kustomize-controller/api v1.6.0
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
28-
github.com/fluxcd/pkg/git/gogit v0.35.0
28+
github.com/fluxcd/pkg/git/gogit v0.35.1
2929
github.com/fluxcd/pkg/runtime v0.60.0
3030
github.com/fluxcd/pkg/ssa v0.48.0
3131
github.com/fluxcd/pkg/ssh v0.19.0
32-
github.com/fluxcd/source-controller/api v1.6.1
32+
github.com/fluxcd/source-controller/api v1.6.2
3333
github.com/go-logr/logr v1.4.2
3434
github.com/google/go-containerregistry v0.20.3
3535
github.com/hashicorp/terraform-plugin-docs v0.20.1

go.sum

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -99,16 +99,16 @@ github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2
9999
github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
100100
github.com/fluxcd/cli-utils v0.36.0-flux.13 h1:2X5yjz/rk9mg7+bMFBDZKGKzeZpAmY2s6iwbNZz7OzM=
101101
github.com/fluxcd/cli-utils v0.36.0-flux.13/go.mod h1:b2iSoIeDTtjfCB0IKtGgqlhhvWa1oux3e90CjOf81oA=
102-
github.com/fluxcd/flux2/v2 v2.6.2 h1:P8DHoDnKqcywVcMqn1HARSwcgnqIydOQdWtHRvcsVuM=
103-
github.com/fluxcd/flux2/v2 v2.6.2/go.mod h1:Tq1aRCmNPgQ/UJkg9W6I++81/otb1E/3VfaotLXbwME=
102+
github.com/fluxcd/flux2/v2 v2.6.3 h1:pi2S2BJFfg3lURQ/q7WuOHaLhdPX3NhY0Pi66O4Epks=
103+
github.com/fluxcd/flux2/v2 v2.6.3/go.mod h1:H638p5YbIetl64wnpybeWf+NT3S273byQ9uHeNg1bnk=
104104
github.com/fluxcd/gitkit v0.6.0 h1:iNg5LTx6ePo+Pl0ZwqHTAkhbUHxGVSY3YCxCdw7VIFg=
105105
github.com/fluxcd/gitkit v0.6.0/go.mod h1:svOHuKi0fO9HoawdK4HfHAJJseZDHHjk7I3ihnCIqNo=
106106
github.com/fluxcd/go-git-providers v0.23.0 h1:7IkXIOzdMQZO98daCyFWORMMceA/eIDnq63qIXC04NM=
107107
github.com/fluxcd/go-git-providers v0.23.0/go.mod h1:XUDCVcBbCp0OgnKztOenSbiYXms/0yPquhuhVCNyqfU=
108108
github.com/fluxcd/helm-controller/api v1.3.0 h1:PupXPuQbksmU0g2Lc6NjIYal2HJGL+6xohsf82eGVjo=
109109
github.com/fluxcd/helm-controller/api v1.3.0/go.mod h1:4b8PfdH0e/9Pfol2ogdMYbQ1nLjcVu9gAv27cQzIPK4=
110-
github.com/fluxcd/image-automation-controller/api v0.41.1 h1:zT0BN/LRqMzo4B53mM7ayAg73Ifh+th46H6TtQrB+7A=
111-
github.com/fluxcd/image-automation-controller/api v0.41.1/go.mod h1:TaCaXnDu0a6uWyF41WkyskH0gg6dFyniftvdCELcEKU=
110+
github.com/fluxcd/image-automation-controller/api v0.41.2 h1:miYjID4Mg51xcObVLQPRGkiWFYGpBSgItTXfQ4jVUVI=
111+
github.com/fluxcd/image-automation-controller/api v0.41.2/go.mod h1:TaCaXnDu0a6uWyF41WkyskH0gg6dFyniftvdCELcEKU=
112112
github.com/fluxcd/image-reflector-controller/api v0.35.2 h1:EzjtUpyx8kbTFx7ugdi5LRMaCpQW4kX/vjFCIPpPD38=
113113
github.com/fluxcd/image-reflector-controller/api v0.35.2/go.mod h1:mjpokoQhFs2RxfFjY4rHpn3ZAUvee8TiELyROFN4wiA=
114114
github.com/fluxcd/kustomize-controller/api v1.6.0 h1:8p230vpJy7giisoBNuI3CX99O+XKKVLLxXuJmv3sOHQ=
@@ -125,8 +125,8 @@ github.com/fluxcd/pkg/cache v0.9.0 h1:EGKfOLMG3fOwWnH/4Axl5xd425mxoQbZzlZoLfd8PD
125125
github.com/fluxcd/pkg/cache v0.9.0/go.mod h1:jMwabjWfsC5lW8hE7NM3wtGNwSJ38Javx6EKbEi7INU=
126126
github.com/fluxcd/pkg/git v0.32.0 h1:agSE4Ia8saj5eg075qhLhZvjuTg/Hnj8mZU0meGKOyc=
127127
github.com/fluxcd/pkg/git v0.32.0/go.mod h1:rUgLXVQGBkBggHOLVMhHMHaweQ8Oc6HwZiN2Zm08Zxs=
128-
github.com/fluxcd/pkg/git/gogit v0.35.0 h1:uMFFwhg3X4H2GaJtXBG/sEv5yrIUk7gIdIpayTLXdC0=
129-
github.com/fluxcd/pkg/git/gogit v0.35.0/go.mod h1:/WcAqTDBrjF+6cwFTaK7kNM791j/pXmw0fy8xbd1YWo=
128+
github.com/fluxcd/pkg/git/gogit v0.35.1 h1:NZI7rWDUUaGhEqgbvlh2CK9UZU/eteQ3eDTEMvdHmBo=
129+
github.com/fluxcd/pkg/git/gogit v0.35.1/go.mod h1:/WcAqTDBrjF+6cwFTaK7kNM791j/pXmw0fy8xbd1YWo=
130130
github.com/fluxcd/pkg/gittestserver v0.17.0 h1:JlBvWZQTDOI+np5Z+084m3DkeAH1hMusEybyRUDF63k=
131131
github.com/fluxcd/pkg/gittestserver v0.17.0/go.mod h1:E/40EmLoXcMqd6gLuLDC9F6KJxqHVGbBBeMNKk5XdxU=
132132
github.com/fluxcd/pkg/kustomize v1.18.0 h1:wWK+qYwmBmba3N3VAqZ9ijnfVGGaIjcaHWo033URZTw=
@@ -141,8 +141,8 @@ github.com/fluxcd/pkg/tar v0.12.0 h1:og6F+ivnWNRbNJSq0ukCTVs7YrGIlzjxSVZU+E8NprM
141141
github.com/fluxcd/pkg/tar v0.12.0/go.mod h1:Ra5Cj++MD5iCy7bZGKJJX3GpOeMPv+ZDkPO9bBwpDeU=
142142
github.com/fluxcd/pkg/version v0.7.0 h1:jZT5I6WFy1KlM40nHCSqlHmjC1VT1/DfmbAdOkIVVJc=
143143
github.com/fluxcd/pkg/version v0.7.0/go.mod h1:3BjQDJXIZJmeJLXnfa2yG/sNAT1t5oeLAPfnSjOHNuA=
144-
github.com/fluxcd/source-controller/api v1.6.1 h1:ZPTA9lNzBYHmwHfFX978qb8xVkdnQZHF1ggo6BoFm4w=
145-
github.com/fluxcd/source-controller/api v1.6.1/go.mod h1:ZJcAi0nemsnBxjVgmJl0WQzNvB0rMETxQMTdoFosmMw=
144+
github.com/fluxcd/source-controller/api v1.6.2 h1:UmodAeqLIeF29HdTqf2GiacZyO+hJydJlepDaYsMvhc=
145+
github.com/fluxcd/source-controller/api v1.6.2/go.mod h1:ZJcAi0nemsnBxjVgmJl0WQzNvB0rMETxQMTdoFosmMw=
146146
github.com/frankban/quicktest v1.14.3 h1:FJKSZTDHjyhriyC81FLQ0LY93eSai0ZyR/ZIkd3ZUKE=
147147
github.com/frankban/quicktest v1.14.3/go.mod h1:mgiwOwqx65TmIk1wJ6Q7wvnVMocbUorkibMOrVTHZps=
148148
github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k=

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.2"
19+
const DefaultFluxVersion string = "v2.6.3"

0 commit comments

Comments
 (0)