Skip to content

Commit e468969

Browse files
committed
go.mod: upgrade to k8s.io v1.30-rc.1 release
Signed-off-by: Mikko Ylinen <[email protected]>
1 parent 61e38e0 commit e468969

File tree

2 files changed

+123
-117
lines changed

2 files changed

+123
-117
lines changed

go.mod

Lines changed: 65 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -8,25 +8,25 @@ require (
88
github.com/go-logr/logr v1.4.1
99
github.com/google/go-cmp v0.6.0
1010
github.com/klauspost/cpuid/v2 v2.2.7
11-
github.com/onsi/ginkgo/v2 v2.17.0
11+
github.com/onsi/ginkgo/v2 v2.17.1
1212
github.com/onsi/gomega v1.32.0
1313
github.com/pkg/errors v0.9.1
1414
github.com/prometheus/client_model v0.6.0
15-
github.com/prometheus/common v0.47.0
15+
github.com/prometheus/common v0.48.0
1616
golang.org/x/sys v0.18.0
1717
golang.org/x/text v0.14.0
1818
google.golang.org/grpc v1.62.1
1919
gopkg.in/yaml.v2 v2.4.0
20-
k8s.io/api v0.29.0
21-
k8s.io/apimachinery v0.29.0
22-
k8s.io/client-go v0.29.0
23-
k8s.io/component-base v0.29.0
24-
k8s.io/klog/v2 v2.110.1
25-
k8s.io/kubelet v0.29.0
26-
k8s.io/kubernetes v1.29.0
20+
k8s.io/api v0.30.0-rc.1
21+
k8s.io/apimachinery v0.30.0-rc.1
22+
k8s.io/client-go v0.30.0-rc.1
23+
k8s.io/component-base v0.30.0-rc.1
24+
k8s.io/klog/v2 v2.120.1
25+
k8s.io/kubelet v0.30.0-rc.1
26+
k8s.io/kubernetes v1.30.0-rc.1
2727
k8s.io/pod-security-admission v0.0.0
2828
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
29-
sigs.k8s.io/controller-runtime v0.17.2
29+
sigs.k8s.io/controller-runtime v0.17.1-0.20240327193027-21368602d84b
3030
sigs.k8s.io/yaml v1.4.0
3131
)
3232

