Merge pull request #114585 from JoelSpeed/fix-resource-requirements-claims

Resource Claims must be a map type, not set

Kubernetes-commit: 5882479457ac2554f70fc4678aa86eca8c49ae8b
This commit is contained in:
Kubernetes Publisher 2022-12-20 12:11:24 -08:00
commit 32f9a1505d
3 changed files with 6 additions and 4 deletions

View File

@ -6553,6 +6553,8 @@ var schemaYAML = typed.YAMLObject(`types:
elementType: elementType:
namedType: io.k8s.api.core.v1.ResourceClaim namedType: io.k8s.api.core.v1.ResourceClaim
elementRelationship: associative elementRelationship: associative
keys:
- name
- name: limits - name: limits
type: type:
map: map:

4
go.mod
View File

@ -24,7 +24,7 @@ require (
golang.org/x/term v0.3.0 golang.org/x/term v0.3.0
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 golang.org/x/time v0.0.0-20220210224613-90d013bbcef8
google.golang.org/protobuf v1.28.1 google.golang.org/protobuf v1.28.1
k8s.io/api v0.0.0-20221219201544-dadaafeebc9c k8s.io/api v0.0.0-20221223022317-de493661f8d0
k8s.io/apimachinery v0.0.0-20221218214745-cc480d329650 k8s.io/apimachinery v0.0.0-20221218214745-cc480d329650
k8s.io/klog/v2 v2.80.1 k8s.io/klog/v2 v2.80.1
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280
@ -59,6 +59,6 @@ require (
) )
replace ( replace (
k8s.io/api => k8s.io/api v0.0.0-20221219201544-dadaafeebc9c k8s.io/api => k8s.io/api v0.0.0-20221223022317-de493661f8d0
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20221218214745-cc480d329650 k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20221218214745-cc480d329650
) )

4
go.sum
View File

@ -476,8 +476,8 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
k8s.io/api v0.0.0-20221219201544-dadaafeebc9c h1:nLDoJEkmuSiiLkZq905pjb4g7+4/vVhYR4xpAvf2vDc= k8s.io/api v0.0.0-20221223022317-de493661f8d0 h1:tVL2S069prY0Y5d+pg9kdiRfR+3tsfvsshglAAOwWUE=
k8s.io/api v0.0.0-20221219201544-dadaafeebc9c/go.mod h1:duiNr/01XR5q9e9KOuBRyaJ4Fo4tatH5EcaDCWcLhRI= k8s.io/api v0.0.0-20221223022317-de493661f8d0/go.mod h1:duiNr/01XR5q9e9KOuBRyaJ4Fo4tatH5EcaDCWcLhRI=
k8s.io/apimachinery v0.0.0-20221218214745-cc480d329650 h1:j8J1YsXNcg2kTBShe5PCLQxE2DWldFTNyk/Xa71GXjs= k8s.io/apimachinery v0.0.0-20221218214745-cc480d329650 h1:j8J1YsXNcg2kTBShe5PCLQxE2DWldFTNyk/Xa71GXjs=
k8s.io/apimachinery v0.0.0-20221218214745-cc480d329650/go.mod h1:tnPmbONNJ7ByJNz9+n9kMjNP8ON+1qoAIIC70lztu74= k8s.io/apimachinery v0.0.0-20221218214745-cc480d329650/go.mod h1:tnPmbONNJ7ByJNz9+n9kMjNP8ON+1qoAIIC70lztu74=
k8s.io/klog/v2 v2.80.1 h1:atnLQ121W371wYYFawwYx1aEY2eUfs4l3J72wtgAwV4= k8s.io/klog/v2 v2.80.1 h1:atnLQ121W371wYYFawwYx1aEY2eUfs4l3J72wtgAwV4=