Skip to content

Commit 344dd29

Browse files
authored
Merge pull request #425 from fluxcd/kube-1.25
Update Kubernetes packages to v1.25.0
2 parents eb9020e + 63e55d2 commit 344dd29

File tree

5 files changed

+156
-301
lines changed

5 files changed

+156
-301
lines changed

api/go.mod

+10-13
Original file line numberDiff line numberDiff line change
@@ -3,32 +3,29 @@ module github.com/fluxcd/image-automation-controller/api
33
go 1.18
44

55
require (
6-
github.com/fluxcd/pkg/apis/meta v0.14.2
7-
github.com/fluxcd/source-controller/api v0.26.0
8-
k8s.io/apimachinery v0.24.3
6+
github.com/fluxcd/pkg/apis/meta v0.15.0
7+
github.com/fluxcd/source-controller/api v0.28.0
8+
k8s.io/apimachinery v0.25.0
99
sigs.k8s.io/controller-runtime v0.11.2
1010
)
1111

1212
// Fix CVE-2022-28948
1313
replace gopkg.in/yaml.v3 => gopkg.in/yaml.v3 v3.0.0
1414

15-
// Fix CVE-2022-31030
16-
replace github.com/containerd/containerd => github.com/containerd/containerd v1.6.6
17-
1815
require (
19-
github.com/fluxcd/pkg/apis/acl v0.0.3 // indirect
20-
github.com/go-logr/logr v1.2.2 // indirect
16+
github.com/fluxcd/pkg/apis/acl v0.1.0 // indirect
17+
github.com/go-logr/logr v1.2.3 // indirect
2118
github.com/gogo/protobuf v1.3.2 // indirect
2219
github.com/google/gofuzz v1.2.0 // indirect
2320
github.com/json-iterator/go v1.1.12 // indirect
2421
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
2522
github.com/modern-go/reflect2 v1.0.2 // indirect
26-
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect
23+
golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect
2724
golang.org/x/text v0.3.7 // indirect
2825
gopkg.in/inf.v0 v0.9.1 // indirect
2926
gopkg.in/yaml.v2 v2.4.0 // indirect
30-
k8s.io/klog/v2 v2.60.1 // indirect
31-
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect
32-
sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect
33-
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
27+
k8s.io/klog/v2 v2.70.1 // indirect
28+
k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed // indirect
29+
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
30+
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
3431
)

0 commit comments

Comments
 (0)