Merge pull request #114861 from jpbetz/release-1.26

Cherry pick 114857 to release-1.26

Kubernetes-commit: e2093f873689c8ff3bd90042dd533cb6a1e0cd1c

go.mod

@@ -14,8 +14,8 @@ require (
 	github.com/stretchr/testify v1.8.0
 	golang.org/x/net v0.3.1-0.20221206200815-1e63c2f08a10
 	k8s.io/api v0.0.0-20221227185931-07a9cbc7b3b1
-	k8s.io/apimachinery v0.0.0-20221208055745-5d4cdd22b0f7
-	k8s.io/apiserver v0.0.0-20230110182433-7b39ac140522
+	k8s.io/apimachinery v0.0.0-20230111232008-373a5f752d44
+	k8s.io/apiserver v0.0.0-20230112074716-81b63bfb3256
 	k8s.io/client-go v0.0.0-20221227214233-0c34939c9bcb
 	k8s.io/code-generator v0.0.0-20221208054844-6063700ba34d
 	k8s.io/component-base v0.0.0-20230110174730-0b623d3c56e9
@@ -44,7 +44,7 @@ require (
 	github.com/go-openapi/swag v0.19.14 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/protobuf v1.5.2 // indirect
-	github.com/google/cel-go v0.12.5 // indirect
+	github.com/google/cel-go v0.12.6 // indirect
 	github.com/google/gnostic v0.5.7-v3refs // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/google/uuid v1.1.2 // indirect
@@ -109,8 +109,8 @@ require (
 
 replace (
 	k8s.io/api => k8s.io/api v0.0.0-20221227185931-07a9cbc7b3b1
-	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20221208055745-5d4cdd22b0f7
-	k8s.io/apiserver => k8s.io/apiserver v0.0.0-20230110182433-7b39ac140522
+	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20230111232008-373a5f752d44
+	k8s.io/apiserver => k8s.io/apiserver v0.0.0-20230112074716-81b63bfb3256
 	k8s.io/client-go => k8s.io/client-go v0.0.0-20221227214233-0c34939c9bcb
 	k8s.io/code-generator => k8s.io/code-generator v0.0.0-20221208054844-6063700ba34d
 	k8s.io/component-base => k8s.io/component-base v0.0.0-20230110174730-0b623d3c56e9

go.sum

@@ -170,8 +170,8 @@ github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiu
 github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/btree v1.0.1 h1:gK4Kx5IaGY9CD5sPJ36FHiBJ6ZXl0kilRiiCj+jdYp4=
-github.com/google/cel-go v0.12.5 h1:DmzaiSgoaqGCjtpPQWl26/gND+yRpim56H1jCVev6d8=
-github.com/google/cel-go v0.12.5/go.mod h1:Jk7ljRzLBhkmiAwBoUxB1sZSCVBAzkqPF25olK/iRDw=
+github.com/google/cel-go v0.12.6 h1:kjeKudqV0OygrAqA9fX6J55S8gj+Jre2tckIm5RoG4M=
+github.com/google/cel-go v0.12.6/go.mod h1:Jk7ljRzLBhkmiAwBoUxB1sZSCVBAzkqPF25olK/iRDw=
 github.com/google/gnostic v0.5.7-v3refs h1:FhTMOKj2VhjpouxvWJAV1TL304uMlb9zcDqkl6cEI54=
 github.com/google/gnostic v0.5.7-v3refs/go.mod h1:73MKFl6jIHelAJNaBGFzt3SPtZULs9dYrGFt8OiIsHQ=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
@@ -724,10 +724,10 @@ honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9
 honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
 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/apiserver v0.0.0-20230110182433-7b39ac140522 h1:waJQ+wQ0aSpOjDIdG2vEJe8iSU9DKYE32Ibt5HivVj8=
-k8s.io/apiserver v0.0.0-20230110182433-7b39ac140522/go.mod h1:i6PkbEQvhPQNuOAW5N9ZV5FEkQzhSfRSzUbTGOaECP8=
+k8s.io/apimachinery v0.0.0-20230111232008-373a5f752d44 h1:w9HNLfeng207Q9+Nmw2iGWlp6vfNVc5E4sjfHRxV4sY=
+k8s.io/apimachinery v0.0.0-20230111232008-373a5f752d44/go.mod h1:tnPmbONNJ7ByJNz9+n9kMjNP8ON+1qoAIIC70lztu74=
+k8s.io/apiserver v0.0.0-20230112074716-81b63bfb3256 h1:AU6KsjyjdOpHigEa0/1nMi8hyHoscaP5THaH0pZ2Dmw=
+k8s.io/apiserver v0.0.0-20230112074716-81b63bfb3256/go.mod h1:vYq1MZhcnRU5BZv7vSLnXvlWf+rZWYEBrgT+ujAM4g8=
 k8s.io/client-go v0.0.0-20221227214233-0c34939c9bcb h1:4GM41f+eXZ0ccGX5wMjQ9WfPQzVvBUbJ4DZrkBWQXpg=
 k8s.io/client-go v0.0.0-20221227214233-0c34939c9bcb/go.mod h1:vWaQHXAqLmjyGsp6Ltc1esfPRYDev/ZLPiGkqPFqWzs=
 k8s.io/code-generator v0.0.0-20221208054844-6063700ba34d h1:N3ad8NSOang9kMhOCQxvoGqMPEoUP6QNJCYCfqBfHY8=