Skip to content

Commit 06c0a98

Browse files
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
1 parent 2d320bc commit 06c0a98

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

go.mod

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ require (
2424
google.golang.org/grpc v1.58.3
2525
google.golang.org/protobuf v1.31.0
2626
gopkg.in/yaml.v2 v2.4.0
27-
k8s.io/api v0.0.0-20231128184855-0099855f0340
27+
k8s.io/api v0.0.0-20231206041426-0d77c3467e29
2828
k8s.io/apimachinery v0.0.0-20231128183834-3c8c1f22dc33
29-
k8s.io/apiserver v0.0.0-20231113173239-59c9103d07ec
29+
k8s.io/apiserver v0.0.0-20231128194615-024724994aef
3030
k8s.io/client-go v0.0.0-20231128190455-288368e416e4
31-
k8s.io/code-generator v0.0.0-20231113170942-51ae00d9f6ec
31+
k8s.io/code-generator v0.0.0-20231120145104-599d00c53adf
3232
k8s.io/component-base v0.0.0-20231128191614-d0ec94f2e2e3
3333
k8s.io/klog/v2 v2.110.1
3434
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00
@@ -128,11 +128,11 @@ require (
128128
)
129129

130130
replace (
131-
k8s.io/api => k8s.io/api v0.0.0-20231128184855-0099855f0340
131+
k8s.io/api => k8s.io/api v0.0.0-20231206041426-0d77c3467e29
132132
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20231128183834-3c8c1f22dc33
133-
k8s.io/apiserver => k8s.io/apiserver v0.0.0-20231113173239-59c9103d07ec
133+
k8s.io/apiserver => k8s.io/apiserver v0.0.0-20231128194615-024724994aef
134134
k8s.io/client-go => k8s.io/client-go v0.0.0-20231128190455-288368e416e4
135-
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20231113170942-51ae00d9f6ec
135+
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20231120145104-599d00c53adf
136136
k8s.io/component-base => k8s.io/component-base v0.0.0-20231128191614-d0ec94f2e2e3
137137
k8s.io/kms => k8s.io/kms v0.0.0-20231128192440-fbfe7d145604
138138
)

go.sum

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -397,16 +397,16 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
397397
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
398398
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
399399
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
400-
k8s.io/api v0.0.0-20231128184855-0099855f0340 h1:k4Nf1p8ZaNJb7b/YyW2OiYaqlA40cV/ONVlRLYyuIcI=
401-
k8s.io/api v0.0.0-20231128184855-0099855f0340/go.mod h1:ok1gcRNjuV0Z+WBZfANtcTYPDUUB+ce3fkv3IkrBB1s=
400+
k8s.io/api v0.0.0-20231206041426-0d77c3467e29 h1:1nEAqGo/rDyevufKfknvNr6ZO23LB33zRP6Ms49uXOc=
401+
k8s.io/api v0.0.0-20231206041426-0d77c3467e29/go.mod h1:ok1gcRNjuV0Z+WBZfANtcTYPDUUB+ce3fkv3IkrBB1s=
402402
k8s.io/apimachinery v0.0.0-20231128183834-3c8c1f22dc33 h1:rBhSfzKWKi9WyN1t7+IULBAzyQ88DyfBBUu0KtlqbuI=
403403
k8s.io/apimachinery v0.0.0-20231128183834-3c8c1f22dc33/go.mod h1:eVBxQ/cwiJxH58eK/jd/vAk4mrxmVlnpBH5J2GbMeis=
404-
k8s.io/apiserver v0.0.0-20231113173239-59c9103d07ec h1:ivzYSUlBpuQnqV8kgwb6P56E3LJThj9mFQzry9pi/XM=
405-
k8s.io/apiserver v0.0.0-20231113173239-59c9103d07ec/go.mod h1:3cVDmD1hdCEjht6HP6X2Bd/oKnBwzC9/LgM4vf5bs7A=
404+
k8s.io/apiserver v0.0.0-20231128194615-024724994aef h1:PZhmmg8x3bM57e3zWw9/X9FftydAXK46zfrU9/w4JLs=
405+
k8s.io/apiserver v0.0.0-20231128194615-024724994aef/go.mod h1:Nw1r+ZHMUmWstbrzblIad+PHdJZS0NZZJpAPLkwVobE=
406406
k8s.io/client-go v0.0.0-20231128190455-288368e416e4 h1:qDme86ky602T4OJnW6v72HQmDBTNI5LkUWQV3BHTA0Y=
407407
k8s.io/client-go v0.0.0-20231128190455-288368e416e4/go.mod h1:L8DfYNpAzzKN5yGEgSZ7vPRteXm+k81UHSG1fRqYuIg=
408-
k8s.io/code-generator v0.0.0-20231113170942-51ae00d9f6ec h1:eVBv0pW7fOuxawHpFznBWr0oUOEfdR0F6lX2kX/3K8E=
409-
k8s.io/code-generator v0.0.0-20231113170942-51ae00d9f6ec/go.mod h1:5bqIZoCxs2zTRKMWNYqyQWW/bajc+ah4rh0tMY8zdGA=
408+
k8s.io/code-generator v0.0.0-20231120145104-599d00c53adf h1:iM3LrmneEXSKMBafkK64e8V9ShA2aaxngR52mZkuVoU=
409+
k8s.io/code-generator v0.0.0-20231120145104-599d00c53adf/go.mod h1:5bqIZoCxs2zTRKMWNYqyQWW/bajc+ah4rh0tMY8zdGA=
410410
k8s.io/component-base v0.0.0-20231128191614-d0ec94f2e2e3 h1:TpltKDADfLkWbNH4ZLgwHq6FVxcloOZ5muZgsiLZix0=
411411
k8s.io/component-base v0.0.0-20231128191614-d0ec94f2e2e3/go.mod h1:XNemr7zdgK7eiphHiMwbnQD5KvCrUohoF9ptqhrT4tQ=
412412
k8s.io/gengo v0.0.0-20230829151522-9cce18d56c01 h1:pWEwq4Asjm4vjW7vcsmijwBhOr1/shsbSYiWXmNGlks=

0 commit comments

Comments
 (0)