Merge pull request #114617 from JoelSpeed/automated-cherry-pick-of-#114585-upstream-release-1.26

Automated cherry pick of #114585: Resource claims should be a map type

Kubernetes-commit: c090810c4c96e0c5acc05ab2094a5d46669cae86

Author: k8s-publishing-bot

go.mod

@@ -24,7 +24,7 @@ require (
 	golang.org/x/term v0.3.0
 	golang.org/x/time v0.0.0-20220210224613-90d013bbcef8
 	google.golang.org/protobuf v1.28.1
-	k8s.io/api v0.0.0-20221208060720-07ac8fe9ce91
+	k8s.io/api v0.0.0-20221227185931-07a9cbc7b3b1
 	k8s.io/apimachinery v0.0.0-20221208055745-5d4cdd22b0f7
 	k8s.io/klog/v2 v2.80.1
 	k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280
@@ -59,6 +59,6 @@ require (
 )
 
 replace (
-	k8s.io/api => k8s.io/api v0.0.0-20221208060720-07ac8fe9ce91
+	k8s.io/api => k8s.io/api v0.0.0-20221227185931-07a9cbc7b3b1
 	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20221208055745-5d4cdd22b0f7
 )

go.sum

@@ -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-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=
-k8s.io/api v0.0.0-20221208060720-07ac8fe9ce91 h1:xVuXb+iGNa+jCsqfhp0u1N4L+9vf7fF1gZJ6WZRnJU8=
-k8s.io/api v0.0.0-20221208060720-07ac8fe9ce91/go.mod h1:GetGjgKCUeHLs1GMrltnUDUYPvhhro0e4BozgWsM0Jk=
+k8s.io/api v0.0.0-20221227185931-07a9cbc7b3b1 h1:YJxja/EAJoBLVlXPjUEyaO32DsjAcqjY7DEVfZtEq78=
+k8s.io/api v0.0.0-20221227185931-07a9cbc7b3b1/go.mod h1:GetGjgKCUeHLs1GMrltnUDUYPvhhro0e4BozgWsM0Jk=
 k8s.io/apimachinery v0.0.0-20221208055745-5d4cdd22b0f7 h1:6WftyyXbOkaz1aO+YA8Z5774ZvYeQOUk1JUkvPaOTvE=
 k8s.io/apimachinery v0.0.0-20221208055745-5d4cdd22b0f7/go.mod h1:tnPmbONNJ7ByJNz9+n9kMjNP8ON+1qoAIIC70lztu74=
 k8s.io/klog/v2 v2.80.1 h1:atnLQ121W371wYYFawwYx1aEY2eUfs4l3J72wtgAwV4=