Skip to content

Commit 2140d33

Browse files
authored
Merge pull request #778 from fluxcd/update-components
Update Flux to v2.7.0
2 parents 38bb797 + 9237fcb commit 2140d33

File tree

6 files changed

+162
-172
lines changed

6 files changed

+162
-172
lines changed

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.4`. Has no effect when `embedded_manifests` is enabled.
52+
- `version` (String) Flux version. Defaults to `v2.7.0`. 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: 46 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -17,21 +17,22 @@ require (
1717
github.com/docker/docker v28.3.3+incompatible
1818
github.com/docker/go-connections v0.6.0
1919
github.com/fluxcd/cli-utils v0.36.0-flux.15
20-
github.com/fluxcd/flux2/v2 v2.6.4
21-
github.com/fluxcd/helm-controller/api v1.3.0
22-
github.com/fluxcd/image-automation-controller/api v0.41.2
23-
github.com/fluxcd/image-reflector-controller/api v0.35.2
24-
github.com/fluxcd/kustomize-controller/api v1.6.1
25-
github.com/fluxcd/notification-controller/api v1.6.0
26-
github.com/fluxcd/pkg/apis/meta v1.20.0
27-
github.com/fluxcd/pkg/git v0.32.0
28-
github.com/fluxcd/pkg/git/gogit v0.35.1
29-
github.com/fluxcd/pkg/runtime v0.60.0
30-
github.com/fluxcd/pkg/ssa v0.48.0
31-
github.com/fluxcd/pkg/ssh v0.19.0
32-
github.com/fluxcd/source-controller/api v1.6.2
20+
github.com/fluxcd/flux2/v2 v2.7.0
21+
github.com/fluxcd/helm-controller/api v1.4.0
22+
github.com/fluxcd/image-automation-controller/api v1.0.1
23+
github.com/fluxcd/image-reflector-controller/api v1.0.1
24+
github.com/fluxcd/kustomize-controller/api v1.7.0
25+
github.com/fluxcd/notification-controller/api v1.7.1
26+
github.com/fluxcd/pkg/apis/meta v1.21.0
27+
github.com/fluxcd/pkg/git v0.36.0
28+
github.com/fluxcd/pkg/git/gogit v0.40.0
29+
github.com/fluxcd/pkg/runtime v0.86.0
30+
github.com/fluxcd/pkg/ssa v0.58.0
31+
github.com/fluxcd/pkg/ssh v0.21.0
32+
github.com/fluxcd/source-controller/api v1.7.0
33+
github.com/fluxcd/source-watcher/api/v2 v2.0.1
3334
github.com/go-logr/logr v1.4.3
34-
github.com/google/go-containerregistry v0.20.3
35+
github.com/google/go-containerregistry v0.20.6
3536
github.com/hashicorp/terraform-plugin-docs v0.20.1
3637
github.com/hashicorp/terraform-plugin-framework v1.13.0
3738
github.com/hashicorp/terraform-plugin-framework-timeouts v0.5.0
@@ -48,7 +49,7 @@ require (
4849
k8s.io/apimachinery v0.34.0
4950
k8s.io/cli-runtime v0.34.0
5051
k8s.io/client-go v0.34.0
51-
sigs.k8s.io/controller-runtime v0.22.0
52+
sigs.k8s.io/controller-runtime v0.22.1
5253
sigs.k8s.io/kind v0.25.0
5354
sigs.k8s.io/kustomize/api v0.20.1
5455
sigs.k8s.io/yaml v1.6.0
@@ -73,7 +74,6 @@ require (
7374
github.com/bgentry/speakeasy v0.1.0 // indirect
7475
github.com/blang/semver/v4 v4.0.0 // indirect
7576
github.com/bmatcuk/doublestar/v4 v4.7.1 // indirect
76-
github.com/bradleyfalzon/ghinstallation/v2 v2.15.0 // indirect
7777
github.com/cespare/xxhash/v2 v2.3.0 // indirect
7878
github.com/chai2010/gettext-go v1.0.2 // indirect
7979
github.com/cloudflare/circl v1.6.1 // indirect
@@ -90,13 +90,12 @@ require (
9090
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
9191
github.com/fatih/color v1.16.0 // indirect
9292
github.com/felixge/httpsnoop v1.0.4 // indirect
93-
github.com/fluxcd/go-git-providers v0.23.0 // indirect
94-
github.com/fluxcd/pkg/apis/acl v0.7.0 // indirect
95-
github.com/fluxcd/pkg/apis/kustomize v1.10.0 // indirect
96-
github.com/fluxcd/pkg/cache v0.9.0 // indirect
97-
github.com/fluxcd/pkg/kustomize v1.18.0 // indirect
98-
github.com/fluxcd/pkg/tar v0.12.0 // indirect
99-
github.com/fluxcd/pkg/version v0.7.0 // indirect
93+
github.com/fluxcd/go-git-providers v0.24.0 // indirect
94+
github.com/fluxcd/pkg/apis/acl v0.9.0 // indirect
95+
github.com/fluxcd/pkg/apis/kustomize v1.12.0 // indirect
96+
github.com/fluxcd/pkg/kustomize v1.22.0 // indirect
97+
github.com/fluxcd/pkg/tar v0.14.0 // indirect
98+
github.com/fluxcd/pkg/version v0.10.0 // indirect
10099
github.com/fsnotify/fsnotify v1.9.0 // indirect
101100
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
102101
github.com/go-errors/errors v1.5.1 // indirect
@@ -109,13 +108,12 @@ require (
109108
github.com/go-openapi/jsonreference v0.21.0 // indirect
110109
github.com/go-openapi/swag v0.23.1 // indirect
111110
github.com/gogo/protobuf v1.3.2 // indirect
112-
github.com/golang-jwt/jwt/v4 v4.5.2 // indirect
113111
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
114112
github.com/golang/protobuf v1.5.4 // indirect
115113
github.com/google/btree v1.1.3 // indirect
116114
github.com/google/gnostic-models v0.7.0 // indirect
117115
github.com/google/go-cmp v0.7.0 // indirect
118-
github.com/google/go-github/v71 v71.0.0 // indirect
116+
github.com/google/go-github/v72 v72.0.0 // indirect
119117
github.com/google/go-querystring v1.1.0 // indirect
120118
github.com/google/safetext v0.0.0-20220905092116-b49f7bc46da2 // indirect
121119
github.com/google/uuid v1.6.0 // indirect
@@ -129,7 +127,7 @@ require (
129127
github.com/hashicorp/go-hclog v1.6.3 // indirect
130128
github.com/hashicorp/go-multierror v1.1.1 // indirect
131129
github.com/hashicorp/go-plugin v1.6.2 // indirect
132-
github.com/hashicorp/go-retryablehttp v0.7.7 // indirect
130+
github.com/hashicorp/go-retryablehttp v0.7.8 // indirect
133131
github.com/hashicorp/go-uuid v1.0.3 // indirect
134132
github.com/hashicorp/go-version v1.7.0 // indirect
135133
github.com/hashicorp/hc-install v0.9.1 // indirect
@@ -146,20 +144,20 @@ require (
146144
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
147145
github.com/josharian/intern v1.0.0 // indirect
148146
github.com/json-iterator/go v1.1.12 // indirect
149-
github.com/kevinburke/ssh_config v1.2.0 // indirect
147+
github.com/kevinburke/ssh_config v1.4.0 // indirect
150148
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
151149
github.com/mailru/easyjson v0.9.0 // indirect
152150
github.com/mattn/go-colorable v0.1.13 // indirect
153151
github.com/mattn/go-isatty v0.0.20 // indirect
154-
github.com/mattn/go-runewidth v0.0.13 // indirect
152+
github.com/mattn/go-runewidth v0.0.16 // indirect
155153
github.com/mitchellh/copystructure v1.2.0 // indirect
156154
github.com/mitchellh/go-testing-interface v1.14.1 // indirect
157155
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
158156
github.com/mitchellh/mapstructure v1.5.0 // indirect
159157
github.com/mitchellh/reflectwalk v1.0.2 // indirect
160158
github.com/moby/docker-image-spec v1.3.1 // indirect
161159
github.com/moby/spdystream v0.5.0 // indirect
162-
github.com/moby/sys/atomicwriter v0.1.0 // indirect
160+
github.com/moby/sys/sequential v0.6.0 // indirect
163161
github.com/moby/term v0.5.2 // indirect
164162
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
165163
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
@@ -173,22 +171,22 @@ require (
173171
github.com/otiai10/mint v1.6.3 // indirect
174172
github.com/pelletier/go-toml v1.9.5 // indirect
175173
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
176-
github.com/pjbgf/sha1cd v0.3.2 // indirect
174+
github.com/pjbgf/sha1cd v0.4.0 // indirect
177175
github.com/pkg/errors v0.9.1 // indirect
178176
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
179177
github.com/posener/complete v1.2.3 // indirect
180-
github.com/prometheus/client_golang v1.22.0 // indirect
178+
github.com/prometheus/client_golang v1.23.0 // indirect
181179
github.com/prometheus/client_model v0.6.2 // indirect
182180
github.com/prometheus/common v0.65.0 // indirect
183181
github.com/prometheus/procfs v0.17.0 // indirect
184182
github.com/rivo/uniseg v0.2.0 // indirect
185183
github.com/russross/blackfriday/v2 v2.1.0 // indirect
186-
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
184+
github.com/sergi/go-diff v1.4.0 // indirect
187185
github.com/shopspring/decimal v1.3.1 // indirect
188186
github.com/skeema/knownhosts v1.3.1 // indirect
189187
github.com/spf13/cast v1.5.0 // indirect
190-
github.com/spf13/cobra v1.9.1 // indirect
191-
github.com/spf13/pflag v1.0.6 // indirect
188+
github.com/spf13/cobra v1.10.1 // indirect
189+
github.com/spf13/pflag v1.0.9 // indirect
192190
github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect
193191
github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect
194192
github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
@@ -198,7 +196,7 @@ require (
198196
github.com/yuin/goldmark v1.7.7 // indirect
199197
github.com/yuin/goldmark-meta v1.1.0 // indirect
200198
github.com/zclconf/go-cty v1.16.2 // indirect
201-
gitlab.com/gitlab-org/api/client-go v0.128.0 // indirect
199+
gitlab.com/gitlab-org/api/client-go v0.142.5 // indirect
202200
go.abhg.dev/goldmark/frontmatter v0.2.0 // indirect
203201
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
204202
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 // indirect
@@ -207,22 +205,22 @@ require (
207205
go.opentelemetry.io/otel/trace v1.38.0 // indirect
208206
go.yaml.in/yaml/v2 v2.4.2 // indirect
209207
go.yaml.in/yaml/v3 v3.0.4 // indirect
210-
golang.org/x/crypto v0.41.0 // indirect
208+
golang.org/x/crypto v0.42.0 // indirect
211209
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect
212-
golang.org/x/mod v0.27.0 // indirect
213-
golang.org/x/net v0.43.0 // indirect
210+
golang.org/x/mod v0.28.0 // indirect
211+
golang.org/x/net v0.44.0 // indirect
214212
golang.org/x/oauth2 v0.30.0 // indirect
215-
golang.org/x/sync v0.16.0 // indirect
216-
golang.org/x/sys v0.35.0 // indirect
217-
golang.org/x/term v0.34.0 // indirect
218-
golang.org/x/text v0.28.0 // indirect
213+
golang.org/x/sync v0.17.0 // indirect
214+
golang.org/x/sys v0.36.0 // indirect
215+
golang.org/x/term v0.35.0 // indirect
216+
golang.org/x/text v0.29.0 // indirect
219217
golang.org/x/time v0.12.0 // indirect
220-
golang.org/x/tools v0.36.0 // indirect
218+
golang.org/x/tools v0.37.0 // indirect
221219
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
222220
google.golang.org/appengine v1.6.8 // indirect
223-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250303144028-a0af3efb3deb // indirect
224-
google.golang.org/grpc v1.72.1 // indirect
225-
google.golang.org/protobuf v1.36.7 // indirect
221+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250825161204-c5933d9347a5 // indirect
222+
google.golang.org/grpc v1.75.0 // indirect
223+
google.golang.org/protobuf v1.36.8 // indirect
226224
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
227225
gopkg.in/inf.v0 v0.9.1 // indirect
228226
gopkg.in/warnings.v0 v0.1.2 // indirect
@@ -232,10 +230,9 @@ require (
232230
k8s.io/klog/v2 v2.130.1 // indirect
233231
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b // indirect
234232
k8s.io/kubectl v0.34.0 // indirect
235-
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 // indirect
236-
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
233+
k8s.io/utils v0.0.0-20250820121507-0af2bda4dd1d // indirect
234+
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
237235
sigs.k8s.io/kustomize/kyaml v0.20.1 // indirect
238236
sigs.k8s.io/randfill v1.0.0 // indirect
239-
sigs.k8s.io/structured-merge-diff/v4 v4.7.0 // indirect
240237
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
241238
)

0 commit comments

Comments
 (0)