Merge pull request #133020 from pohly/apimachinery-list-map-keys

support optional listMapKeys in server-side apply Kubernetes-commit: d33af7f7efc7ff5d8813a85290189883167a5226
sigs.k8s.io/structured-merge-diff/v6 v6.3.0
2025-07-17 17:48:26 +00:00 · 2025-07-16 16:57:41 -04:00 · 2025-07-15 09:50:11 +00:00 · 2025-07-10 09:21:52 -04:00 · 2025-07-03 01:49:30 +00:00 · 2025-07-02 21:45:49 +00:00
2 changed files with 72 additions and 61 deletions
--- a/go.mod
+++ b/go.mod
@ -7,41 +7,44 @@ go 1.24.0
 godebug default=go1.24

 require (
-	k8s.io/apimachinery v0.33.0-alpha.3
-	k8s.io/component-base v0.33.0-alpha.3
+	k8s.io/apimachinery v0.0.0-20250717170243-9b71f293aa0c
+	k8s.io/component-base v0.0.0-20250717172125-4e07767df717
 )

 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/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/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.33.0 // indirect
-	go.opentelemetry.io/otel/trace v1.33.0 // indirect
-	golang.org/x/net v0.33.0 // indirect
-	golang.org/x/sys v0.30.0 // indirect
-	golang.org/x/text v0.22.0 // indirect
-	google.golang.org/protobuf v1.35.2 // indirect
+	go.opentelemetry.io/otel v1.35.0 // indirect
+	go.opentelemetry.io/otel/trace v1.35.0 // indirect
+	go.yaml.in/yaml/v2 v2.4.2 // 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
-	sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
-	sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
-	sigs.k8s.io/yaml v1.4.0 // indirect
+	k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 // indirect
+	sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
+	sigs.k8s.io/randfill v1.0.0 // indirect
+	sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
+	sigs.k8s.io/yaml v1.5.0 // indirect
 )
--- a/go.sum
+++ b/go.sum
@ -4,56 +4,58 @@ 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/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.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.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
@ -62,10 +64,14 @@ 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.33.0 h1:/FerN9bax5LoK51X/sI0SVYrjSE0/yUL7DpxW4K3FWw=
-go.opentelemetry.io/otel v1.33.0/go.mod h1:SUUkR6csvUQl+yjReHu5uM3EtVV7MBm5FHKRlNx4I8I=
-go.opentelemetry.io/otel/trace v1.33.0 h1:cCJuF7LRjUFso9LPnEAHJDB2pqzp+hbO8eu1qqW2d/s=
-go.opentelemetry.io/otel/trace v1.33.0/go.mod h1:uIcdVUZMpTAmz0tI1z04GoVSezK37CbGV4fr1f2nBck=
+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=
+go.yaml.in/yaml/v2 v2.4.2 h1:DzmwEr2rDGHl7lsFgAHxmNz/1NlQ7xLIrlN2h5d1eGI=
+go.yaml.in/yaml/v2 v2.4.2/go.mod h1:081UH+NErpNdqlCXm3TtEran0rJZGxAYx9hb/ELlsPU=
+go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc=
+go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
 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=
