Skip to content

Commit 2bfbf05

Browse files
authored
Merge pull request #237 from fluxcd/flux-2.5
Update dependencies to Flux v2.5
2 parents 05586e6 + 4aa9db1 commit 2bfbf05

File tree

4 files changed

+127
-135
lines changed

4 files changed

+127
-135
lines changed

.github/workflows/release.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ jobs:
9797
uses: goreleaser/goreleaser-action@90a3faa9d0182683851fbfa97ca1a2cb983bfca3 # v6.2.1
9898
with:
9999
version: latest
100-
args: release --clean --skip-validate
100+
args: release --clean --skip=validate
101101
env:
102102
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
103103
- name: Generate SLSA hashes

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ manifests: controller-gen
5252

5353
# Run go tidy to cleanup go.mod
5454
tidy:
55-
rm -f go.sum; go mod tidy -compat=1.22
55+
rm -f go.sum; go mod tidy -compat=1.23
5656

5757
# Run go fmt against code
5858
fmt:

go.mod

Lines changed: 39 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,85 +1,84 @@
11
module github.com/fluxcd/source-watcher
22

3-
go 1.22.0
3+
go 1.23.0
44

55
// Replace digest lib to master to gather access to BLAKE3.
66
// xref: https://github.com/opencontainers/go-digest/pull/66
77
replace github.com/opencontainers/go-digest => github.com/opencontainers/go-digest v1.0.1-0.20220411205349-bde1400a84be
88

99
require (
10-
github.com/fluxcd/pkg/http/fetch v0.12.1
11-
github.com/fluxcd/pkg/runtime v0.49.1
12-
github.com/fluxcd/pkg/tar v0.8.1
13-
github.com/fluxcd/source-controller/api v1.4.1
14-
github.com/spf13/pflag v1.0.5
15-
k8s.io/apimachinery v0.31.1
16-
k8s.io/client-go v0.31.1
17-
sigs.k8s.io/controller-runtime v0.19.0
10+
github.com/fluxcd/pkg/http/fetch v0.15.0
11+
github.com/fluxcd/pkg/runtime v0.53.1
12+
github.com/fluxcd/pkg/tar v0.11.0
13+
github.com/fluxcd/source-controller/api v1.5.0
14+
github.com/spf13/pflag v1.0.6
15+
k8s.io/apimachinery v0.32.2
16+
k8s.io/client-go v0.32.2
17+
sigs.k8s.io/controller-runtime v0.20.2
1818
)
1919

