Merge pull request #106914 from Jefftree/patch-1

Remove bazel condition check in openapi_test

Kubernetes-commit: f6243782d0e0ab69e717ac6122991934e60d398e

go.mod

@@ -45,7 +45,7 @@ require (
 	gopkg.in/square/go-jose.v2 v2.2.2
 	k8s.io/api v0.0.0-20211213234601-b7112c1b6e9e
 	k8s.io/apimachinery v0.0.0-20211213171520-e65876e14280
-	k8s.io/client-go v0.0.0-20211213171958-056a9de35397
+	k8s.io/client-go v0.0.0-20211215012040-60960963915d
 	k8s.io/component-base v0.0.0-20211213172503-a583eb047fc3
 	k8s.io/klog/v2 v2.30.0
 	k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65
@@ -59,6 +59,6 @@ require (
 replace (
 	k8s.io/api => k8s.io/api v0.0.0-20211213234601-b7112c1b6e9e
 	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20211213171520-e65876e14280
-	k8s.io/client-go => k8s.io/client-go v0.0.0-20211213171958-056a9de35397
+	k8s.io/client-go => k8s.io/client-go v0.0.0-20211215012040-60960963915d
 	k8s.io/component-base => k8s.io/component-base v0.0.0-20211213172503-a583eb047fc3
 )

go.sum

@@ -957,8 +957,8 @@ k8s.io/api v0.0.0-20211213234601-b7112c1b6e9e h1:Fzjke98RMhnE6jv2L7ODA/aCizYxOAh
 k8s.io/api v0.0.0-20211213234601-b7112c1b6e9e/go.mod h1:vmCvbkzTfBQjlMNSgh69E+3vHHcFdYVCXF20g8xtEaE=
 k8s.io/apimachinery v0.0.0-20211213171520-e65876e14280 h1:1Vi6MSKuJbfiiUckP6GaHTGYZtqayWlyf/JItZRH8Rg=
 k8s.io/apimachinery v0.0.0-20211213171520-e65876e14280/go.mod h1:YpCy0BWvwSGZKMwmvPxCsfFJfl6vAwQdfVnPOJoUT2E=
-k8s.io/client-go v0.0.0-20211213171958-056a9de35397 h1:r8OCAcStmrtTkTbJ94aO1/ei8igULFXLxVIOqjkP2ro=
-k8s.io/client-go v0.0.0-20211213171958-056a9de35397/go.mod h1:EVC+GVlZGw9DXTNTB4NNrkWW1RooGd68qdccMwD/H68=
+k8s.io/client-go v0.0.0-20211215012040-60960963915d h1:xaczlTTuUHi6jP032ryrZ5hjS+uQ2q+uFQVogX+eMnc=
+k8s.io/client-go v0.0.0-20211215012040-60960963915d/go.mod h1:6JidqMT3OpyKJ/o3fzEO1e6sd+cBB9KwGICMRWnaKr0=
 k8s.io/component-base v0.0.0-20211213172503-a583eb047fc3 h1:K3ZTf3OYaOLrr/RE7ZgWtbrczS12HFfGKRu/ZwhPHLU=
 k8s.io/component-base v0.0.0-20211213172503-a583eb047fc3/go.mod h1:quIoI70UO6Tq1RMH7eIHKN9sK0Y9hgz9NiDJTPY1wH4=
 k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=

pkg/endpoints/openapi/openapi_test.go

@@ -18,7 +18,6 @@ package openapi
 
 import (
 	"reflect"
-	"strings"
 	"testing"
 
 	"k8s.io/apimachinery/pkg/runtime"
@@ -45,12 +44,6 @@ func TestGetDefinitionName(t *testing.T) {
 	// "k8s.io/kubernetes/vendor" prefix.
 	typePkgName := "k8s.io/apiserver/pkg/endpoints/openapi/testing.TestType"
 	typeFriendlyName := "io.k8s.apiserver.pkg.endpoints.openapi.testing.TestType"
-	if strings.HasSuffix(reflect.TypeOf(testType).PkgPath(), "go_default_test") {
-		// the test is running inside bazel where the package name is changed and
-		// "go_default_test" will add to package path.
-		typePkgName = "k8s.io/apiserver/pkg/endpoints/openapi/testing/go_default_test.TestType"
-		typeFriendlyName = "io.k8s.apiserver.pkg.endpoints.openapi.testing.go_default_test.TestType"
-	}
 	s := runtime.NewScheme()
 	s.AddKnownTypeWithName(testType.GroupVersionKind(), &testType)
 	namer := NewDefinitionNamer(s)