From e1ecb79ae53a03196184fa67d962614e4ed07e61 Mon Sep 17 00:00:00 2001 From: Bryant Biggs Date: Wed, 18 Mar 2026 09:09:11 -0500 Subject: [PATCH] dependencies: bump kube-openapi to drop ginkgo/gomega indirect deps Bump k8s.io/kube-openapi to pick up kubernetes/kube-openapi#579 which moved the last ginkgo/gomega tests to stdlib testing and ran go mod tidy, removing ginkgo/gomega from kube-openapi's go.mod. This drops ginkgo/gomega as indirect deps from apimachinery. It also prunes Masterminds/semver, google/pprof, and golang.org/x/tools from client-go and other staging modules where they were only needed through kube-openapi's ginkgo/gomega chain. Contributes to kubernetes/kubernetes#127888 Kubernetes-commit: 56cd74d879f1ba11aadcff95326f17a1cc2c82ef --- go.mod | 12 +++++++----- go.sum | 30 ++++++++++-------------------- 2 files changed, 17 insertions(+), 25 deletions(-) diff --git a/go.mod b/go.mod index 1a1925b3..9464143b 100644 --- a/go.mod +++ b/go.mod @@ -8,12 +8,12 @@ godebug default=go1.26 require ( golang.org/x/time v0.14.0 - k8s.io/api v0.0.0-20260317235848-505c5360c630 - k8s.io/apimachinery v0.0.0-20260317234939-27f467019a4e - k8s.io/client-go v0.0.0-20260317080009-39f55294aa5b - k8s.io/code-generator v0.0.0-20260318001842-22fe297914e4 + k8s.io/api v0.0.0-20260318195839-1ee4dbfb376b + k8s.io/apimachinery v0.0.0-20260318195418-729062d58854 + k8s.io/client-go v0.0.0-20260318200515-2fb6b9cac00d + k8s.io/code-generator v0.0.0-20260318201857-f4e4b3a54116 k8s.io/klog/v2 v2.140.0 - k8s.io/kube-openapi v0.0.0-20260304202019-5b3e3fdb0acf + k8s.io/kube-openapi v0.0.0-20260317180543-43fb72c5454a k8s.io/utils v0.0.0-20260210185600-b8788abfbbc2 sigs.k8s.io/structured-merge-diff/v6 v6.3.2 ) @@ -56,3 +56,5 @@ require ( sigs.k8s.io/randfill v1.0.0 // indirect sigs.k8s.io/yaml v1.6.0 // indirect ) + +replace k8s.io/streaming => k8s.io/streaming v0.0.0-20260409181516-ff6889be5347 diff --git a/go.sum b/go.sum index 928818ec..4366222c 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,3 @@ -github.com/Masterminds/semver/v3 v3.4.0 h1:Zog+i5UMtVoCU8oKka5P7i9q9HgrJeGzI9SA1Xbatp0= -github.com/Masterminds/semver/v3 v3.4.0/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -19,15 +17,11 @@ github.com/go-openapi/jsonreference v0.20.2/go.mod h1:Bl1zwGIM8/wsvqjsOQLJ/SH+En github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14= github.com/go-openapi/swag v0.23.0 h1:vsEVJDUo2hPJ2tu0/Xc+4noaxyEffXNIs3cOULZ+GrE= github.com/go-openapi/swag v0.23.0/go.mod h1:esZ8ITTYEsH1V2trKHjAN8Ai7xHb8RV+YSZ577vPjgQ= -github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI= -github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8= github.com/google/gnostic-models v0.7.0 h1:qwTtogB15McXDaNqTZdzPJRHvaVJlAl+HVQnLmJEJxo= github.com/google/gnostic-models v0.7.0/go.mod h1:whL5G0m6dmc5cPxKc5bdKdEN3UjI7OUGxBlw57miDrQ= 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-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 +45,6 @@ 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.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= @@ -115,20 +105,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.0.0-20260317235848-505c5360c630 h1:mdQFoJldhdjmK1LGtjxeUAAtVSXM1zkOu5rEwzNxiFs= -k8s.io/api v0.0.0-20260317235848-505c5360c630/go.mod h1:CKRn/WvVeqJtqFUxbylLEVcEtlI5e+Rku85JhgXhT2w= -k8s.io/apimachinery v0.0.0-20260317234939-27f467019a4e h1:pNk+ZK3ZwiE+Gq6Q/s0YFOZ2np02xX55KX40K1iSM+s= -k8s.io/apimachinery v0.0.0-20260317234939-27f467019a4e/go.mod h1:2JIMZs+Myd76Z1nCfRVkGYZegmDSx+D1bBpaAWSV1fQ= -k8s.io/client-go v0.0.0-20260317080009-39f55294aa5b h1:WSga95r+QOkvMIzhZEfcDpENvAtEpg0QxfiP4WA2wrA= -k8s.io/client-go v0.0.0-20260317080009-39f55294aa5b/go.mod h1:GHZAZxVmYcILZAaL9yFMdMby5XdbA4EosCqcYgSmZgE= -k8s.io/code-generator v0.0.0-20260318001842-22fe297914e4 h1:C3EoWt+g+0sE5zNfYWH7SCJGDo/HEAIz/AqxaVloqr8= -k8s.io/code-generator v0.0.0-20260318001842-22fe297914e4/go.mod h1:OweLgPxISIMoRulkvJnX5kx2y4NSiFkQ1n0NrenkCrI= +k8s.io/api v0.0.0-20260318195839-1ee4dbfb376b h1:vJ68uqHpPb2e0gBRYOYD1iKivPg5rq9ERpcClN5tbb4= +k8s.io/api v0.0.0-20260318195839-1ee4dbfb376b/go.mod h1:Me8XWRAAY/34t+2YTLQeaWCLaH9DHxkNCTqVHMwo3lg= +k8s.io/apimachinery v0.0.0-20260318195418-729062d58854 h1:iuI2iZc7u7hgHcDS8SzYRurcIo3ltRh4MnFkCTYmV2c= +k8s.io/apimachinery v0.0.0-20260318195418-729062d58854/go.mod h1:Fjag9BypDOzB4sV3iuZaNeDsRkf89asmbm8aWLerfeU= +k8s.io/client-go v0.0.0-20260318200515-2fb6b9cac00d h1:wv5Exy6raJKPU7z/RTL1YdmG9NwPUK278bVoKBHSqPM= +k8s.io/client-go v0.0.0-20260318200515-2fb6b9cac00d/go.mod h1:mf77bUzodHL0yca+gF00nbK520hrX7O6P8U/SN9re7Y= +k8s.io/code-generator v0.0.0-20260318201857-f4e4b3a54116 h1:KvBY0bd6UxBBhTmEaCBT+tKIGfPpmPy8bJWoYK7mZOM= +k8s.io/code-generator v0.0.0-20260318201857-f4e4b3a54116/go.mod h1:oW9L5RNfUzXVihALX1o8g3sfCSbx4t29rjPCuWcfjG0= 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.140.0 h1:Tf+J3AH7xnUzZyVVXhTgGhEKnFqye14aadWv7bzXdzc= k8s.io/klog/v2 v2.140.0/go.mod h1:o+/RWfJ6PwpnFn7OyAG3QnO47BFsymfEfrz6XyYSSp0= -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/kube-openapi v0.0.0-20260317180543-43fb72c5454a h1:xCeOEAOoGYl2jnJoHkC3hkbPJgdATINPMAxaynU2Ovg= +k8s.io/kube-openapi v0.0.0-20260317180543-43fb72c5454a/go.mod h1:uGBT7iTA6c6MvqUvSXIaYZo9ukscABYi2btjhvgKGZ0= 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=