@ -75,20 +81,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.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
-golang.org/x/sys v0.30.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.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM=
-golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=
+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=
@ -97,8 +103,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.2 h1:8Ar7bF+apOIoThw1EdZl0p1oWvMqTHmpA2fRTyZO8io=
-google.golang.org/protobuf v1.35.2/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=
@ -106,17 +112,19 @@ 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.33.0-alpha.3 h1:ugia3DzNbmhUP4mMUBhelThVifqQvB6YqrXz9Ncoans=
-k8s.io/apimachinery v0.33.0-alpha.3/go.mod h1:0rVRgdlgja0MQ+SYCognm5pRNteQOvhHAsDpKOs48GU=
-k8s.io/component-base v0.33.0-alpha.3 h1:YzkYedh3wsR8u6dg0hTPaH4QbSZF6Akui59w6J/+ctY=
-k8s.io/component-base v0.33.0-alpha.3/go.mod h1:pcrpQbkIQ1XdRl+9kIy3ps2JlrGBlQwhXOhHu1SiR3w=
+k8s.io/apimachinery v0.0.0-20250717170243-9b71f293aa0c h1:NoUgdWNyboxIpLhCjKQrm/sGuLKjEYyNf+K4eioV6s8=
+k8s.io/apimachinery v0.0.0-20250717170243-9b71f293aa0c/go.mod h1:v1p1Jsze3IHLy5gU17yVqR2qLO7jgYeX6mw3HZy2AEU=
+k8s.io/component-base v0.0.0-20250717172125-4e07767df717 h1:07oqkM0FzuGUw/bJw2rJubzccG7ShpGcTJ7SBDGp5Fc=
+k8s.io/component-base v0.0.0-20250717172125-4e07767df717/go.mod h1:/ehREU84M2OxVgU8WfxuUIi4/c5XsT6rIsEGQfhgxEQ=
 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=
