From 06c0a980e5309f5c23c971c2fa40c32b21843807 Mon Sep 17 00:00:00 2001 From: Kubernetes Publisher Date: Thu, 21 Dec 2023 10:56:05 +0100 Subject: [PATCH] Merge pull request #122343 from jpbetz/automated-cherry-pick-of-#122329-origin-release-1.29 Automated cherry pick of #122329: Wire in field dropping for CRDs Kubernetes-commit: 4e50a9122c3ee9d21bfe49b332947eb615485018 --- go.mod | 12 ++++++------ go.sum | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/go.mod b/go.mod index b5347b6ef..9c74ea604 100644 --- a/go.mod +++ b/go.mod @@ -24,11 +24,11 @@ require ( google.golang.org/grpc v1.58.3 google.golang.org/protobuf v1.31.0 gopkg.in/yaml.v2 v2.4.0 - k8s.io/api v0.0.0-20231128184855-0099855f0340 + k8s.io/api v0.0.0-20231206041426-0d77c3467e29 k8s.io/apimachinery v0.0.0-20231128183834-3c8c1f22dc33 - k8s.io/apiserver v0.0.0-20231113173239-59c9103d07ec + k8s.io/apiserver v0.0.0-20231128194615-024724994aef k8s.io/client-go v0.0.0-20231128190455-288368e416e4 - k8s.io/code-generator v0.0.0-20231113170942-51ae00d9f6ec + k8s.io/code-generator v0.0.0-20231120145104-599d00c53adf k8s.io/component-base v0.0.0-20231128191614-d0ec94f2e2e3 k8s.io/klog/v2 v2.110.1 k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 @@ -128,11 +128,11 @@ require ( ) replace ( - k8s.io/api => k8s.io/api v0.0.0-20231128184855-0099855f0340 + k8s.io/api => k8s.io/api v0.0.0-20231206041426-0d77c3467e29 k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20231128183834-3c8c1f22dc33 - k8s.io/apiserver => k8s.io/apiserver v0.0.0-20231113173239-59c9103d07ec + k8s.io/apiserver => k8s.io/apiserver v0.0.0-20231128194615-024724994aef k8s.io/client-go => k8s.io/client-go v0.0.0-20231128190455-288368e416e4 - k8s.io/code-generator => k8s.io/code-generator v0.0.0-20231113170942-51ae00d9f6ec + k8s.io/code-generator => k8s.io/code-generator v0.0.0-20231120145104-599d00c53adf k8s.io/component-base => k8s.io/component-base v0.0.0-20231128191614-d0ec94f2e2e3 k8s.io/kms => k8s.io/kms v0.0.0-20231128192440-fbfe7d145604 ) diff --git a/go.sum b/go.sum index 7774d8be7..1984d4404 100644 --- a/go.sum +++ b/go.sum @@ -397,16 +397,16 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -k8s.io/api v0.0.0-20231128184855-0099855f0340 h1:k4Nf1p8ZaNJb7b/YyW2OiYaqlA40cV/ONVlRLYyuIcI= -k8s.io/api v0.0.0-20231128184855-0099855f0340/go.mod h1:ok1gcRNjuV0Z+WBZfANtcTYPDUUB+ce3fkv3IkrBB1s= +k8s.io/api v0.0.0-20231206041426-0d77c3467e29 h1:1nEAqGo/rDyevufKfknvNr6ZO23LB33zRP6Ms49uXOc= +k8s.io/api v0.0.0-20231206041426-0d77c3467e29/go.mod h1:ok1gcRNjuV0Z+WBZfANtcTYPDUUB+ce3fkv3IkrBB1s= k8s.io/apimachinery v0.0.0-20231128183834-3c8c1f22dc33 h1:rBhSfzKWKi9WyN1t7+IULBAzyQ88DyfBBUu0KtlqbuI= k8s.io/apimachinery v0.0.0-20231128183834-3c8c1f22dc33/go.mod h1:eVBxQ/cwiJxH58eK/jd/vAk4mrxmVlnpBH5J2GbMeis= -k8s.io/apiserver v0.0.0-20231113173239-59c9103d07ec h1:ivzYSUlBpuQnqV8kgwb6P56E3LJThj9mFQzry9pi/XM= -k8s.io/apiserver v0.0.0-20231113173239-59c9103d07ec/go.mod h1:3cVDmD1hdCEjht6HP6X2Bd/oKnBwzC9/LgM4vf5bs7A= +k8s.io/apiserver v0.0.0-20231128194615-024724994aef h1:PZhmmg8x3bM57e3zWw9/X9FftydAXK46zfrU9/w4JLs= +k8s.io/apiserver v0.0.0-20231128194615-024724994aef/go.mod h1:Nw1r+ZHMUmWstbrzblIad+PHdJZS0NZZJpAPLkwVobE= k8s.io/client-go v0.0.0-20231128190455-288368e416e4 h1:qDme86ky602T4OJnW6v72HQmDBTNI5LkUWQV3BHTA0Y= k8s.io/client-go v0.0.0-20231128190455-288368e416e4/go.mod h1:L8DfYNpAzzKN5yGEgSZ7vPRteXm+k81UHSG1fRqYuIg= -k8s.io/code-generator v0.0.0-20231113170942-51ae00d9f6ec h1:eVBv0pW7fOuxawHpFznBWr0oUOEfdR0F6lX2kX/3K8E= -k8s.io/code-generator v0.0.0-20231113170942-51ae00d9f6ec/go.mod h1:5bqIZoCxs2zTRKMWNYqyQWW/bajc+ah4rh0tMY8zdGA= +k8s.io/code-generator v0.0.0-20231120145104-599d00c53adf h1:iM3LrmneEXSKMBafkK64e8V9ShA2aaxngR52mZkuVoU= +k8s.io/code-generator v0.0.0-20231120145104-599d00c53adf/go.mod h1:5bqIZoCxs2zTRKMWNYqyQWW/bajc+ah4rh0tMY8zdGA= k8s.io/component-base v0.0.0-20231128191614-d0ec94f2e2e3 h1:TpltKDADfLkWbNH4ZLgwHq6FVxcloOZ5muZgsiLZix0= k8s.io/component-base v0.0.0-20231128191614-d0ec94f2e2e3/go.mod h1:XNemr7zdgK7eiphHiMwbnQD5KvCrUohoF9ptqhrT4tQ= k8s.io/gengo v0.0.0-20230829151522-9cce18d56c01 h1:pWEwq4Asjm4vjW7vcsmijwBhOr1/shsbSYiWXmNGlks=