Skip to content

Commit 598e330

Browse files
kunalmemanekunalmemane
authored
⚠️ Bump to k8s.io/* v0.36.0-beta.0 (#3486)
* Bump to k8s.io/* v0.36.0-beta.0 Signed-off-by: Kunal Memane <kmemane@redhat.com> * Update golangci-lint config for Go 1.26 Bump the go version from 1.25 to 1.26 and disable the modernize/newexpr lint check which flags all ptr.To(x) calls as replaceable with new(x). Signed-off-by: Kunal Memane <kmemane@redhat.com> * Fix test panics from *http.Transport type assertion with client-go v0.36.0-beta.0 Signed-off-by: Kunal Memane <kmemane@redhat.com> --------- Signed-off-by: Kunal Memane <kmemane@redhat.com>
1 parent 773c064 commit 598e330

File tree

16 files changed

+112
-126
lines changed

16 files changed

+112
-126
lines changed

‎.golangci.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
version: "2"
22
run:
3-
go: "1.25"
3+
go: "1.26"
44
timeout: 10m
55
allow-parallel-runners: true
66
linters:
@@ -81,6 +81,7 @@ linters:
8181
disable:
8282
- omitzero
8383
- fmtappendf
84+
- newexpr
8485
revive:
8586
rules:
8687
# The following rules are recommended https://github.com/mgechev/revive#recommended-configuration

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ SHELL:=/usr/bin/env bash
2727
#
2828
# Go.
2929
#
30-
GO_VERSION ?= 1.25.0
30+
GO_VERSION ?= 1.26.0
3131

3232
# Use GOPROXY environment variable if set
3333
GOPROXY := $(shell go env GOPROXY)

‎examples/scratch-env/go.mod‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module sigs.k8s.io/controller-runtime/examples/scratch-env
22

3-
go 1.25.0
3+
go 1.26.0
44

55
require (
66
github.com/spf13/pflag v1.0.9
@@ -46,16 +46,16 @@ require (
4646
golang.org/x/text v0.33.0 // indirect
4747
golang.org/x/time v0.14.0 // indirect
4848
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
49-
google.golang.org/protobuf v1.36.11 // indirect
49+
google.golang.org/protobuf v1.36.12-0.20260120151049-f2248ac996af // indirect
5050
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
5151
gopkg.in/inf.v0 v0.9.1 // indirect
5252
gopkg.in/yaml.v3 v3.0.1 // indirect
53-
k8s.io/api v0.36.0-alpha.2 // indirect
54-
k8s.io/apiextensions-apiserver v0.36.0-alpha.2 // indirect
55-
k8s.io/apimachinery v0.36.0-alpha.2 // indirect
56-
k8s.io/client-go v0.36.0-alpha.2 // indirect
57-
k8s.io/klog/v2 v2.130.1 // indirect
58-
k8s.io/kube-openapi v0.0.0-20260127142750-a19766b6e2d4 // indirect
53+
k8s.io/api v0.36.0-beta.0 // indirect
54+
k8s.io/apiextensions-apiserver v0.36.0-beta.0 // indirect
55+
k8s.io/apimachinery v0.36.0-beta.0 // indirect
56+
k8s.io/client-go v0.36.0-beta.0 // indirect
57+
k8s.io/klog/v2 v2.140.0 // indirect
58+
k8s.io/kube-openapi v0.0.0-20260317180543-43fb72c5454a // indirect
5959
k8s.io/utils v0.0.0-20260210185600-b8788abfbbc2 // indirect
6060
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
6161
sigs.k8s.io/randfill v1.0.0 // indirect

‎examples/scratch-env/go.sum‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -129,12 +129,12 @@ golang.org/x/text v0.33.0 h1:B3njUFyqtHDUI5jMn1YIr5B0IE2U0qck04r6d4KPAxE=
129129
golang.org/x/text v0.33.0/go.mod h1:LuMebE6+rBincTi9+xWTY8TztLzKHc/9C1uBCG27+q8=
130130
golang.org/x/time v0.14.0 h1:MRx4UaLrDotUKUdCIqzPC48t1Y9hANFKIRpNx+Te8PI=
131131
golang.org/x/time v0.14.0/go.mod h1:eL/Oa2bBBK0TkX57Fyni+NgnyQQN4LitPmob2Hjnqw4=
132-
golang.org/x/tools v0.40.0 h1:yLkxfA+Qnul4cs9QA3KnlFu0lVmd8JJfoq+E41uSutA=
133-
golang.org/x/tools v0.40.0/go.mod h1:Ik/tzLRlbscWpqqMRjyWYDisX8bG13FrdXp3o4Sr9lc=
132+
golang.org/x/tools v0.41.0 h1:a9b8iMweWG+S0OBnlU36rzLp20z1Rp10w+IY2czHTQc=
133+
golang.org/x/tools v0.41.0/go.mod h1:XSY6eDqxVNiYgezAVqqCeihT4j1U2CCsqvH3WhQpnlg=
134134
gomodules.xyz/jsonpatch/v2 v2.4.0 h1:Ci3iUJyx9UeRx7CeFN8ARgGbkESwJK+KB9lLcWxY/Zw=
135135
gomodules.xyz/jsonpatch/v2 v2.4.0/go.mod h1:AH3dM2RI6uoBZxn3LVrfvJ3E0/9dG4cSrbuBJT4moAY=
136-
google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE=
137-
google.golang.org/protobuf v1.36.11/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
136+
google.golang.org/protobuf v1.36.12-0.20260120151049-f2248ac996af h1:+5/Sw3GsDNlEmu7TfklWKPdQ0Ykja5VEmq2i817+jbI=
137+
google.golang.org/protobuf v1.36.12-0.20260120151049-f2248ac996af/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
138138
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
139139
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
140140
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
@@ -145,18 +145,18 @@ gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
145145
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
146146
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
147147
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
148-
k8s.io/api v0.36.0-alpha.2 h1:5VQ17JO0v+9X/meq70nUzb6Ec7zuAfP+izKiJMeu9zM=
149-
k8s.io/api v0.36.0-alpha.2/go.mod h1:VrBGsSGpBoBDkL0gV2hd11bLXcW3xX0/dg352BZthWs=
150-
k8s.io/apiextensions-apiserver v0.36.0-alpha.2 h1:YkcqeHkx+cX/Qk9kH/IH88F0gkNIFLqVQeIG2FOyDKQ=
151-
k8s.io/apiextensions-apiserver v0.36.0-alpha.2/go.mod h1:88Ee1E7oqcG1VwCpi0DPD8qIVX7sSz7MNLyVsZMQLl0=
152-
k8s.io/apimachinery v0.36.0-alpha.2 h1:I3A/nvRsgV/j/AX7VXDn8XjuDz2gsfcdOTVCkKMRLsQ=
153-
k8s.io/apimachinery v0.36.0-alpha.2/go.mod h1:7mgr/dli8ofwAbcIQXetFVX1fbOYsOYojq3AUbybVmQ=
154-
k8s.io/client-go v0.36.0-alpha.2 h1:Tk1GnYEd9KjzRG9QN84DWghJ4I91Cy5pbxSyffEZlhw=
155-
k8s.io/client-go v0.36.0-alpha.2/go.mod h1:exn5BZg49XPJN4xNe18t4O3LJah8seb2Fxl7IyUJ6jY=
156-
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
157-
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
158-
k8s.io/kube-openapi v0.0.0-20260127142750-a19766b6e2d4 h1:HhDfevmPS+OalTjQRKbTHppRIz01AWi8s45TMXStgYY=
159-
k8s.io/kube-openapi v0.0.0-20260127142750-a19766b6e2d4/go.mod h1:kdmbQkyfwUagLfXIad1y2TdrjPFWp2Q89B3qkRwf/pQ=
148+
k8s.io/api v0.36.0-beta.0 h1:BN6CRXfDkcibr89gqzuhTAHp3azg/D2GG+GBTedCUpM=
149+
k8s.io/api v0.36.0-beta.0/go.mod h1:9h7R8ToY35d7IW/y5t9Y4ggNcfTAUQrg8aP7+ccSdvo=
150+
k8s.io/apiextensions-apiserver v0.36.0-beta.0 h1:KstD2m0/HuCoyKpUo3rswTzMYB6rlliCS7bxeXleXP8=
151+
k8s.io/apiextensions-apiserver v0.36.0-beta.0/go.mod h1:puKb28c0ZYFZv/s+YYgzk7JIaOAhtaLAPnkuvVsVvkw=
152+
k8s.io/apimachinery v0.36.0-beta.0 h1:FioYxKfnvZuo0EUX/W9X0FhH3omaG7dEdtDk2IsfEtU=
153+
k8s.io/apimachinery v0.36.0-beta.0/go.mod h1:AEUkaeqhot34WXPkRiWxszI4nUd8m40AAYi28N33hqc=
154+
k8s.io/client-go v0.36.0-beta.0 h1:CDz8BZT2uCXmntLHdt9Iuaid3EC1937CGDnuqdwvFYg=
155+
k8s.io/client-go v0.36.0-beta.0/go.mod h1:R1e5akWC7jvvO1lXCrku6u7dcOdCw+Iz+mg2GahRuro=
156+
k8s.io/klog/v2 v2.140.0 h1:Tf+J3AH7xnUzZyVVXhTgGhEKnFqye14aadWv7bzXdzc=
157+
k8s.io/klog/v2 v2.140.0/go.mod h1:o+/RWfJ6PwpnFn7OyAG3QnO47BFsymfEfrz6XyYSSp0=
158+
k8s.io/kube-openapi v0.0.0-20260317180543-43fb72c5454a h1:xCeOEAOoGYl2jnJoHkC3hkbPJgdATINPMAxaynU2Ovg=
159+
k8s.io/kube-openapi v0.0.0-20260317180543-43fb72c5454a/go.mod h1:uGBT7iTA6c6MvqUvSXIaYZo9ukscABYi2btjhvgKGZ0=
160160
k8s.io/utils v0.0.0-20260210185600-b8788abfbbc2 h1:AZYQSJemyQB5eRxqcPky+/7EdBj0xi3g0ZcxxJ7vbWU=
161161
k8s.io/utils v0.0.0-20260210185600-b8788abfbbc2/go.mod h1:xDxuJ0whA3d0I4mf/C4ppKHxXynQ+fxnkmQH0vTHnuk=
162162
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 h1:IpInykpT6ceI+QxKBbEflcR5EXP7sU1kvOlxwZh5txg=

‎go.mod‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module sigs.k8s.io/controller-runtime
22

3-
go 1.25.0
3+
go 1.26.0
44

55
require (
66
github.com/evanphx/json-patch/v5 v5.9.11
@@ -20,19 +20,19 @@ require (
2020
golang.org/x/sys v0.40.0
2121
gomodules.xyz/jsonpatch/v2 v2.4.0
2222
gopkg.in/evanphx/json-patch.v4 v4.13.0 // Using v4 to match upstream
23-
k8s.io/api v0.36.0-alpha.2
24-
k8s.io/apiextensions-apiserver v0.36.0-alpha.2
25-
k8s.io/apimachinery v0.36.0-alpha.2
26-
k8s.io/apiserver v0.36.0-alpha.2
27-
k8s.io/client-go v0.36.0-alpha.2
28-
k8s.io/klog/v2 v2.130.1
23+
k8s.io/api v0.36.0-beta.0
24+
k8s.io/apiextensions-apiserver v0.36.0-beta.0
25+
k8s.io/apimachinery v0.36.0-beta.0
26+
k8s.io/apiserver v0.36.0-beta.0
27+
k8s.io/client-go v0.36.0-beta.0
28+
k8s.io/klog/v2 v2.140.0
2929
k8s.io/utils v0.0.0-20260210185600-b8788abfbbc2
3030
sigs.k8s.io/structured-merge-diff/v6 v6.3.2
3131
sigs.k8s.io/yaml v1.6.0
3232
)
3333

3434
require (
35-
cel.dev/expr v0.24.0 // indirect
35+
cel.dev/expr v0.25.1 // indirect
3636
github.com/Masterminds/semver/v3 v3.4.0 // indirect
3737
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
3838
github.com/beorn7/perks v1.0.1 // indirect
@@ -64,7 +64,7 @@ require (
6464
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
6565
github.com/prometheus/common v0.67.5 // indirect
6666
github.com/prometheus/procfs v0.19.2 // indirect
67-
github.com/spf13/cobra v1.10.0 // indirect
67+
github.com/spf13/cobra v1.10.2 // indirect
6868
github.com/spf13/pflag v1.0.9 // indirect
6969
github.com/stoewer/go-strcase v1.3.0 // indirect
7070
github.com/x448/float16 v0.8.4 // indirect
@@ -86,15 +86,16 @@ require (
8686
golang.org/x/term v0.39.0 // indirect
8787
golang.org/x/text v0.33.0 // indirect
8888
golang.org/x/time v0.14.0 // indirect
89-
golang.org/x/tools v0.40.0 // indirect
89+
golang.org/x/tools v0.41.0 // indirect
9090
google.golang.org/genproto/googleapis/api v0.0.0-20260128011058-8636f8732409 // indirect
9191
google.golang.org/genproto/googleapis/rpc v0.0.0-20260128011058-8636f8732409 // indirect
92-
google.golang.org/grpc v1.78.0 // indirect
93-
google.golang.org/protobuf v1.36.11 // indirect
92+
google.golang.org/grpc v1.79.3 // indirect
93+
google.golang.org/protobuf v1.36.12-0.20260120151049-f2248ac996af // indirect
9494
gopkg.in/inf.v0 v0.9.1 // indirect
9595
gopkg.in/yaml.v3 v3.0.1 // indirect
96-
k8s.io/component-base v0.36.0-alpha.2 // indirect
97-
k8s.io/kube-openapi v0.0.0-20260127142750-a19766b6e2d4 // indirect
96+
k8s.io/component-base v0.36.0-beta.0 // indirect
97+
k8s.io/kube-openapi v0.0.0-20260317180543-43fb72c5454a // indirect
98+
k8s.io/streaming v0.36.0-beta.0 // indirect
9899
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.34.0 // indirect
99100
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
100101
sigs.k8s.io/randfill v1.0.0 // indirect

‎go.sum‎

Lines changed: 28 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
cel.dev/expr v0.24.0 h1:56OvJKSH3hDGL0ml5uSxZmz3/3Pq4tJ+fb1unVLAFcY=
2-
cel.dev/expr v0.24.0/go.mod h1:hLPLo1W4QUmuYdA72RBX06QTs6MXw941piREPl3Yfiw=
1+
cel.dev/expr v0.25.1 h1:1KrZg61W6TWSxuNZ37Xy49ps13NUovb66QLprthtwi4=
2+
cel.dev/expr v0.25.1/go.mod h1:hrXvqGP6G6gyx8UAHSHJ5RGk//1Oj5nXQ2NI02Nrsg4=
33
github.com/Masterminds/semver/v3 v3.4.0 h1:Zog+i5UMtVoCU8oKka5P7i9q9HgrJeGzI9SA1Xbatp0=
44
github.com/Masterminds/semver/v3 v3.4.0/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM=
55
github.com/antlr4-go/antlr/v4 v4.13.0 h1:lxCg3LAv+EUK6t1i0y1V6/SLeUi0eKEKdhQAlS8TVTI=
@@ -125,9 +125,8 @@ github.com/prometheus/procfs v0.19.2/go.mod h1:M0aotyiemPhBCM0z5w87kL22CxfcH05Zp
125125
github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=
126126
github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
127127
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
128-
github.com/spf13/cobra v1.10.0 h1:a5/WeUlSDCvV5a45ljW2ZFtV0bTDpkfSAj3uqB6Sc+0=
129-
github.com/spf13/cobra v1.10.0/go.mod h1:9dhySC7dnTtEiqzmqfkLj47BslqLCUPMXjG2lj/NgoE=
130-
github.com/spf13/pflag v1.0.8/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
128+
github.com/spf13/cobra v1.10.2 h1:DMTTonx5m65Ic0GOoRY2c16WCbHxOOw6xxezuLaBpcU=
129+
github.com/spf13/cobra v1.10.2/go.mod h1:7C1pvHqHw5A4vrJfjNwvOdzYu0Gml16OCs2GRiTUUS4=
131130
github.com/spf13/pflag v1.0.9 h1:9exaQaMOCwffKiiiYk6/BndUBv+iRViNW+4lEMi0PvY=
132131
github.com/spf13/pflag v1.0.9/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
133132
github.com/stoewer/go-strcase v1.3.0 h1:g0eASXYtp+yvN9fK8sH94oCIk0fau9uV1/ZdJ0AVEzs=
@@ -201,8 +200,8 @@ golang.org/x/text v0.33.0 h1:B3njUFyqtHDUI5jMn1YIr5B0IE2U0qck04r6d4KPAxE=
201200
golang.org/x/text v0.33.0/go.mod h1:LuMebE6+rBincTi9+xWTY8TztLzKHc/9C1uBCG27+q8=
202201
golang.org/x/time v0.14.0 h1:MRx4UaLrDotUKUdCIqzPC48t1Y9hANFKIRpNx+Te8PI=
203202
golang.org/x/time v0.14.0/go.mod h1:eL/Oa2bBBK0TkX57Fyni+NgnyQQN4LitPmob2Hjnqw4=
204-
golang.org/x/tools v0.40.0 h1:yLkxfA+Qnul4cs9QA3KnlFu0lVmd8JJfoq+E41uSutA=
205-
golang.org/x/tools v0.40.0/go.mod h1:Ik/tzLRlbscWpqqMRjyWYDisX8bG13FrdXp3o4Sr9lc=
203+
golang.org/x/tools v0.41.0 h1:a9b8iMweWG+S0OBnlU36rzLp20z1Rp10w+IY2czHTQc=
204+
golang.org/x/tools v0.41.0/go.mod h1:XSY6eDqxVNiYgezAVqqCeihT4j1U2CCsqvH3WhQpnlg=
206205
gomodules.xyz/jsonpatch/v2 v2.4.0 h1:Ci3iUJyx9UeRx7CeFN8ARgGbkESwJK+KB9lLcWxY/Zw=
207206
gomodules.xyz/jsonpatch/v2 v2.4.0/go.mod h1:AH3dM2RI6uoBZxn3LVrfvJ3E0/9dG4cSrbuBJT4moAY=
208207
gonum.org/v1/gonum v0.16.0 h1:5+ul4Swaf3ESvrOnidPp4GZbzf0mxVQpDCYUQE7OJfk=
@@ -211,10 +210,10 @@ google.golang.org/genproto/googleapis/api v0.0.0-20260128011058-8636f8732409 h1:
211210
google.golang.org/genproto/googleapis/api v0.0.0-20260128011058-8636f8732409/go.mod h1:fl8J1IvUjCilwZzQowmw2b7HQB2eAuYBabMXzWurF+I=
212211
google.golang.org/genproto/googleapis/rpc v0.0.0-20260128011058-8636f8732409 h1:H86B94AW+VfJWDqFeEbBPhEtHzJwJfTbgE2lZa54ZAQ=
213212
google.golang.org/genproto/googleapis/rpc v0.0.0-20260128011058-8636f8732409/go.mod h1:j9x/tPzZkyxcgEFkiKEEGxfvyumM01BEtsW8xzOahRQ=
214-
google.golang.org/grpc v1.78.0 h1:K1XZG/yGDJnzMdd/uZHAkVqJE+xIDOcmdSFZkBUicNc=
215-
google.golang.org/grpc v1.78.0/go.mod h1:I47qjTo4OKbMkjA/aOOwxDIiPSBofUtQUI5EfpWvW7U=
216-
google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE=
217-
google.golang.org/protobuf v1.36.11/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
213+
google.golang.org/grpc v1.79.3 h1:sybAEdRIEtvcD68Gx7dmnwjZKlyfuc61Dyo9pGXXkKE=
214+
google.golang.org/grpc v1.79.3/go.mod h1:KmT0Kjez+0dde/v2j9vzwoAScgEPx/Bw1CYChhHLrHQ=
215+
google.golang.org/protobuf v1.36.12-0.20260120151049-f2248ac996af h1:+5/Sw3GsDNlEmu7TfklWKPdQ0Ykja5VEmq2i817+jbI=
216+
google.golang.org/protobuf v1.36.12-0.20260120151049-f2248ac996af/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
218217
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
219218
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
220219
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
@@ -225,22 +224,24 @@ gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
225224
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
226225
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
227226
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
228-
k8s.io/api v0.36.0-alpha.2 h1:5VQ17JO0v+9X/meq70nUzb6Ec7zuAfP+izKiJMeu9zM=
229-
k8s.io/api v0.36.0-alpha.2/go.mod h1:VrBGsSGpBoBDkL0gV2hd11bLXcW3xX0/dg352BZthWs=
230-
k8s.io/apiextensions-apiserver v0.36.0-alpha.2 h1:YkcqeHkx+cX/Qk9kH/IH88F0gkNIFLqVQeIG2FOyDKQ=
231-
k8s.io/apiextensions-apiserver v0.36.0-alpha.2/go.mod h1:88Ee1E7oqcG1VwCpi0DPD8qIVX7sSz7MNLyVsZMQLl0=
232-
k8s.io/apimachinery v0.36.0-alpha.2 h1:I3A/nvRsgV/j/AX7VXDn8XjuDz2gsfcdOTVCkKMRLsQ=
233-
k8s.io/apimachinery v0.36.0-alpha.2/go.mod h1:7mgr/dli8ofwAbcIQXetFVX1fbOYsOYojq3AUbybVmQ=
234-
k8s.io/apiserver v0.36.0-alpha.2 h1:7IS97LYVQ9zk6Fhykrljpn7De4VAEamR2lL/t1eWzfI=
235-
k8s.io/apiserver v0.36.0-alpha.2/go.mod h1:jVN5pyVw9YSo5ZpmerTTAQaX2RcluD5CI2Ezyb2z4cU=
236-
k8s.io/client-go v0.36.0-alpha.2 h1:Tk1GnYEd9KjzRG9QN84DWghJ4I91Cy5pbxSyffEZlhw=
237-
k8s.io/client-go v0.36.0-alpha.2/go.mod h1:exn5BZg49XPJN4xNe18t4O3LJah8seb2Fxl7IyUJ6jY=
238-
k8s.io/component-base v0.36.0-alpha.2 h1:V2jcC1cWxdWfLvWZ1tRv+9C9844zfJtzKE2bsltaAuI=
239-
k8s.io/component-base v0.36.0-alpha.2/go.mod h1:0BDaTMFJnMBD+wSUbfQ/2azaNn9gx+/PzE21NPrYKhM=
240-
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
241-
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
242-
k8s.io/kube-openapi v0.0.0-20260127142750-a19766b6e2d4 h1:HhDfevmPS+OalTjQRKbTHppRIz01AWi8s45TMXStgYY=
243-
k8s.io/kube-openapi v0.0.0-20260127142750-a19766b6e2d4/go.mod h1:kdmbQkyfwUagLfXIad1y2TdrjPFWp2Q89B3qkRwf/pQ=
227+
k8s.io/api v0.36.0-beta.0 h1:BN6CRXfDkcibr89gqzuhTAHp3azg/D2GG+GBTedCUpM=
228+
k8s.io/api v0.36.0-beta.0/go.mod h1:9h7R8ToY35d7IW/y5t9Y4ggNcfTAUQrg8aP7+ccSdvo=
229+
k8s.io/apiextensions-apiserver v0.36.0-beta.0 h1:KstD2m0/HuCoyKpUo3rswTzMYB6rlliCS7bxeXleXP8=
230+
k8s.io/apiextensions-apiserver v0.36.0-beta.0/go.mod h1:puKb28c0ZYFZv/s+YYgzk7JIaOAhtaLAPnkuvVsVvkw=
231+
k8s.io/apimachinery v0.36.0-beta.0 h1:FioYxKfnvZuo0EUX/W9X0FhH3omaG7dEdtDk2IsfEtU=
232+
k8s.io/apimachinery v0.36.0-beta.0/go.mod h1:AEUkaeqhot34WXPkRiWxszI4nUd8m40AAYi28N33hqc=
233+
k8s.io/apiserver v0.36.0-beta.0 h1:p1ow5wWRkn8e2vLhInHv1vLEgsEK0rEoCiH+d/dcuc8=
234+
k8s.io/apiserver v0.36.0-beta.0/go.mod h1:ogUX8mFvFY1xoTFrd16A1P5IP9RM6cVPIee4L4ILOw0=
235+
k8s.io/client-go v0.36.0-beta.0 h1:CDz8BZT2uCXmntLHdt9Iuaid3EC1937CGDnuqdwvFYg=
236+
k8s.io/client-go v0.36.0-beta.0/go.mod h1:R1e5akWC7jvvO1lXCrku6u7dcOdCw+Iz+mg2GahRuro=
237+
k8s.io/component-base v0.36.0-beta.0 h1:jQIJsypS9vwTg1y2YCSovj5wr3ua4yFq/FT7rhV6/7M=
238+
k8s.io/component-base v0.36.0-beta.0/go.mod h1:WHn3mIHRrU6cfgf4vt/XsBBS0H/0eXwrDqosH4O43Ow=
239+
k8s.io/klog/v2 v2.140.0 h1:Tf+J3AH7xnUzZyVVXhTgGhEKnFqye14aadWv7bzXdzc=
240+
k8s.io/klog/v2 v2.140.0/go.mod h1:o+/RWfJ6PwpnFn7OyAG3QnO47BFsymfEfrz6XyYSSp0=
241+
k8s.io/kube-openapi v0.0.0-20260317180543-43fb72c5454a h1:xCeOEAOoGYl2jnJoHkC3hkbPJgdATINPMAxaynU2Ovg=
242+
k8s.io/kube-openapi v0.0.0-20260317180543-43fb72c5454a/go.mod h1:uGBT7iTA6c6MvqUvSXIaYZo9ukscABYi2btjhvgKGZ0=
243+
k8s.io/streaming v0.36.0-beta.0 h1:F3nft77sAwteE5VgwkJQQQsdRqkPCBKk4O24W5bkvtk=
244+
k8s.io/streaming v0.36.0-beta.0/go.mod h1:5Zm1U2Duu3uu1nG/ijKuwNWDkQk24aXVpScAhzRkzkk=
244245
k8s.io/utils v0.0.0-20260210185600-b8788abfbbc2 h1:AZYQSJemyQB5eRxqcPky+/7EdBj0xi3g0ZcxxJ7vbWU=
245246
k8s.io/utils v0.0.0-20260210185600-b8788abfbbc2/go.mod h1:xDxuJ0whA3d0I4mf/C4ppKHxXynQ+fxnkmQH0vTHnuk=
246247
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.34.0 h1:hSfpvjjTQXQY2Fol2CS0QHMNs/WI1MOSGzCm1KhM5ec=

‎pkg/cluster/cluster_suite_test.go‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ var testenv *envtest.Environment
3838
var cfg *rest.Config
3939
var clientset *kubernetes.Clientset
4040

41-
// clientTransport is used to force-close keep-alives in tests that check for leaks.
42-
var clientTransport *http.Transport
41+
// clientRoundTripper is used to force-close keep-alives in tests that check for leaks.
42+
var clientRoundTripper http.RoundTripper
4343

4444
var _ = BeforeSuite(func() {
4545
logf.SetLogger(zap.New(zap.WriteTo(GinkgoWriter), zap.UseDevMode(true)))
@@ -51,11 +51,7 @@ var _ = BeforeSuite(func() {
5151
Expect(err).NotTo(HaveOccurred())
5252

5353
cfg.WrapTransport = func(rt http.RoundTripper) http.RoundTripper {
54-
// NB(directxman12): we can't set Transport *and* use TLS options,
55-
// so we grab the transport right after it gets created so that we can
56-
// type-assert on it (hopefully)?
57-
// hopefully this doesn't break 🤞
58-
clientTransport = rt.(*http.Transport)
54+
clientRoundTripper = rt
5955
return rt
6056
}
6157

‎pkg/cluster/cluster_test.go‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ import (
2828
"go.uber.org/goleak"
2929
"k8s.io/apimachinery/pkg/api/meta"
3030
"k8s.io/apimachinery/pkg/runtime"
31+
utilnet "k8s.io/apimachinery/pkg/util/net"
32+
3133
"k8s.io/client-go/rest"
3234
"sigs.k8s.io/controller-runtime/pkg/cache"
3335
"sigs.k8s.io/controller-runtime/pkg/client"
@@ -118,7 +120,7 @@ var _ = Describe("cluster.Cluster", func() {
118120

119121
// force-close keep-alive connections. These'll time anyway (after
120122
// like 30s or so) but force it to speed up the tests.
121-
clientTransport.CloseIdleConnections()
123+
utilnet.CloseIdleConnectionsFor(clientRoundTripper)
122124
Eventually(func() error { return goleak.Find(currentGRs) }).Should(Succeed())
123125
})
124126

‎pkg/controller/controller_suite_test.go‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ var testenv *envtest.Environment
4444
var cfg *rest.Config
4545
var clientset *kubernetes.Clientset
4646

47-
// clientTransport is used to force-close keep-alives in tests that check for leaks.
48-
var clientTransport *http.Transport
47+
// clientRoundTripper is used to force-close keep-alives in tests that check for leaks.
48+
var clientRoundTripper http.RoundTripper
4949

5050
var _ = BeforeSuite(func() {
5151
logf.SetLogger(zap.New(zap.WriteTo(GinkgoWriter), zap.UseDevMode(true)))
@@ -63,11 +63,7 @@ var _ = BeforeSuite(func() {
6363
Expect(err).NotTo(HaveOccurred())
6464

6565
cfg.WrapTransport = func(rt http.RoundTripper) http.RoundTripper {
66-
// NB(directxman12): we can't set Transport *and* use TLS options,
67-
// so we grab the transport right after it gets created so that we can
68-
// type-assert on it (hopefully)?
69-
// hopefully this doesn't break 🤞
70-
clientTransport = rt.(*http.Transport)
66+
clientRoundTripper = rt
7167
return rt
7268
}
7369

‎pkg/controller/controller_test.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import (
2424
. "github.com/onsi/gomega"
2525
"go.uber.org/goleak"
2626
corev1 "k8s.io/api/core/v1"
27+
utilnet "k8s.io/apimachinery/pkg/util/net"
2728
"k8s.io/client-go/util/workqueue"
2829
"k8s.io/utils/ptr"
2930

@@ -178,7 +179,7 @@ var _ = Describe("controller.Controller", func() {
178179

179180
// force-close keep-alive connections. These'll time anyway (after
180181
// like 30s or so) but force it to speed up the tests.
181-
clientTransport.CloseIdleConnections()
182+
utilnet.CloseIdleConnectionsFor(clientRoundTripper)
182183
Eventually(func() error { return goleak.Find(currentGRs) }).Should(Succeed())
183184
})
184185

@@ -193,7 +194,7 @@ var _ = Describe("controller.Controller", func() {
193194

194195
// force-close keep-alive connections. These'll time anyway (after
195196
// like 30s or so) but force it to speed up the tests.
196-
clientTransport.CloseIdleConnections()
197+
utilnet.CloseIdleConnectionsFor(clientRoundTripper)
197198
Eventually(func() error { return goleak.Find(currentGRs) }).Should(Succeed())
198199
})
199200

0 commit comments

Comments
 (0)