-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/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=
-sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=
+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-20241014173422-cfa47c3a1cc8 h1:gBQPwqORJ8d8/YNZWEjoZs7npUVDpVXUUOFfW6CgAqE=
+sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8/go.mod h1:mdzfpAEoE6DHQEN0uh9ZbOCuHbLK5wOm7dK4ctXE9Tg=
+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/v6 v6.3.0 h1:jTijUJbW353oVOd9oTlifJqOGEkUw2jB/fXCbTiQEco=
+sigs.k8s.io/structured-merge-diff/v6 v6.3.0/go.mod h1:M3W8sfWvn2HhQDIbGWj3S099YozAsymCo/wrT5ohRUE=
+sigs.k8s.io/yaml v1.5.0 h1:M10b2U7aEUY6hRtU870n2VTPgR5RZiL/I6Lcc2F4NUQ=
+sigs.k8s.io/yaml v1.5.0/go.mod h1:wZs27Rbxoai4C0f8/9urLZtZtF3avA3gKvGyPdDqTO4=
Author	SHA1	Message	Date
Kubernetes Publisher	7023b27586	Merge pull request #133020 from pohly/apimachinery-list-map-keys support optional listMapKeys in server-side apply Kubernetes-commit: d33af7f7efc7ff5d8813a85290189883167a5226	2025-07-17 17:48:26 +00:00
Jordan Liggitt	f87992bc54	sigs.k8s.io/structured-merge-diff/v6 v6.3.0 Kubernetes-commit: 4d34975a46658efd90274c5fe05d46732e04ca67	2025-07-16 16:57:41 -04:00
Kubernetes Publisher	0e7c032603	Merge pull request #132871 from dims/bump-k8s.io/kube-openapi-to-latest-SHA-f3f2b991d03b Bump k8s.io/kube-openapi to latest SHA (f3f2b991d03b) and sigs.k8s.io/structured-merge-diff/{v4 => v6} Kubernetes-commit: 48e04d0d6c43cfc4729857775252b89b68d65b87	2025-07-15 09:50:11 +00:00
Davanum Srinivas	d34269877a	Bump k8s.io/kube-openapi to latest SHA (f3f2b991d03b) Signed-off-by: Davanum Srinivas <davanum@gmail.com> Kubernetes-commit: ebc1ccc491c944fa0633f147698e0dc02675051d	2025-07-10 09:21:52 -04:00
Kubernetes Publisher	ed72552308	Merge pull request #132675 from dims/bump-sigs-k8s-io-json-no-code-changes Bump sigs.k8s.io/json to latest - no code changes Kubernetes-commit: e47ac3eb6faa97874658dc281c72b5623f994801	2025-07-03 01:49:30 +00:00
Kubernetes Publisher	e061c7e260	Merge pull request #132677 from dims/update-github.com/emicklei/go-restful/v3-to-v3.12.2 Update github.com/emicklei/go-restful/v3 to v3.12.2 Kubernetes-commit: 305c0e06c99ff9df013edd804294217a04e4dd31	2025-07-02 21:45:49 +00:00
Kubernetes Publisher	fc619d4775	Merge pull request #132676 from dims/bump-go.yaml.in/yaml/v3-to-v3.0.4 Bump go.yaml.in/yaml/v3 to v3.0.4 Kubernetes-commit: 01c03ae9cf7b1371c8bc2bdf12d9244e63e83750	2025-07-02 17:50:45 +00:00
Davanum Srinivas	20e3a35d6e	Update github.com/emicklei/go-restful/v3 to v3.12.2 Signed-off-by: Davanum Srinivas <davanum@gmail.com> Kubernetes-commit: b44b0fbf1299c6821033076352b91914d2efef67	2025-07-02 08:00:43 -04:00
Davanum Srinivas	3119960a4b	Bump go.yaml.in/yaml/v3 to v3.0.4 Signed-off-by: Davanum Srinivas <davanum@gmail.com> Kubernetes-commit: 58e620cc4403d30f9fb6aab245cfb47db17957de	2025-07-02 07:37:06 -04:00
Davanum Srinivas	51db10a791	Bump sigs.k8s.io/json to latest - no code changes Signed-off-by: Davanum Srinivas <davanum@gmail.com> Kubernetes-commit: 00f8cbae6b8fd3799a1a044abcefdbb572d35b27	2025-07-02 07:32:24 -04:00
Kubernetes Publisher	ae3f959149	Merge pull request #132654 from Jefftree/b-openapi Bump kube-openapi Kubernetes-commit: db49c25956df36c777213251c4a47d6d9ee1c5ea	2025-07-01 21:50:25 +00:00
Jefftree	a6822d5380	Update vendor Kubernetes-commit: d04ee27c98ba91680ac6c6a8ade9e33d7ee44569	2025-07-01 15:23:58 +00:00
Jefftree	0c052db86d	pin kube-openapi to v0.0.0-20250628140032-d90c4fd18f59 Kubernetes-commit: b41d375b8881f25ff5fe7775b4dedaba1eaa3f02	2025-07-01 15:21:22 +00:00
Kubernetes Publisher	b0836d87a5	Merge pull request #132357 from dims/drop-usage-of-forked-copies-of-goyaml.v2-and-goyaml.v3 Drop usage of forked copies of goyaml.v2 and goyaml.v3 Kubernetes-commit: c1afec6a0b15ca1ed853c1321ac2c972488bf5b8	2025-06-25 18:10:02 +00:00
Kubernetes Publisher	0a22810a6d	Merge pull request #132504 from jpbetz/name-formats Introduce OpenAPI format support for k8s-short-name and k8s-long-name Kubernetes-commit: 1d932bd6cc951b9182d07d701946aebaf667df94	2025-06-25 18:10:01 +00:00
Davanum Srinivas	521df30d7e	switch to latest sigs.k8s.io/yaml v1.5.0 (run update-gofmt.sh as well) Signed-off-by: Davanum Srinivas <davanum@gmail.com> Kubernetes-commit: c5b4b133ce3252ee19b7167eb69a99d88fdefda8	2025-06-25 08:03:06 -04:00
Joe Betz	f9320b3d30	Bump to latest kube-openapi Kubernetes-commit: dc323756cea2d1ebe32d7acb5a14a1769c14486f	2025-06-24 09:24:27 -04:00
Davanum Srinivas	cdca2f93bb	Drop usage of forked copies of goyaml.v2 and goyaml.v3 Signed-off-by: Davanum Srinivas <davanum@gmail.com> Kubernetes-commit: 3827d3bc4f1c17ac816b37422dbd449c276e9ff0	2025-06-17 11:00:27 -04:00
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