@@ -45,7 +45,7 @@ require (
4545
github.com/distribution/reference v0.5.0 // indirect
4646
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
4747
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
48-
github.com/evanphx/json-patch/v5 v5.8.0 // indirect
48+
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
4949
github.com/felixge/httpsnoop v1.0.3 // indirect
5050
github.com/go-logr/stdr v1.2.2 // indirect
5151
github.com/go-openapi/jsonpointer v0.19.6 // indirect
@@ -54,8 +54,8 @@ require (
5454
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
5555
github.com/gogo/protobuf v1.3.2 // indirect
5656
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
57-
github.com/golang/protobuf v1.5.3 // indirect
58-
github.com/google/cel-go v0.17.7 // indirect
57+
github.com/golang/protobuf v1.5.4 // indirect
58+
github.com/google/cel-go v0.17.8 // indirect
5959
github.com/google/gnostic-models v0.6.8 // indirect
6060
github.com/google/gofuzz v1.2.0 // indirect
6161
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
@@ -74,7 +74,7 @@ require (
7474
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
7575
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
7676
github.com/opencontainers/go-digest v1.0.0 // indirect
77-
github.com/prometheus/client_golang v1.18.0 // indirect
77+
github.com/prometheus/client_golang v1.19.0 // indirect
7878
github.com/prometheus/procfs v0.12.0 // indirect
7979
github.com/spf13/cobra v1.7.0 // indirect
8080
github.com/spf13/pflag v1.0.5 // indirect
@@ -92,16 +92,16 @@ require (
9292
go.opentelemetry.io/otel/trace v1.20.0 // indirect
9393
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
9494
go.uber.org/multierr v1.11.0 // indirect
95-
go.uber.org/zap v1.26.0 // indirect
96-
golang.org/x/crypto v0.18.0 // indirect
95+
go.uber.org/zap v1.27.0 // indirect
96+
golang.org/x/crypto v0.21.0 // indirect
9797
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
98-
golang.org/x/mod v0.14.0 // indirect
99-
golang.org/x/net v0.20.0 // indirect
100-
golang.org/x/oauth2 v0.16.0 // indirect
98+
golang.org/x/mod v0.15.0 // indirect
99+
golang.org/x/net v0.22.0 // indirect
100+
golang.org/x/oauth2 v0.18.0 // indirect
101101
golang.org/x/sync v0.6.0 // indirect
102-
golang.org/x/term v0.16.0 // indirect
102+
golang.org/x/term v0.18.0 // indirect
103103
golang.org/x/time v0.3.0 // indirect
104-
golang.org/x/tools v0.17.0 // indirect
104+
golang.org/x/tools v0.18.0 // indirect
105105
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
106106
google.golang.org/appengine v1.6.8 // indirect
107107
google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80 // indirect
@@ -111,48 +111,55 @@ require (
111111
gopkg.in/inf.v0 v0.9.1 // indirect
112112
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
113113
gopkg.in/yaml.v3 v3.0.1 // indirect
114-
k8s.io/apiextensions-apiserver v0.29.0 // indirect
115-
k8s.io/apiserver v0.29.0 // indirect
114+
k8s.io/apiextensions-apiserver v0.30.0-beta.0 // indirect
115+
k8s.io/apiserver v0.30.0-rc.1 // indirect
116116
k8s.io/cloud-provider v0.0.0 // indirect
117-
k8s.io/component-helpers v0.29.0 // indirect
118-
k8s.io/controller-manager v0.29.0 // indirect
119-
k8s.io/kms v0.29.0 // indirect
120-
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
117+
k8s.io/component-helpers v0.30.0-rc.1 // indirect
118+
k8s.io/controller-manager v0.30.0-rc.1 // indirect
119+
k8s.io/kms v0.30.0-rc.1 // indirect
120+
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
121121
k8s.io/kubectl v0.0.0 // indirect
122-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0 // indirect
122+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.29.0 // indirect
123123
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
124124
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
125125
)
126126

127127
replace (
128-
k8s.io/api => k8s.io/api v0.29.0
129-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.29.0
130-
k8s.io/apimachinery => k8s.io/apimachinery v0.29.0
131-
k8s.io/apiserver => k8s.io/apiserver v0.29.0
132-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.29.0
133-
k8s.io/client-go => k8s.io/client-go v0.29.0
134-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.29.0
135-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.29.0
136-
k8s.io/code-generator => k8s.io/code-generator v0.29.0
137-
k8s.io/component-base => k8s.io/component-base v0.29.0
138-
k8s.io/component-helpers => k8s.io/component-helpers v0.29.0
139-
k8s.io/controller-manager => k8s.io/controller-manager v0.29.0
140-
k8s.io/cri-api => k8s.io/cri-api v0.29.0
141-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.29.0
142-
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.29.0
143-
k8s.io/endpointslice => k8s.io/endpointslice v0.29.0
144-
k8s.io/kms => k8s.io/kms v0.29.0
145-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.29.0
146-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.29.0
147-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.29.0
148-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.29.0
149-
k8s.io/kubectl => k8s.io/kubectl v0.29.0
150-
k8s.io/kubelet => k8s.io/kubelet v0.29.0
151-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.29.0
152-
k8s.io/metrics => k8s.io/metrics v0.29.0
153-
k8s.io/mount-utils => k8s.io/mount-utils v0.30.0-alpha.0
154-
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.29.0
155-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.29.0
156-
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.29.0
157-
k8s.io/sample-controller => k8s.io/sample-controller v0.29.0
128+
k8s.io/api => k8s.io/api v0.30.0-rc.1
129+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.30.0-rc.1
130+
k8s.io/apimachinery => k8s.io/apimachinery v0.30.0-rc.1
131+
k8s.io/apiserver => k8s.io/apiserver v0.30.0-rc.1
132+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.30.0-rc.1
133+
k8s.io/client-go => k8s.io/client-go v0.30.0-rc.1
134+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.30.0-rc.1
135+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.30.0-rc.1
136+
k8s.io/code-generator => k8s.io/code-generator v0.30.0-rc.1
137+
k8s.io/component-base => k8s.io/component-base v0.30.0-rc.1
138+
k8s.io/component-helpers => k8s.io/component-helpers v0.30.0-rc.1
139+
k8s.io/controller-manager => k8s.io/controller-manager v0.30.0-rc.1
140+
k8s.io/cri-api => k8s.io/cri-api v0.30.0-rc.1
141+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.30.0-rc.1
142+
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.30.0-rc.1
143+
k8s.io/endpointslice => k8s.io/endpointslice v0.30.0-rc.1
144+
k8s.io/kms => k8s.io/kms v0.30.0-rc.1
145+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.30.0-rc.1
146+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.30.0-rc.1
147+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.30.0-rc.1
148+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.30.0-rc.1
149+
k8s.io/kubectl => k8s.io/kubectl v0.30.0-rc.1
150+
k8s.io/kubelet => k8s.io/kubelet v0.30.0-rc.1
151+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.30.0-rc.1
152+
k8s.io/metrics => k8s.io/metrics v0.30.0-rc.1
153+
k8s.io/mount-utils => k8s.io/mount-utils v0.30.0-rc.1
154+
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.30.0-rc.1
155+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.30.0-rc.1
156+
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.30.0-rc.1
157+
k8s.io/sample-controller => k8s.io/sample-controller v0.30.0-rc.1
158+
)
159+
160+
// prometheus/common has a breaking change that is not updated to k8s yet. This makes the e2e
161+
// build to fail. Downgrade to a version with the old behavior.
162+
replace (
163+
github.com/prometheus/client_golang v1.19.0 => github.com/prometheus/client_golang v1.18.0
164+
github.com/prometheus/common v0.48.0 => github.com/prometheus/common v0.47.0
158165
)

0 commit comments

Comments
 (0)