Merge pull request #110042 from Jefftree/automated-cherry-pick-of-#10…

…9880-upstream-release-1.24

Automated cherry pick of #109880: Remove warning log for merging meta and scale type

Kubernetes-commit: ad8ac3ac2db1ab6cb3788f4c30d933fa917f1154

go.mod

@@ -22,10 +22,10 @@ require (
 	google.golang.org/grpc v1.40.0
 	google.golang.org/protobuf v1.27.1
 	gopkg.in/yaml.v2 v2.4.0
-	k8s.io/api v0.0.0-20220402025220-2de699698342
-	k8s.io/apimachinery v0.0.0-20220330050810-6550efdb7444
-	k8s.io/apiserver v0.0.0-20220401011938-1561dcc9b61c
-	k8s.io/client-go v0.0.0-20220331171325-8a672f0fd284
+	k8s.io/api v0.0.0-20220420164651-0bf1867dde52
+	k8s.io/apimachinery v0.0.0-20220331225401-97e5df2d0258
+	k8s.io/apiserver v0.0.0-20220420171732-d851f08ee673
+	k8s.io/client-go v0.0.0-20220420165542-686b396dc068
 	k8s.io/code-generator v0.0.0-20220420163550-65c70a51ae8e
 	k8s.io/component-base v0.0.0-20220420170358-f73277b34692
 	k8s.io/klog/v2 v2.60.1
@@ -37,10 +37,10 @@ require (
 )
 
 replace (
-	k8s.io/api => k8s.io/api v0.0.0-20220402025220-2de699698342
-	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20220330050810-6550efdb7444
-	k8s.io/apiserver => k8s.io/apiserver v0.0.0-20220401011938-1561dcc9b61c
-	k8s.io/client-go => k8s.io/client-go v0.0.0-20220331171325-8a672f0fd284
+	k8s.io/api => k8s.io/api v0.0.0-20220420164651-0bf1867dde52
+	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20220331225401-97e5df2d0258
+	k8s.io/apiserver => k8s.io/apiserver v0.0.0-20220420171732-d851f08ee673
+	k8s.io/client-go => k8s.io/client-go v0.0.0-20220420165542-686b396dc068
 	k8s.io/code-generator => k8s.io/code-generator v0.0.0-20220420163550-65c70a51ae8e
 	k8s.io/component-base => k8s.io/component-base v0.0.0-20220420170358-f73277b34692
 )

go.sum

@@ -966,14 +966,14 @@ 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-20220402025220-2de699698342 h1:xFpsdy7RmF2niTyB76yUyPubqMa5m9/L9sswkdyhONo=
-k8s.io/api v0.0.0-20220402025220-2de699698342/go.mod h1:69QWTzqWVlGn0rU+x3dmk3WAsUQHmeQwIBWMbK1ZEyE=
-k8s.io/apimachinery v0.0.0-20220330050810-6550efdb7444 h1:whQmS3GtF822OUer+LPJnMFKn6kPfuJOCM/3xUuATIY=
-k8s.io/apimachinery v0.0.0-20220330050810-6550efdb7444/go.mod h1:82Bi4sCzVBdpYjyI4jY6aHX+YCUchUIrZrXKedjd2UM=
-k8s.io/apiserver v0.0.0-20220401011938-1561dcc9b61c h1:CMx6RBu8ZN9ueY8YJvc0m63Ml3dkB38D9pk/oGdRwLo=
-k8s.io/apiserver v0.0.0-20220401011938-1561dcc9b61c/go.mod h1:2OpoOwTYxn7KR4xHjd5iCHYyk0TmBvkph9njZHHHLPU=
-k8s.io/client-go v0.0.0-20220331171325-8a672f0fd284 h1:1l3RyTAyI3yERueHVLMy8T+cCO+En4Dqn+K4Yr+KwZU=
-k8s.io/client-go v0.0.0-20220331171325-8a672f0fd284/go.mod h1:ewG6GJpur1bhlVrw9LJD3Bacj/woXhx4XVWTOUw6jkA=
+k8s.io/api v0.0.0-20220420164651-0bf1867dde52 h1:HPNRLBMB+2PbcBn8pXc7Hyb4iN8P1FwDNTHDpLYVdf4=
+k8s.io/api v0.0.0-20220420164651-0bf1867dde52/go.mod h1:qOGElvkvG4iusrwS28JSJgPofbMSCv5PWe0AD3boQGQ=
+k8s.io/apimachinery v0.0.0-20220331225401-97e5df2d0258 h1:9TgQL4ndOPmFSnQoTVN/ur/sU3RXMxaSmhMUBbflUTU=
+k8s.io/apimachinery v0.0.0-20220331225401-97e5df2d0258/go.mod h1:82Bi4sCzVBdpYjyI4jY6aHX+YCUchUIrZrXKedjd2UM=
+k8s.io/apiserver v0.0.0-20220420171732-d851f08ee673 h1:1Ike2womkIxqD5mJJ0BV2DBAn0bQsdq/WW+PGHVqaoc=
+k8s.io/apiserver v0.0.0-20220420171732-d851f08ee673/go.mod h1:QTo6pPFcEdzgL6cXs2a4fsiZDQZIfI1SLurwzuB+gNU=
+k8s.io/client-go v0.0.0-20220420165542-686b396dc068 h1:jb0Jn+VtsEq7o2EkfcLh/KiW4276TO2Y5xgLo3riKvQ=
+k8s.io/client-go v0.0.0-20220420165542-686b396dc068/go.mod h1:J+jC4WE19J7G2gTyKYvlGroIAdDgUb/Gsr3wyf2SOCQ=
 k8s.io/code-generator v0.0.0-20220420163550-65c70a51ae8e h1:Uxo3jBZDr26fElKs+KyNZsKPNVYT40frGNT5CVjc3kw=
 k8s.io/code-generator v0.0.0-20220420163550-65c70a51ae8e/go.mod h1:dpVhs00hTuTdTY6jvVxvTFCk6gSMrtfRydbhZwHI15w=
 k8s.io/component-base v0.0.0-20220420170358-f73277b34692 h1:IGDEJ1v+AIDwbFoMYBVx6ffYYVvvY04HVKBIJgQWjkM=