Merge pull request #137456 from liggitt/go126

Update go.mod to go 1.26, fix 1.26 vet errors Kubernetes-commit: 800a58b7c515b3d5e2677f6af37f9ece186b67c0
Merge pull request #137473 from jpbetz/fix-set-transform
2026-03-09 00:00:13 +08:00 · 2026-03-06 08:56:41 +00:00 · 2026-03-06 08:56:39 +00:00 · 2026-03-05 20:18:03 -05:00 · 2026-03-05 20:58:40 +00:00 · 2026-03-05 09:36:13 -05:00
3 changed files with 32 additions and 30 deletions
--- a/go.mod
+++ b/go.mod
@@ -2,18 +2,18 @@

 module k8s.io/sample-controller

-go 1.25.0
+go 1.26.0

-godebug default=go1.25
+godebug default=go1.26

 require (
 	golang.org/x/time v0.14.0
-	k8s.io/api v0.36.0-alpha.2
-	k8s.io/apimachinery v0.36.0-alpha.2
-	k8s.io/client-go v0.36.0-alpha.2
-	k8s.io/code-generator v0.36.0-alpha.2
+	k8s.io/api v0.0.0-20260306081949-82b9cd13f9e4
+	k8s.io/apimachinery v0.0.0-20260306081630-647784e3f84c
+	k8s.io/client-go v0.0.0-20260306082425-c3a1049f7e8c
+	k8s.io/code-generator v0.0.0-20260306083344-82047cd57f1a
 	k8s.io/klog/v2 v2.130.1
-	k8s.io/kube-openapi v0.0.0-20260127142750-a19766b6e2d4
+	k8s.io/kube-openapi v0.0.0-20260304202019-5b3e3fdb0acf
 	k8s.io/utils v0.0.0-20260210185600-b8788abfbbc2
 	sigs.k8s.io/structured-merge-diff/v6 v6.3.2
 )
