Skip to content

Commit 75659c5

Browse files
committed
Bump to k8s modules v0.29.3 (for k8s 1.29)
1 parent 54bba7e commit 75659c5

File tree

4 files changed

+314
-752
lines changed

4 files changed

+314
-752
lines changed

charts/rancher-webhook/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ annotations:
1111
catalog.cattle.io/os: linux
1212
catalog.cattle.io/permits-os: linux,windows
1313
catalog.cattle.io/rancher-version: ">= 2.9.0-0 < 2.10.0-0"
14-
catalog.cattle.io/kube-version: ">= 1.23.0-0 < 1.29.0-0"
14+
catalog.cattle.io/kube-version: ">= 1.23.0-0 < 1.30.0-0"

go.mod

Lines changed: 114 additions & 119 deletions
Original file line numberDiff line numberDiff line change
@@ -1,170 +1,165 @@
11
module github.com/rancher/webhook
22

3-
go 1.22
3+
go 1.22.0
4+
5+
toolchain go1.22.1
46

57
replace (
6-
k8s.io/api => k8s.io/api v0.28.6
7-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.28.6
8-
k8s.io/apimachinery => k8s.io/apimachinery v0.28.6
9-
k8s.io/apiserver => k8s.io/apiserver v0.28.6
10-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.28.6
11-
k8s.io/client-go => github.com/rancher/client-go v1.28.6-rancher1
12-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.28.6
13-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.28.6
14-
k8s.io/code-generator => k8s.io/code-generator v0.28.6
15-
k8s.io/component-base => k8s.io/component-base v0.28.6
16-
k8s.io/component-helpers => k8s.io/component-helpers v0.28.6
17-
k8s.io/controller-manager => k8s.io/controller-manager v0.28.6
18-
k8s.io/cri-api => k8s.io/cri-api v0.28.6
19-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.28.6
20-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.28.6
21-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.28.6
22-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.28.6
23-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.28.6
24-
k8s.io/kubectl => k8s.io/kubectl v0.28.6
25-
k8s.io/kubelet => k8s.io/kubelet v0.28.6
26-
k8s.io/kubernetes => k8s.io/kubernetes v1.28.6
27-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.28.6
28-
k8s.io/metrics => k8s.io/metrics v0.28.6
29-
k8s.io/mount-utils => k8s.io/mount-utils v0.28.6
30-
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.28.6
31-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.28.6
8+
github.com/rancher/rancher/pkg/apis => /Users/ericp/workspace/rancher/rancher/pkg/apis
9+
k8s.io/api => k8s.io/api v0.29.3
10+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.29.3
11+
k8s.io/apimachinery => k8s.io/apimachinery v0.29.3
12+
k8s.io/apiserver => k8s.io/apiserver v0.29.3
13+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.29.3
14+
k8s.io/client-go => github.com/rancher/client-go v1.29.3-rancher1
15+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.29.3
16+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.29.3
17+
k8s.io/code-generator => k8s.io/code-generator v0.29.3
18+
k8s.io/component-helpers => k8s.io/component-helpers v0.29.3
19+
k8s.io/controller-manager => k8s.io/controller-manager v0.29.3
20+
k8s.io/cri-api => k8s.io/cri-api v0.29.3
21+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.29.3
22+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.29.3
23+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.29.3
24+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.29.3
25+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.29.3
26+
k8s.io/kubectl => k8s.io/kubectl v0.29.3
27+
k8s.io/kubelet => k8s.io/kubelet v0.29.3
28+
k8s.io/kubernetes => k8s.io/kubernetes v1.29.3
29+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.29.3
30+
k8s.io/metrics => k8s.io/metrics v0.29.3
31+
k8s.io/mount-utils => k8s.io/mount-utils v0.29.3
32+
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.29.3
33+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.29.3
3234
)
3335

