Merge pull request #114861 from jpbetz/release-1.26

Cherry pick 114857 to release-1.26

Kubernetes-commit: e2093f873689c8ff3bd90042dd533cb6a1e0cd1c

go.mod

@@ -10,12 +10,12 @@ require (
 	github.com/spf13/pflag v1.0.5
 	github.com/stretchr/testify v1.8.0
 	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/component-base v0.0.0-20230110174730-0b623d3c56e9
 	k8s.io/component-helpers v0.0.0-20221208063657-74b6a8e45dc6
-	k8s.io/controller-manager v0.0.0-20230110195840-d3cb0134553a
+	k8s.io/controller-manager v0.0.0-20230112085746-59c10b46e640
 	k8s.io/klog/v2 v2.80.1
 	k8s.io/utils v0.0.0-20221107191617-1a15be271d1d
 )
@@ -43,7 +43,7 @@ require (
 	github.com/gogo/protobuf v1.3.2 // 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/gofuzz v1.1.0 // indirect
 	github.com/google/uuid v1.1.2 // indirect
@@ -108,11 +108,11 @@ 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/component-base => k8s.io/component-base v0.0.0-20230110174730-0b623d3c56e9
 	k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20221208063657-74b6a8e45dc6
-	k8s.io/controller-manager => k8s.io/controller-manager v0.0.0-20230110195840-d3cb0134553a
+	k8s.io/controller-manager => k8s.io/controller-manager v0.0.0-20230112085746-59c10b46e640
 	k8s.io/kms => k8s.io/kms v0.0.0-20221208063806-3bf04e13ad9a
 )

go.sum

@@ -173,8 +173,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=
@@ -727,18 +727,18 @@ 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/component-base v0.0.0-20230110174730-0b623d3c56e9 h1:u7WBaykxKJyiCci5iITB6fVIuT5azqn5B+Q+3blJLzU=
 k8s.io/component-base v0.0.0-20230110174730-0b623d3c56e9/go.mod h1:jhlK1mHFbNnBgJb0MOpyr2wwwcZ6oP1gr8fiZXgTzDo=
 k8s.io/component-helpers v0.0.0-20221208063657-74b6a8e45dc6 h1:2WxfkDzhGeoLGVJLNYLW5q9+f1dbNGtLIz8ggw/TZWc=
 k8s.io/component-helpers v0.0.0-20221208063657-74b6a8e45dc6/go.mod h1:BAcgYe3l0fJ7SOdacs5MkAHEbqZsISUSv0Xucpuo3I8=
-k8s.io/controller-manager v0.0.0-20230110195840-d3cb0134553a h1:i0dqUCs3DpCls93qKDU2buqdXTRDmKa26pC3nmXzOt4=
-k8s.io/controller-manager v0.0.0-20230110195840-d3cb0134553a/go.mod h1:7ZIkgwd/LXzfcEclR3cSBe319Bu+w+sWDtGRQMJaURQ=
+k8s.io/controller-manager v0.0.0-20230112085746-59c10b46e640 h1:PjXhip5ZxC1X5o8sr2fea5A/x0AuJlyerztQcLmvQM4=
+k8s.io/controller-manager v0.0.0-20230112085746-59c10b46e640/go.mod h1:+nwVzNCgWdiKWHxRofFfeMZzNd0NqWsEmG1ExspJs+8=
 k8s.io/klog/v2 v2.80.1 h1:atnLQ121W371wYYFawwYx1aEY2eUfs4l3J72wtgAwV4=
 k8s.io/klog/v2 v2.80.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
 k8s.io/kms v0.0.0-20221208063806-3bf04e13ad9a h1:41OBvSWw9lfYgFdEHWjEINfXFf8/vAVZER7ZFMhePwA=