@@ -46,8 +46,8 @@ require (
 	golang.org/x/sys v0.40.0 // indirect
 	golang.org/x/term v0.39.0 // indirect
 	golang.org/x/text v0.33.0 // indirect
-	golang.org/x/tools v0.40.0 // indirect
-	google.golang.org/protobuf v1.36.11 // indirect
+	golang.org/x/tools v0.41.0 // indirect
+	google.golang.org/protobuf v1.36.12-0.20260120151049-f2248ac996af // indirect
 	gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
--- a/go.sum
+++ b/go.sum
@@ -26,8 +26,8 @@ github.com/google/gnostic-models v0.7.0/go.mod h1:whL5G0m6dmc5cPxKc5bdKdEN3UjI7O
 github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
 github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
-github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 h1:BHT72Gu3keYf3ZEu2J0b1vyeLSOYI8bm5wbJM/8yDe8=
-github.com/google/pprof v0.0.0-20250403155104-27863c87afa6/go.mod h1:boTsfXsheKC2y+lKOCMpSfarhxDeIzfZG1jqGcPl3cA=
+github.com/google/pprof v0.0.0-20260115054156-294ebfa9ad83 h1:z2ogiKUYzX5Is6zr/vP9vJGqPwcdqsWjOt+V8J7+bTc=
+github.com/google/pprof v0.0.0-20260115054156-294ebfa9ad83/go.mod h1:MxpfABSjhmINe3F1It9d+8exIHFvUqtLIRCdOGNXqiI=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
@@ -51,10 +51,10 @@ github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee h1:W5t00kpgFd
 github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
-github.com/onsi/ginkgo/v2 v2.27.4 h1:fcEcQW/A++6aZAZQNUmNjvA9PSOzefMJBerHJ4t8v8Y=
-github.com/onsi/ginkgo/v2 v2.27.4/go.mod h1:ArE1D/XhNXBXCBkKOLkbsb2c81dQHCRcF5zwn/ykDRo=
-github.com/onsi/gomega v1.39.0 h1:y2ROC3hKFmQZJNFeGAMeHZKkjBL65mIZcvrLQBF9k6Q=
-github.com/onsi/gomega v1.39.0/go.mod h1:ZCU1pkQcXDO5Sl9/VVEGlDyp+zm0m1cmeG5TOzLgdh4=
+github.com/onsi/ginkgo/v2 v2.28.1 h1:S4hj+HbZp40fNKuLUQOYLDgZLwNUVn19N3Atb98NCyI=
+github.com/onsi/ginkgo/v2 v2.28.1/go.mod h1:CLtbVInNckU3/+gC8LzkGUb9oF+e8W8TdUsxPwvdOgE=
+github.com/onsi/gomega v1.39.1 h1:1IJLAad4zjPn2PsnhH70V4DKRFlrCzGBNrNaru+Vf28=
+github.com/onsi/gomega v1.39.1/go.mod h1:hL6yVALoTOxeWudERyfppUcZXjMwIMLnuSfruD2lcfg=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
@@ -97,14 +97,14 @@ golang.org/x/text v0.33.0 h1:B3njUFyqtHDUI5jMn1YIr5B0IE2U0qck04r6d4KPAxE=
 golang.org/x/text v0.33.0/go.mod h1:LuMebE6+rBincTi9+xWTY8TztLzKHc/9C1uBCG27+q8=
 golang.org/x/time v0.14.0 h1:MRx4UaLrDotUKUdCIqzPC48t1Y9hANFKIRpNx+Te8PI=
 golang.org/x/time v0.14.0/go.mod h1:eL/Oa2bBBK0TkX57Fyni+NgnyQQN4LitPmob2Hjnqw4=
-golang.org/x/tools v0.40.0 h1:yLkxfA+Qnul4cs9QA3KnlFu0lVmd8JJfoq+E41uSutA=
-golang.org/x/tools v0.40.0/go.mod h1:Ik/tzLRlbscWpqqMRjyWYDisX8bG13FrdXp3o4Sr9lc=
+golang.org/x/tools v0.41.0 h1:a9b8iMweWG+S0OBnlU36rzLp20z1Rp10w+IY2czHTQc=
+golang.org/x/tools v0.41.0/go.mod h1:XSY6eDqxVNiYgezAVqqCeihT4j1U2CCsqvH3WhQpnlg=
 golang.org/x/tools/go/expect v0.1.1-deprecated h1:jpBZDwmgPhXsKZC6WhL20P4b/wmnpsEAGHaNy0n/rJM=
 golang.org/x/tools/go/expect v0.1.1-deprecated/go.mod h1:eihoPOH+FgIqa3FpoTwguz/bVUSGBlGQU67vpBeOrBY=
 golang.org/x/tools/go/packages/packagestest v0.1.1-deprecated h1:1h2MnaIAIXISqTFKdENegdpAgUXz6NrPEsbIeWaBRvM=
 golang.org/x/tools/go/packages/packagestest v0.1.1-deprecated/go.mod h1:RVAQXBGNv1ib0J382/DPCRS/BPnsGebyM1Gj5VSDpG8=
-google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE=
-google.golang.org/protobuf v1.36.11/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
+google.golang.org/protobuf v1.36.12-0.20260120151049-f2248ac996af h1:+5/Sw3GsDNlEmu7TfklWKPdQ0Ykja5VEmq2i817+jbI=
+google.golang.org/protobuf v1.36.12-0.20260120151049-f2248ac996af/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
@@ -115,20 +115,20 @@ gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-k8s.io/api v0.36.0-alpha.2 h1:5VQ17JO0v+9X/meq70nUzb6Ec7zuAfP+izKiJMeu9zM=
-k8s.io/api v0.36.0-alpha.2/go.mod h1:VrBGsSGpBoBDkL0gV2hd11bLXcW3xX0/dg352BZthWs=
-k8s.io/apimachinery v0.36.0-alpha.2 h1:I3A/nvRsgV/j/AX7VXDn8XjuDz2gsfcdOTVCkKMRLsQ=
-k8s.io/apimachinery v0.36.0-alpha.2/go.mod h1:7mgr/dli8ofwAbcIQXetFVX1fbOYsOYojq3AUbybVmQ=
-k8s.io/client-go v0.36.0-alpha.2 h1:Tk1GnYEd9KjzRG9QN84DWghJ4I91Cy5pbxSyffEZlhw=
-k8s.io/client-go v0.36.0-alpha.2/go.mod h1:exn5BZg49XPJN4xNe18t4O3LJah8seb2Fxl7IyUJ6jY=
-k8s.io/code-generator v0.36.0-alpha.2 h1:5D2zNI3YGmOGkko9y65B/WqJRodQfmaOAhFEQXu4/r0=
-k8s.io/code-generator v0.36.0-alpha.2/go.mod h1:23vM9/HK7Lf7FQ1xLC+IDT53y11BRTVV9/9DXZs+ZZo=
+k8s.io/api v0.0.0-20260306081949-82b9cd13f9e4 h1:J6N4bA1RdJf/WidpDCAUWBwC4t8Fl7uUoJi2lEDkf4w=
+k8s.io/api v0.0.0-20260306081949-82b9cd13f9e4/go.mod h1:c5/X+3BzwOR8e8Tp0Mmb8vIR+8qb15ndtumwdYhVfro=
+k8s.io/apimachinery v0.0.0-20260306081630-647784e3f84c h1:RoUd31LCDoEFVv903GyxlVxoiF63LVg6h5eGnhbj+jw=
+k8s.io/apimachinery v0.0.0-20260306081630-647784e3f84c/go.mod h1:BRZJp+rI0KQ4rFG0tVMWDQlu2NrN/ym/0cFc2m06TcI=
+k8s.io/client-go v0.0.0-20260306082425-c3a1049f7e8c h1:iazdJvp9PUYpK+F5ACZliIjdouKpSioCKrTkYzTKI/g=
+k8s.io/client-go v0.0.0-20260306082425-c3a1049f7e8c/go.mod h1:PxCwZgraG/A67h2yly8Sp7jdU6W3ux8vqhhADqVgAxc=
+k8s.io/code-generator v0.0.0-20260306083344-82047cd57f1a h1:0iKtxRrm173ZklNFJ0IjeIj/js0mqdI/45EHt1WbGd4=
+k8s.io/code-generator v0.0.0-20260306083344-82047cd57f1a/go.mod h1:gcox1DK6xun0SAEz2BuFFYSAchpNMro9hcnKRu6S5E0=
 k8s.io/gengo/v2 v2.0.0-20250922181213-ec3ebc5fd46b h1:gMplByicHV/TJBizHd9aVEsTYoJBnnUAT5MHlTkbjhQ=
 k8s.io/gengo/v2 v2.0.0-20250922181213-ec3ebc5fd46b/go.mod h1:CgujABENc3KuTrcsdpGmrrASjtQsWCT7R99mEV4U/fM=
 k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
 k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
-k8s.io/kube-openapi v0.0.0-20260127142750-a19766b6e2d4 h1:HhDfevmPS+OalTjQRKbTHppRIz01AWi8s45TMXStgYY=
-k8s.io/kube-openapi v0.0.0-20260127142750-a19766b6e2d4/go.mod h1:kdmbQkyfwUagLfXIad1y2TdrjPFWp2Q89B3qkRwf/pQ=
+k8s.io/kube-openapi v0.0.0-20260304202019-5b3e3fdb0acf h1:btPscg4cMql0XdYK2jLsJcNEKmACJz8l+U7geC06FiM=
+k8s.io/kube-openapi v0.0.0-20260304202019-5b3e3fdb0acf/go.mod h1:kdmbQkyfwUagLfXIad1y2TdrjPFWp2Q89B3qkRwf/pQ=
 k8s.io/utils v0.0.0-20260210185600-b8788abfbbc2 h1:AZYQSJemyQB5eRxqcPky+/7EdBj0xi3g0ZcxxJ7vbWU=
 k8s.io/utils v0.0.0-20260210185600-b8788abfbbc2/go.mod h1:xDxuJ0whA3d0I4mf/C4ppKHxXynQ+fxnkmQH0vTHnuk=
 sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 h1:IpInykpT6ceI+QxKBbEflcR5EXP7sU1kvOlxwZh5txg=
--- a/pkg/generated/informers/externalversions/factory.go
+++ b/pkg/generated/informers/externalversions/factory.go
@@ -237,7 +237,9 @@ func (f *sharedInformerFactory) InformerFor(obj runtime.Object, newFunc internal
 	}

 	informer = newFunc(f.client, resyncPeriod)
-	informer.SetTransform(f.transform)
+	if f.transform != nil {
+		informer.SetTransform(f.transform)
+	}
 	f.informers[informerType] = informer

 	return informer
Author	SHA1	Message	Date
Kubernetes Publisher	552c862a9a	Merge pull request #137456 from liggitt/go126 Update go.mod to go 1.26, fix 1.26 vet errors Kubernetes-commit: 800a58b7c515b3d5e2677f6af37f9ece186b67c0	2026-03-06 08:56:41 +00:00
Kubernetes Publisher	cc7947006d	Merge pull request #137473 from jpbetz/fix-set-transform Fix SetTransform to correctly override per-informer transforms Kubernetes-commit: 3dceb579f797c88564d03a7bdf91ba8108ffd820	2026-03-06 08:56:39 +00:00
Joe Betz	17ca05e862	generate code Kubernetes-commit: e433cbcb5bb982ba666ad01b6f8567b6e2695a34	2026-03-05 20:18:03 -05:00
Kubernetes Publisher	06e7a6d9b1	Merge pull request #137451 from dims/update-google-protobuf-deadcode-fix Update google.golang.org/protobuf to v1.36.12-0.20260120151049-f2248ac996af to prevent file size explosion in go 1.26 Kubernetes-commit: 77c013637cb40e1b5d2b26664dc7b297f1ff2693	2026-03-05 20:58:40 +00:00
Davanum Srinivas	489d4af143	Update google.golang.org/protobuf to v1.36.12-0.20260120151049-f2248ac996af Pins google.golang.org/protobuf to HEAD commit f2248ac996afc39b3df0777cdcc269f6ade50b07 (v1.36.12-0.20260120151049-f2248ac996af) which includes fixes for dead code elimination issues surfaced by Go 1.26's reflect changes. Xref: https://github.com/golang/protobuf/issues/1704 Xref: https://github.com/kubernetes/kubernetes/issues/137445 Signed-off-by: Davanum Srinivas <davanum@gmail.com> Kubernetes-commit: c8826e0d235fde75d02643bd700179ed79897ad6	2026-03-05 09:36:13 -05:00
Kubernetes Publisher	92583927f0	Merge pull request #137349 from Jefftree/fix-model-name-bounding-dirs Pass --readonly-pkg to openapi-gen in kube_codegen.sh Kubernetes-commit: ef8a14f679491f858968f49a847c393a3a3fc5e2	2026-03-05 05:03:44 +00:00
Jefftree	404805e4e1	update kube-openapi Kubernetes-commit: 721eea74e75dc95bafbfa450bb2309e494abf45c	2026-03-04 15:33:47 -05:00
Kubernetes Publisher	6adacb47b9	Merge pull request #137286 from humblec/update-vendored-dependencies Update vendored dependencies ( gomega/cadvisor) Kubernetes-commit: 3f2ebc50eecfaeda23df4435dc82422fa65425ed	2026-02-27 17:15:45 +00:00
Humble Devassy Chirammal	f96a2115f9	dependencies: bump gomega to v1.39.1 and ginkgo to v2.28.1 Kubernetes-commit: 600d188f2b02eea974509062c04186309065ff16	2026-02-27 15:48:21 +05:30
Jordan Liggitt	5a57c65aa6	Bump to go 1.26 Kubernetes-commit: f291ae40b03afaaf49cca43b650bfbd05f4babee	2026-02-17 16:05:07 -05:00