3436
require (
3537
github.com/blang/semver v3.5.1+incompatible
36-
github.com/evanphx/json-patch v5.6.0+incompatible
38+
github.com/evanphx/json-patch v5.9.0+incompatible
3739
github.com/golang/mock v1.6.0
38-
github.com/gorilla/mux v1.8.0
39-
github.com/rancher/dynamiclistener v0.5.0-rc2
40-
github.com/rancher/lasso v0.0.0-20240123150939-7055397d6dfa
41-
github.com/rancher/rancher/pkg/apis v0.0.0-20240328110445-91a4620d7e49
42-
github.com/rancher/rke v1.5.7-rc2
43-
github.com/rancher/wrangler/v2 v2.1.4
40+
github.com/gorilla/mux v1.8.1
41+
github.com/rancher/dynamiclistener v0.5.0-rc6
42+
github.com/rancher/lasso v0.0.0-20240424194130-d87ec407d941
43+
github.com/rancher/rancher/pkg/apis v0.0.0-20240506132424-2b53406a5497
44+
github.com/rancher/rke v1.6.0-rc4
45+
github.com/rancher/wrangler/v2 v2.2.0-rc6
4446
github.com/sirupsen/logrus v1.9.3
45-
github.com/stretchr/testify v1.8.4
46-
golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63
47-
golang.org/x/text v0.14.0
48-
golang.org/x/tools v0.16.1
49-
k8s.io/api v0.28.6
50-
k8s.io/apimachinery v0.28.6
51-
k8s.io/apiserver v0.28.6
47+
github.com/stretchr/testify v1.9.0
48+
golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f
49+
golang.org/x/text v0.15.0
50+
golang.org/x/tools v0.20.0
51+
k8s.io/api v0.29.4
52+
k8s.io/apimachinery v0.29.4
53+
k8s.io/apiserver v0.29.4
5254
k8s.io/client-go v12.0.0+incompatible
53-
k8s.io/kubernetes v1.28.6
54-
k8s.io/pod-security-admission v0.28.6
55-
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
56-
sigs.k8s.io/controller-runtime v0.15.3
55+
k8s.io/kubernetes v1.29.4
56+
k8s.io/pod-security-admission v0.29.3
57+
k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0
58+
sigs.k8s.io/controller-runtime v0.17.4
5759
sigs.k8s.io/yaml v1.4.0
5860
)
5961

