Merge pull request #117637 from seans3/automated-cherry-pick-of-#117571-origin-release-1.27

Automated cherry pick of #117571: Refactors discovery content-type and helper functions

Kubernetes-commit: c766f936b7ada04e76c38671c30ceec6df1b5239

Author: k8s-publishing-bot

go.mod

@@ -24,7 +24,7 @@ require (
 	golang.org/x/term v0.6.0
 	golang.org/x/time v0.0.0-20220210224613-90d013bbcef8
 	google.golang.org/protobuf v1.28.1
-	k8s.io/api v0.0.0-20230327181953-5b93db5944f3
+	k8s.io/api v0.0.0-20230424183503-a94d26e5d6b7
 	k8s.io/apimachinery v0.0.0-20230315054728-8d1258da8f38
 	k8s.io/klog/v2 v2.90.1
 	k8s.io/kube-openapi v0.0.0-20230308215209-15aac26d736a
@@ -59,6 +59,6 @@ require (
 )
 
 replace (
-	k8s.io/api => k8s.io/api v0.0.0-20230327181953-5b93db5944f3
+	k8s.io/api => k8s.io/api v0.0.0-20230424183503-a94d26e5d6b7
 	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20230315054728-8d1258da8f38
 )

go.sum

@@ -477,8 +477,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-20230327181953-5b93db5944f3 h1:XvTPeYtRRACrKZGRDkpHMRXq/xT9/cWZPv+Sx7t4HHU=
-k8s.io/api v0.0.0-20230327181953-5b93db5944f3/go.mod h1:RAYThv5ELmDNk2Kt+PWiwWtAI1TZyap1JK1QStRzwyw=
+k8s.io/api v0.0.0-20230424183503-a94d26e5d6b7 h1:QrPMgZCXYbzEq6h5azDuaqNoWs7rI3pKvW8pX/CBPqo=
+k8s.io/api v0.0.0-20230424183503-a94d26e5d6b7/go.mod h1:RAYThv5ELmDNk2Kt+PWiwWtAI1TZyap1JK1QStRzwyw=
 k8s.io/apimachinery v0.0.0-20230315054728-8d1258da8f38 h1:n1qDRCTPAXwyXYg7eSpWDO9FdW79lwAQ9dAr1vETpn4=
 k8s.io/apimachinery v0.0.0-20230315054728-8d1258da8f38/go.mod h1:5ikh59fK3AJ287GUvpUsryoMFtH9zj/ARfWCo3AyXTM=
 k8s.io/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw=