Merge pull request #132221 from dims/new-cmp-diff-impl

New implementation for `Diff` (drop in replacement for `cmp.Diff`) Kubernetes-commit: 3e39d1074fc717a883aaf57b966dd7a06dfca2ec
Add a replacement for cmp.Diff using json+go-difflib
2025-06-17 04:12:19 +00:00 · 2025-06-10 23:08:41 -04:00 · 2025-06-12 20:43:39 +00:00 · 2025-06-12 11:20:39 -04:00 · 2025-06-10 20:35:19 +00:00 · 2025-06-10 10:50:54 -04:00
2 changed files with 68 additions and 65 deletions
--- a/go.mod
+++ b/go.mod
@ -2,50 +2,48 @@

 module k8s.io/kube-proxy

-go 1.23.0
+go 1.24.0

-godebug default=go1.23
-
-godebug winsymlink=0
+godebug default=go1.24

 require (
-	k8s.io/apimachinery v0.0.0-20250115201602-f863467e6f42
-	k8s.io/component-base v0.0.0-20250115203345-3fc0045268f4
+	k8s.io/apimachinery v0.0.0-20250617032454-d2d60b8eb21f
+	k8s.io/component-base v0.0.0-20250617034450-dc0881cd03da
 )

 require (
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/blang/semver/v4 v4.0.0 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
-	github.com/fxamacker/cbor/v2 v2.7.0 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/fxamacker/cbor/v2 v2.8.0 // indirect
 	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
-	github.com/google/go-cmp v0.6.0 // indirect
-	github.com/google/gofuzz v1.2.0 // indirect
+	github.com/google/go-cmp v0.7.0 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/kr/text v0.2.0 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
-	github.com/modern-go/reflect2 v1.0.2 // indirect
+	github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
-	github.com/prometheus/client_golang v1.19.1 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/prometheus/client_golang v1.22.0 // indirect
 	github.com/prometheus/client_model v0.6.1 // indirect
-	github.com/prometheus/common v0.55.0 // indirect
+	github.com/prometheus/common v0.62.0 // indirect
 	github.com/prometheus/procfs v0.15.1 // indirect
-	github.com/rogpeppe/go-internal v1.12.0 // indirect
-	github.com/spf13/cobra v1.8.1 // indirect
-	github.com/spf13/pflag v1.0.5 // indirect
+	github.com/spf13/cobra v1.9.1 // indirect
+	github.com/spf13/pflag v1.0.6 // indirect
 	github.com/x448/float16 v0.8.4 // indirect
-	go.opentelemetry.io/otel v1.28.0 // indirect
-	go.opentelemetry.io/otel/trace v1.28.0 // indirect
-	golang.org/x/net v0.33.0 // indirect
-	golang.org/x/sys v0.28.0 // indirect
-	golang.org/x/text v0.21.0 // indirect
-	google.golang.org/protobuf v1.35.1 // indirect
+	go.opentelemetry.io/otel v1.35.0 // indirect
+	go.opentelemetry.io/otel/trace v1.35.0 // indirect
+	golang.org/x/net v0.38.0 // indirect
+	golang.org/x/sys v0.31.0 // indirect
+	golang.org/x/text v0.23.0 // indirect
+	google.golang.org/protobuf v1.36.5 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	k8s.io/klog/v2 v2.130.1 // indirect
-	k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect
+	k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 // indirect
 	sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
-	sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
+	sigs.k8s.io/randfill v1.0.0 // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.7.0 // indirect
 	sigs.k8s.io/yaml v1.4.0 // indirect
 )
--- a/go.sum
+++ b/go.sum
@ -4,69 +4,71 @@ github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM
 github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ=
 github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
 github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
-github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
-github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
+github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/fxamacker/cbor/v2 v2.7.0 h1:iM5WgngdRBanHcxugY4JySA0nk1wZorNOpTgCMedv5E=
-github.com/fxamacker/cbor/v2 v2.7.0/go.mod h1:pxXPTn3joSm21Gbwsv0w9OSA2y1HFR9qXEeXQVeNoDQ=
+github.com/fxamacker/cbor/v2 v2.8.0 h1:fFtUGXUzXPHTIUdne5+zzMPTfffl3RD5qYnkY40vtxU=
+github.com/fxamacker/cbor/v2 v2.8.0/go.mod h1:vM4b+DJCtHn+zz7h3FFp/hDAI9WNWCsZj23V5ytsSxQ=
 github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
 github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
 github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
 github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
-github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+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/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
-github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
 github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
 github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
 github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
+github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo=
+github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
+github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
+github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
 github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
+github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee h1:W5t00kpgFdJifH4BDsTlE89Zl93FEloxaWZfGcifgq8=
+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/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQeLaYJFJBOE=
-github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho=
+github.com/prometheus/client_golang v1.22.0 h1:rb93p9lokFEsctTys46VnV1kLCDpVZ0a/Y92Vm0Zc6Q=
+github.com/prometheus/client_golang v1.22.0/go.mod h1:R7ljNsLXhuQXYZYtw6GAE9AZg8Y7vEW5scdCXrWRXC0=
 github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E=
 github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY=
-github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G1dc=
-github.com/prometheus/common v0.55.0/go.mod h1:2SECS4xJG1kd8XF9IcM1gMX6510RAEL65zxzNImwdc8=
+github.com/prometheus/common v0.62.0 h1:xasJaQlnWAeyHdUBeGjXmutelfJHWMRr+Fg4QszZ2Io=
+github.com/prometheus/common v0.62.0/go.mod h1:vyBcEuLSvWos9B1+CyL7JZ2up+uFzXhkqml0W5zIY1I=
 github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc=
 github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk=
-github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8=
-github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4=
+github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
+github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
-github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM=
-github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y=
-github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
-github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
+github.com/spf13/cobra v1.9.1 h1:CXSaggrXdbHK9CF+8ywj8Amf7PBRmPCOJugH954Nnlo=
+github.com/spf13/cobra v1.9.1/go.mod h1:nDyEzZ8ogv936Cinf6g1RU9MRY64Ir93oCnqb9wxYW0=
+github.com/spf13/pflag v1.0.6 h1:jFzHGLGAlb3ruxLB8MhbI6A8+AQX/2eW4qeyNZXNp2o=
+github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
-github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
-github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
+github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
 github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-go.opentelemetry.io/otel v1.28.0 h1:/SqNcYk+idO0CxKEUOtKQClMK/MimZihKYMruSMViUo=
-go.opentelemetry.io/otel v1.28.0/go.mod h1:q68ijF8Fc8CnMHKyzqL6akLO46ePnjkgfIMIjUIX9z4=
-go.opentelemetry.io/otel/trace v1.28.0 h1:GhQ9cUuQGmNDd5BTCP2dAvv75RdMxEfTmYejp+lkx9g=
-go.opentelemetry.io/otel/trace v1.28.0/go.mod h1:jPyXzNPg6da9+38HEwElrQiHlVMTnVfM3/yv2OlIHaI=
+go.opentelemetry.io/otel v1.35.0 h1:xKWKPxrxB6OtMCbmMY021CqC45J+3Onta9MqjhnusiQ=
+go.opentelemetry.io/otel v1.35.0/go.mod h1:UEqy8Zp11hpkUrL73gSlELM0DupHoiq72dR+Zqel/+Y=
+go.opentelemetry.io/otel/trace v1.35.0 h1:dPpEfJu1sDIqruz7BHFG3c7528f6ddfSWfFDVt/xgMs=
+go.opentelemetry.io/otel/trace v1.35.0/go.mod h1:WUk7DtFp1Aw2MkvqGdwiXYDZZNvA/1J8o6xRXLrIkyc=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
@ -76,20 +78,20 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
-golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
+golang.org/x/net v0.38.0 h1:vRMAPTMaeGqVhG5QyLJHqNDwecKTomGeqbnfZyKlBI8=
+golang.org/x/net v0.38.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
-golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik=
+golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
-golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
+golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY=
+golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
@ -98,8 +100,8 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA=
-google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
+google.golang.org/protobuf v1.36.5 h1:tPhr+woSbjfYvY6/GPufUoYizxw1cF/yFoxJ2fmpwlM=
+google.golang.org/protobuf v1.36.5/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
 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=
@ -107,17 +109,20 @@ gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
 gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
 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/apimachinery v0.0.0-20250115201602-f863467e6f42 h1:R3hoY8HCR4WZBT0bqbtd8adoNilLSSDBOLcsbZ/UZ4M=
-k8s.io/apimachinery v0.0.0-20250115201602-f863467e6f42/go.mod h1:h8DnJz4KNjkQsP8iFir+s3sSBEK3Iy43bfB2gFjSR+A=
-k8s.io/component-base v0.0.0-20250115203345-3fc0045268f4 h1:SPLlKM4cULKD2vse+QVTA3CC/pBUKGQeoetFzeyo78g=
-k8s.io/component-base v0.0.0-20250115203345-3fc0045268f4/go.mod h1:WbCiRejbYRLGDbj9GaPRsHrz/6kLE5ya7gaRoto0LBg=
+k8s.io/apimachinery v0.0.0-20250617032454-d2d60b8eb21f h1:+TyAxkvb3oaCIN4Ev+o9FvyFVd1VDcWHHrEKB5V6zRE=
+k8s.io/apimachinery v0.0.0-20250617032454-d2d60b8eb21f/go.mod h1:/kMnP8WowZRse4LjwOCxh+RR0W03jl2f/gCRYqeYMZA=
+k8s.io/component-base v0.0.0-20250617034450-dc0881cd03da h1:JIslv7EMZ/AS8fKVL2ttpIbKiLKiMc4FEBiFepcaHCk=
+k8s.io/component-base v0.0.0-20250617034450-dc0881cd03da/go.mod h1:iMJjQa+o/mr6ZuRxeZJyv/X6qV7SlKwQtmX4TSYQais=
 k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
 k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
-k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 h1:M3sRQVHv7vB20Xc2ybTt7ODCeFj6JSWYFzOFnYeS6Ro=
-k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
+k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 h1:hwvWFiBzdWw1FhfY1FooPn3kzWuJ8tmbZBHi4zVsl1Y=
+k8s.io/utils v0.0.0-20250604170112-4c0f3b243397/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
 sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 h1:/Rv+M11QRah1itp8VhT6HoVx1Ray9eB4DBr+K+/sCJ8=
 sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3/go.mod h1:18nIHnGi6636UCz6m8i4DhaJ65T6EruyzmoQqI2BVDo=
-sigs.k8s.io/structured-merge-diff/v4 v4.4.2 h1:MdmvkGuXi/8io6ixD5wud3vOLwc1rj0aNqRlpuvjmwA=
-sigs.k8s.io/structured-merge-diff/v4 v4.4.2/go.mod h1:N8f93tFZh9U6vpxwRArLiikrE5/2tiu1w1AGfACIGE4=
+sigs.k8s.io/randfill v0.0.0-20250304075658-069ef1bbf016/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY=
+sigs.k8s.io/randfill v1.0.0 h1:JfjMILfT8A6RbawdsK2JXGBR5AQVfd+9TbzrlneTyrU=
+sigs.k8s.io/randfill v1.0.0/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY=
+sigs.k8s.io/structured-merge-diff/v4 v4.7.0 h1:qPeWmscJcXP0snki5IYF79Z8xrl8ETFxgMd7wez1XkI=
+sigs.k8s.io/structured-merge-diff/v4 v4.7.0/go.mod h1:dDy58f92j70zLsuZVuUX5Wp9vtxXpaZnkPGWeqDfCps=
 sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=
 sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=
Author	SHA1	Message	Date
Kubernetes Publisher	18aa220e99	Merge pull request #132221 from dims/new-cmp-diff-impl New implementation for `Diff` (drop in replacement for `cmp.Diff`) Kubernetes-commit: 3e39d1074fc717a883aaf57b966dd7a06dfca2ec	2025-06-17 04:12:19 +00:00
Davanum Srinivas	ee8f13a374	Add a replacement for cmp.Diff using json+go-difflib Co-authored-by: Jordan Liggitt <jordan@liggitt.net> Signed-off-by: Davanum Srinivas <davanum@gmail.com> Kubernetes-commit: 03afe6471bdbf6462b7035fdaae5aa0dd9545396	2025-06-10 23:08:41 -04:00
Kubernetes Publisher	616f37a9d1	Merge pull request #132269 from dims/update-to-latest-github.com/modern-go/reflect2 Update to latest github.com/modern-go/reflect2 Kubernetes-commit: d55b119d34883bbad2a3436dcb6c62339d963031	2025-06-12 20:43:39 +00:00
Davanum Srinivas	1f432887e8	Update to latest github.com/modern-go/reflect2 Signed-off-by: Davanum Srinivas <davanum@gmail.com> Kubernetes-commit: 3908550c0dc189cfa9de38a84bee508fa0659463	2025-06-12 11:20:39 -04:00
Kubernetes Publisher	0d6c2f98c3	Merge pull request #132209 from dims/update-github.com/spf13/cobra-v1.9.1eksctl update github.com/spf13/cobra v1.9.1 Kubernetes-commit: dc19f0b6b9cd14ece6b1929cb4e7ea2c9d322b95	2025-06-10 20:35:19 +00:00
Davanum Srinivas	76a885d2cf	update github.com/spf13/cobra v1.9.1 Signed-off-by: Davanum Srinivas <davanum@gmail.com> Kubernetes-commit: 449320a54a2dac04f953d5f6401d875ea9b7e8de	2025-06-10 10:50:54 -04:00
Kubernetes Publisher	749059b174	Merge pull request #132103 from nojnhuh/typed-ring-buffer Replace queue.FIFOs with k8s.io/utils/buffer.Ring Kubernetes-commit: 5090812df4fb6cf09a9181635d90c2e154eab8cc	2025-06-06 20:51:53 +00:00
Jon Huhn	1805e0eb38	Update k8s.io/utils for new generic ring buffer Kubernetes-commit: 8cdbbf5cdaef7e37cfd432e9044aa52f4d42adcd	2025-06-04 12:09:53 -05:00
Kubernetes Publisher	09a05e8d8e	Merge pull request #131951 from dims/drop-usages-of-deprecated-otelgrpc-methods Drop usages of deprecated otelgrpc methods (update to v0.60.0) Kubernetes-commit: d9c1b4ec9b3df7f09dc23a0cc2b3daf2506d3688	2025-05-27 18:24:03 +00:00
Davanum Srinivas	1bbd2c834f	Drop usages of deprecated otelgrpc methods Signed-off-by: Davanum Srinivas <davanum@gmail.com> Kubernetes-commit: 7c0f968ab256486b524ea37014ccf580b12c73e4	2025-05-23 19:40:36 -07:00
Kubernetes Publisher	6eaf09872b	Merge pull request #131838 from dims/bump-google.golang.org/grpc-to-google-v1.72.1 Bump google.golang.org/grpc to google v1.72.1 Kubernetes-commit: 444e2b4eb079727d7cdd81ad25041502656370b8	2025-05-20 16:18:43 +00:00
Davanum Srinivas	1cc23cd606	Bump google.golang.org/grpc v1.72.1 Signed-off-by: Davanum Srinivas <davanum@gmail.com> Kubernetes-commit: 9b3830fba234bc4a4f09a1ad4417e4d18b74d6dc	2025-05-18 12:52:05 -04:00
Kubernetes Publisher	51ee0f2034	Merge pull request #128419 from liggitt/etcd-3.6 etcd 3.6 client update Kubernetes-commit: 09ca440a450e9103a8f835f598c09237dba6ecbb	2025-05-16 04:22:28 +00:00
Jordan Liggitt	a423051990	bump etcd client to 3.6 hack/pin-dependency.sh go.etcd.io/etcd/api/v3 v3.6.0 hack/pin-dependency.sh go.etcd.io/etcd/client/pkg/v3 v3.6.0 hack/pin-dependency.sh go.etcd.io/etcd/client/v3 v3.6.0 hack/pin-dependency.sh go.etcd.io/etcd/pkg/v3 v3.6.0 hack/pin-dependency.sh go.etcd.io/etcd/server/v3 v3.6.0 hack/pin-dependency.sh github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.0 hack/update-vendor.sh Kubernetes-commit: cf0bbf1171e918d5d7ba1d3c83b5f347fc8333b0	2025-05-15 21:19:11 -04:00
Kubernetes Publisher	6126c67ae2	Merge pull request #131595 from aojea/utils_fake_clock update k8s.io/utils to bring fakeClock.Waiters() Kubernetes-commit: e3e1f80c0110c847acf4381b1790c1c667395010	2025-05-03 04:03:32 +00:00
Antonio Ojea	616562d20d	update k8s.io/utils to bring fakeClock.Waiters() Change-Id: I7e25338df225c2c27457403fbc2f158d08638f87 Kubernetes-commit: c2c003a71fc52fa79c2fff0109afad58573d0216	2025-05-02 11:21:11 +00:00
Kubernetes Publisher	6ee208849f	Merge pull request #130989 from liggitt/creationTimestamp-omitzero Omit null creationTimestamp Kubernetes-commit: 01899a7c86337b05a16a4155c9351cf947beaee9	2025-05-03 00:07:10 +00:00
Jordan Liggitt	602d520ba5	bump cbor to add omitzero support Kubernetes-commit: bc6051717137cef288b82305588e675de4a32c0d	2025-03-25 12:27:43 -04:00
Jordan Liggitt	24aaf1ec70	bump structured-merge-diff to add omitzero support Kubernetes-commit: 06b0784062f68566daa8eed83c475b738dcf620c	2025-03-24 16:34:01 -04:00
Kubernetes Publisher	988198d970	Merge pull request #130995 from xigang/utils bump k8s.io/utils for improvements Kubernetes-commit: 43a7d3be12425cc80ca6ad3599809a19728c5566	2025-04-24 00:09:11 +00:00
Kubernetes Publisher	fea7dbca60	Merge pull request #131204 from dims/move-to-released-version-of-prometheus/client_golang-v1.22.0-from-rc.0 Move to released version of prometheus/client_golang v1.22.0 from rc.0 Kubernetes-commit: 92af6ab6926f192a3d4543a1d6fa39f20edad3ea	2025-04-08 23:04:08 +00:00
Davanum Srinivas	ef415a5b3d	Move to released version of prometheus/client_golang v1.22.0 from rc.0 Signed-off-by: Davanum Srinivas <davanum@gmail.com> Kubernetes-commit: 2ef4a8426c2c1b6e3495de08c4686382a752f8f7	2025-04-08 08:35:18 -04:00
Kubernetes Publisher	6a609afb42	Merge pull request #131103 from ahrtr/etcd_sdk_20250328 Bump etcd 3.5.21 sdk Kubernetes-commit: f4d1686120d2367dd4c00df53e93dad51c414435	2025-04-01 11:19:21 +00:00
Benjamin Wang	7cfdb5d006	bump etcd 3.5.21 sdk Signed-off-by: Benjamin Wang <benjamin.ahrtr@gmail.com> Kubernetes-commit: f3b80a858225178e3f7a3ae07bd1b9894e7b3456	2025-03-28 14:30:47 +00:00
xigang	7fe12e80aa	bump k8s.io/utils Kubernetes-commit: fe14689f221a968806b771b226581efb834654cd	2025-03-22 10:14:01 +08:00
Kubernetes Publisher	f709bfd9c1	Merge pull request #130906 from serathius/streaming-validation Update kube-openapi and integrate streaming tags validation Kubernetes-commit: 32b1819423de505da855cf7544e871a04e63d6ed	2025-03-19 06:12:42 +00:00
Marek Siarkowicz	e9976a643d	Update kube-openapi and integrate streaming tags validation Kubernetes-commit: 75a4d136abac241f728407515e3d0d8305594675	2025-03-18 21:26:22 +01:00
Kubernetes Publisher	32ecce9786	Merge pull request #130555 from thockin/k_k_randfill Use randfill in k/k Kubernetes-commit: 0f2bde7745f3b4eadcf317bc5056dfeb96859bd3	2025-03-09 14:14:46 +00:00
Tim Hockin	093afd0889	Vendor randfill Kubernetes-commit: 0ce4268b1fe4f78d77249e329b0349b9d2dd2c65	2025-03-03 23:46:48 -08:00
Kubernetes Publisher	38087f562e	Merge pull request #130569 from dims/update-to-latest-cadvisor-v0.52.0 Update to latest cadvisor @ v0.52.1 and new opencontainer/cgroups and drops opencontainers/runc Kubernetes-commit: 0eaee48ecb8669dc65bfdf9a3583326ab88fc39d	2025-03-08 02:12:22 +00:00
Davanum Srinivas	9f6e5b1263	update to v1.22.0-rc.0 Signed-off-by: Davanum Srinivas <davanum@gmail.com> Kubernetes-commit: 97a54dc4b04b7d2938d11c5ae9a6233348e854ef	2025-03-07 13:45:34 -05:00
Davanum Srinivas	c32ca31662	update to latest cadvisor @ v0.52.0 Signed-off-by: Davanum Srinivas <davanum@gmail.com> Kubernetes-commit: 5ecddb65715af7e2afc4f3cbb1abe393bfb4346a	2025-03-04 14:29:08 -05:00
Kubernetes Publisher	b02cefefaf	Merge pull request #128919 from dashpole/update_otel Update go.opentelemetry.io dependencies to v1.33.0/v0.58.0 Kubernetes-commit: eea2f78e61fe91bb8fcd3c4a357ea3a10d1389db	2025-03-02 00:41:49 +00:00
David Ashpole	17ef05df72	update go.opentelemetry.io dependencies to v1.33.0/v0.58.0 Kubernetes-commit: 29c219dcebe30be99d6917623f8d8707a47194c1	2025-03-01 19:17:16 +00:00
Kubernetes Publisher	115568887c	Merge pull request #130474 from dims/bump-x/crypto-and-x/oauth2 Bump x/oauth2 and x/crypto Kubernetes-commit: 01ed8ed4ff0a0cbea99370c7a268019829d19e82	2025-02-28 20:44:07 +00:00
Kubernetes Publisher	33a3dcd5ed	Merge pull request #129688 from cpanato/update-main-go124 [go] Bump images, dependencies and versions to go 1.24.0 Kubernetes-commit: b8c95e1954ef222988c0dfe5b45d5cc96c09bcb8	2025-02-27 20:46:12 +00:00
Davanum Srinivas	f512972df7	Bump x/oauth2 and x/crypto Signed-off-by: Davanum Srinivas <davanum@gmail.com> Kubernetes-commit: 0fede7b8a2fb4c7f120876c9ef1e826f8ef28da2	2025-02-27 10:59:37 -05:00
cpanato	55a7602975	bump go.mod to set min go1.24 Signed-off-by: cpanato <ctadeu@gmail.com> Kubernetes-commit: 88300c406b9199ed017e1bada29951fc18e66ae1	2025-02-25 13:21:52 +01:00
Kubernetes Publisher	0a8967eeed	Merge pull request #130187 from mansikulkarni96/129084 fix: Sweep and fix stat, lstat, evalsymlink usage for go1.23 on Windows Kubernetes-commit: ef54ac803b712137871c1a1f8d635d50e69ffa6c	2025-02-23 00:26:24 +00:00
Jordan Liggitt	4d4d6b6e85	Drop winsymlink go 1.23 workaround (cherry picked from commit 3990b6324d0427eaf9ff970da2be02711567ef5f) Kubernetes-commit: 1f642c79c3192994e76bbe8e7360fd661cd21ab4	2025-02-06 12:45:52 -05:00
Kubernetes Publisher	4a0c4e2fc3	Merge pull request #130049 from aojea/avoid_ginkgo_dep reduce dependencies in apimachinery net testing utils Kubernetes-commit: 670b98bf9229bb1f193571949871f794f7b11ec3	2025-02-11 12:35:12 +00:00
Antonio Ojea	e58c4d903d	reduce dependencies in apimachinery net testing utils Consumers of the kubernetes golang API and clients must use k8s.io/api,apimachinery,client-go. This is also require to download all the necessary dependencies. The apimachinery code contains a testing util for proxies that is used in client-go and in the kubectl e2e. Since the tests on e2e require ginkgo and we want to ensure this testing library is not used in production, we cast the interface to match one of those libraries, but the problem is that this forces consumers of apimachinery to also download the ginkgo library. Since NewHTTPProxyHandler receives a testing.TB interface, there is no need to cast the interface, if someone wants to use it by implementing a testing interface it is already aware of the risks. Kubernetes-commit: af3b9e613d3b76b826369153760a069aabb4cf7f	2025-02-08 15:27:20 +00:00