6062
require (
6163
github.com/NYTimes/gziphandler v1.1.1 // indirect
6264
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
63-
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
65+
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
6466
github.com/beorn7/perks v1.0.1 // indirect
6567
github.com/blang/semver/v4 v4.0.0 // indirect
66-
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
67-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
68+
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
69+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
6870
github.com/coreos/go-semver v0.3.1 // indirect
6971
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
70-
github.com/davecgh/go-spew v1.1.1 // indirect
71-
github.com/docker/distribution v2.8.2+incompatible // indirect
72-
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
73-
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
74-
github.com/felixge/httpsnoop v1.0.3 // indirect
75-
github.com/fsnotify/fsnotify v1.6.0 // indirect
72+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
73+
github.com/distribution/reference v0.6.0 // indirect
74+
github.com/emicklei/go-restful/v3 v3.12.0 // indirect
75+
github.com/felixge/httpsnoop v1.0.4 // indirect
76+
github.com/fsnotify/fsnotify v1.7.0 // indirect
7677
github.com/ghodss/yaml v1.0.0 // indirect
77-
github.com/go-logr/logr v1.3.0 // indirect
78+
github.com/go-logr/logr v1.4.1 // indirect
7879
github.com/go-logr/stdr v1.2.2 // indirect
79-
github.com/go-openapi/jsonpointer v0.20.0 // indirect
80-
github.com/go-openapi/jsonreference v0.20.2 // indirect
81-
github.com/go-openapi/swag v0.22.4 // indirect
80+
github.com/go-openapi/jsonpointer v0.21.0 // indirect
81+
github.com/go-openapi/jsonreference v0.21.0 // indirect
82+
github.com/go-openapi/swag v0.23.0 // indirect
8283
github.com/gogo/protobuf v1.3.2 // indirect
8384
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
84-
github.com/golang/protobuf v1.5.3 // indirect
85-
github.com/google/cel-go v0.16.1 // indirect
85+
github.com/golang/protobuf v1.5.4 // indirect
86+
github.com/google/cel-go v0.17.8 // indirect
8687
github.com/google/gnostic-models v0.6.8 // indirect
8788
github.com/google/go-cmp v0.6.0 // indirect
8889
github.com/google/gofuzz v1.2.0 // indirect
89-
github.com/google/uuid v1.5.0 // indirect
90+
github.com/google/uuid v1.6.0 // indirect
9091
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
91-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.3 // indirect
92+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.1 // indirect
9293
github.com/imdario/mergo v0.3.16 // indirect
9394
github.com/inconshreveable/mousetrap v1.1.0 // indirect
9495
github.com/josharian/intern v1.0.0 // indirect
9596
github.com/json-iterator/go v1.1.12 // indirect
9697
github.com/mailru/easyjson v0.7.7 // indirect
97-
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
9898
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
9999
github.com/modern-go/reflect2 v1.0.2 // indirect
100100
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
101101
github.com/opencontainers/go-digest v1.0.0 // indirect
102102
github.com/pkg/errors v0.9.1 // indirect
103103
github.com/pmezard/go-difflib v1.0.0 // indirect
104-
github.com/prometheus/client_golang v1.16.0 // indirect
105-
github.com/prometheus/client_model v0.4.0 // indirect
106-
github.com/prometheus/common v0.44.0 // indirect
107-
github.com/prometheus/procfs v0.11.1 // indirect
108-
github.com/rancher/aks-operator v1.3.0-rc5 // indirect
109-
github.com/rancher/eks-operator v1.4.0-rc5 // indirect
110-
github.com/rancher/fleet/pkg/apis v0.0.0-20231017140638-93432f288e79 // indirect
111-
github.com/rancher/gke-operator v1.3.0-rc6 // indirect
112-
github.com/rancher/norman v0.0.0-20240207153100-3bb70b772b52 // indirect
113-
github.com/rancher/wrangler v1.1.1 // indirect
114-
github.com/spf13/cobra v1.7.0 // indirect
104+
github.com/prometheus/client_golang v1.18.0 // indirect
105+
github.com/prometheus/client_model v0.6.1 // indirect
106+
github.com/prometheus/common v0.47.0 // indirect
107+
github.com/prometheus/procfs v0.14.0 // indirect
108+
github.com/rancher/aks-operator v1.9.0-rc.1 // indirect
109+
github.com/rancher/eks-operator v1.9.0-rc.1 // indirect
110+
github.com/rancher/fleet/pkg/apis v0.9.4 // indirect
111+
github.com/rancher/gke-operator v1.9.0-rc.1 // indirect
112+
github.com/rancher/norman v0.0.0-20240503193601-9f5f6586bb5b // indirect
113+
github.com/spf13/cobra v1.8.0 // indirect
115114
github.com/spf13/pflag v1.0.5 // indirect
116-
github.com/stoewer/go-strcase v1.2.0 // indirect
117-
go.etcd.io/etcd/api/v3 v3.5.9 // indirect
118-
go.etcd.io/etcd/client/pkg/v3 v3.5.9 // indirect
119-
go.etcd.io/etcd/client/v3 v3.5.9 // indirect
120-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.35.0 // indirect
121-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.35.1 // indirect
122-
go.opentelemetry.io/otel v1.10.0 // indirect
123-
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.10.0 // indirect
124-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.10.0 // indirect
125-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.10.0 // indirect
126-
go.opentelemetry.io/otel/metric v0.31.0 // indirect
127-
go.opentelemetry.io/otel/sdk v1.10.0 // indirect
128-
go.opentelemetry.io/otel/trace v1.10.0 // indirect
129-
go.opentelemetry.io/proto/otlp v0.19.0 // indirect
130-
go.uber.org/atomic v1.10.0 // indirect
115+
github.com/stoewer/go-strcase v1.3.0 // indirect
116+
go.etcd.io/etcd/api/v3 v3.5.13 // indirect
117+
go.etcd.io/etcd/client/pkg/v3 v3.5.13 // indirect
118+
go.etcd.io/etcd/client/v3 v3.5.13 // indirect
119+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.51.0 // indirect
120+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.51.0 // indirect
121+
go.opentelemetry.io/otel v1.26.0 // indirect
122+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.26.0 // indirect
123+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.26.0 // indirect
124+
go.opentelemetry.io/otel/metric v1.26.0 // indirect
125+
go.opentelemetry.io/otel/sdk v1.26.0 // indirect
126+
go.opentelemetry.io/otel/trace v1.26.0 // indirect
127+
go.opentelemetry.io/proto/otlp v1.2.0 // indirect
131128
go.uber.org/multierr v1.11.0 // indirect
132-
go.uber.org/zap v1.24.0 // indirect
133-
golang.org/x/crypto v0.19.0 // indirect
134-
golang.org/x/mod v0.14.0 // indirect
135-
golang.org/x/net v0.21.0 // indirect
136-
golang.org/x/oauth2 v0.16.0 // indirect
137-
golang.org/x/sync v0.5.0 // indirect
138-
golang.org/x/sys v0.17.0 // indirect
139-
golang.org/x/term v0.17.0 // indirect
129+
go.uber.org/zap v1.27.0 // indirect
130+
golang.org/x/crypto v0.23.0 // indirect
131+
golang.org/x/mod v0.17.0 // indirect
132+
golang.org/x/net v0.25.0 // indirect
133+
golang.org/x/oauth2 v0.20.0 // indirect
134+
golang.org/x/sync v0.7.0 // indirect
135+
golang.org/x/sys v0.20.0 // indirect
136+
golang.org/x/term v0.20.0 // indirect
140137
golang.org/x/time v0.5.0 // indirect
141138
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
142-
google.golang.org/appengine v1.6.8 // indirect
143-
google.golang.org/genproto v0.0.0-20231106174013-bbf56f31fb17 // indirect
144-
google.golang.org/genproto/googleapis/api v0.0.0-20231030173426-d783a09b4405 // indirect
145-
google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f // indirect
146-
google.golang.org/grpc v1.59.0 // indirect
147-
google.golang.org/protobuf v1.33.0 // indirect
139+
google.golang.org/genproto/googleapis/api v0.0.0-20240429193739-8cf5692501f6 // indirect
140+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240429193739-8cf5692501f6 // indirect
141+
google.golang.org/grpc v1.63.2 // indirect
142+
google.golang.org/protobuf v1.34.0 // indirect
148143
gopkg.in/inf.v0 v0.9.1 // indirect
149144
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
150145
gopkg.in/yaml.v2 v2.4.0 // indirect
151146
gopkg.in/yaml.v3 v3.0.1 // indirect
152-
k8s.io/apiextensions-apiserver v0.28.6 // indirect
153-
k8s.io/cloud-provider v0.0.0 // indirect
154-
k8s.io/code-generator v0.28.6 // indirect
155-
k8s.io/component-base v0.28.6 // indirect
156-
k8s.io/component-helpers v0.28.6 // indirect
157-
k8s.io/controller-manager v0.28.6 // indirect
158-
k8s.io/gengo v0.0.0-20230829151522-9cce18d56c01 // indirect
147+
k8s.io/apiextensions-apiserver v0.29.4 // indirect
148+
k8s.io/cloud-provider v0.29.3 // indirect
149+
k8s.io/code-generator v0.29.4 // indirect
150+
k8s.io/component-base v0.29.4 // indirect
151+
k8s.io/component-helpers v0.29.3 // indirect
152+
k8s.io/controller-manager v0.29.3 // indirect
153+
k8s.io/gengo v0.0.0-20240310015720-9cff6334dab4 // indirect
159154
k8s.io/klog v1.0.0 // indirect
160-
k8s.io/klog/v2 v2.100.1 // indirect
161-
k8s.io/kms v0.28.6 // indirect
162-
k8s.io/kube-aggregator v0.28.6 // indirect
163-
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
164-
k8s.io/kubelet v0.0.0 // indirect
165-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2 // indirect
166-
sigs.k8s.io/cli-utils v0.28.0 // indirect
167-
sigs.k8s.io/cluster-api v1.5.0 // indirect
155+
k8s.io/klog/v2 v2.120.1 // indirect
156+
k8s.io/kms v0.29.3 // indirect
157+
k8s.io/kube-aggregator v0.29.3 // indirect
158+
k8s.io/kube-openapi v0.0.0-20240430033511-f0e62f92d13f // indirect
159+
k8s.io/kubelet v0.29.3 // indirect
160+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 // indirect
161+
sigs.k8s.io/cli-utils v0.35.0 // indirect
162+
sigs.k8s.io/cluster-api v1.7.1 // indirect
168163
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
169-
sigs.k8s.io/structured-merge-diff/v4 v4.3.0 // indirect
164+
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
170165
)

0 commit comments

Comments
 (0)