2020
require (
2121
github.com/beorn7/perks v1.0.1 // indirect
2222
github.com/cespare/xxhash/v2 v2.3.0 // indirect
23-
github.com/cyphar/filepath-securejoin v0.3.2 // indirect
23+
github.com/cyphar/filepath-securejoin v0.4.1 // indirect
2424
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
25-
github.com/emicklei/go-restful/v3 v3.12.0 // indirect
26-
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
27-
github.com/fluxcd/pkg/apis/acl v0.3.0 // indirect
28-
github.com/fluxcd/pkg/apis/meta v1.6.1 // indirect
29-
github.com/fsnotify/fsnotify v1.7.0 // indirect
25+
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
26+
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
27+
github.com/fluxcd/pkg/apis/acl v0.6.0 // indirect
28+
github.com/fluxcd/pkg/apis/meta v1.10.0 // indirect
29+
github.com/fsnotify/fsnotify v1.8.0 // indirect
3030
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
3131
github.com/go-logr/logr v1.4.2 // indirect
3232
github.com/go-logr/zapr v1.3.0 // indirect
3333
github.com/go-openapi/jsonpointer v0.21.0 // indirect
3434
github.com/go-openapi/jsonreference v0.21.0 // indirect
3535
github.com/go-openapi/swag v0.23.0 // indirect
3636
github.com/gogo/protobuf v1.3.2 // indirect
37-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
3837
github.com/golang/protobuf v1.5.4 // indirect
39-
github.com/google/gnostic-models v0.6.8 // indirect
38+
github.com/google/btree v1.1.3 // indirect
39+
github.com/google/gnostic-models v0.6.9 // indirect
4040
github.com/google/go-cmp v0.6.0 // indirect
4141
github.com/google/gofuzz v1.2.0 // indirect
4242
github.com/google/uuid v1.6.0 // indirect
4343
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
4444
github.com/hashicorp/go-retryablehttp v0.7.7 // indirect
45-
github.com/imdario/mergo v0.3.16 // indirect
4645
github.com/josharian/intern v1.0.0 // indirect
4746
github.com/json-iterator/go v1.1.12 // indirect
48-
github.com/klauspost/compress v1.17.9 // indirect
49-
github.com/klauspost/cpuid/v2 v2.2.8 // indirect
50-
github.com/mailru/easyjson v0.7.7 // indirect
47+
github.com/klauspost/compress v1.17.11 // indirect
48+
github.com/klauspost/cpuid/v2 v2.2.9 // indirect
49+
github.com/mailru/easyjson v0.9.0 // indirect
5150
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
5251
github.com/modern-go/reflect2 v1.0.2 // indirect
5352
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
5453
github.com/opencontainers/go-digest v1.0.0 // indirect
55-
github.com/opencontainers/go-digest/blake3 v0.0.0-20231025023718-d50d2fec9c98 // indirect
54+
github.com/opencontainers/go-digest/blake3 v0.0.0-20240426182413-22b78e47854a // indirect
5655
github.com/pkg/errors v0.9.1 // indirect
57-
github.com/prometheus/client_golang v1.20.3 // indirect
56+
github.com/prometheus/client_golang v1.20.5 // indirect
5857
github.com/prometheus/client_model v0.6.1 // indirect
59-
github.com/prometheus/common v0.55.0 // indirect
58+
github.com/prometheus/common v0.62.0 // indirect
6059
github.com/prometheus/procfs v0.15.1 // indirect
6160
github.com/x448/float16 v0.8.4 // indirect
62-
github.com/zeebo/blake3 v0.2.3 // indirect
61+
github.com/zeebo/blake3 v0.2.4 // indirect
6362
go.uber.org/multierr v1.11.0 // indirect
6463
go.uber.org/zap v1.27.0 // indirect
65-
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
66-
golang.org/x/net v0.29.0 // indirect
67-
golang.org/x/oauth2 v0.22.0 // indirect
68-
golang.org/x/sys v0.25.0 // indirect
69-
golang.org/x/term v0.24.0 // indirect
70-
golang.org/x/text v0.18.0 // indirect
71-
golang.org/x/time v0.6.0 // indirect
64+
golang.org/x/net v0.35.0 // indirect
65+
golang.org/x/oauth2 v0.26.0 // indirect
66+
golang.org/x/sync v0.11.0 // indirect
67+
golang.org/x/sys v0.30.0 // indirect
68+
golang.org/x/term v0.29.0 // indirect
69+
golang.org/x/text v0.22.0 // indirect
70+
golang.org/x/time v0.10.0 // indirect
7271
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
73-
google.golang.org/protobuf v1.34.2 // indirect
72+
google.golang.org/protobuf v1.36.4 // indirect
73+
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
7474
gopkg.in/inf.v0 v0.9.1 // indirect
75-
gopkg.in/yaml.v2 v2.4.0 // indirect
7675
gopkg.in/yaml.v3 v3.0.1 // indirect
77-
k8s.io/api v0.31.1 // indirect
78-
k8s.io/apiextensions-apiserver v0.31.1 // indirect
76+
k8s.io/api v0.32.2 // indirect
77+
k8s.io/apiextensions-apiserver v0.32.2 // indirect
7978
k8s.io/klog/v2 v2.130.1 // indirect
80-
k8s.io/kube-openapi v0.0.0-20240411171206-dc4e619f62f3 // indirect
81-
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
82-
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
83-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
79+
k8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7 // indirect
80+
k8s.io/utils v0.0.0-20241210054802-24370beab758 // indirect
81+
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
82+
sigs.k8s.io/structured-merge-diff/v4 v4.5.0 // indirect
8483
sigs.k8s.io/yaml v1.4.0 // indirect
8584
)

0 commit comments

Comments
 (0)