From 8b22cb46969cce6a17a131fda4ceec54001c30f0 Mon Sep 17 00:00:00 2001
From: Jordan Liggitt <liggitt@google.com>
Date: Fri, 19 Jan 2024 07:54:31 -0800
Subject: [PATCH] Revert "Make verify-typecheck.sh only check valid targets for
 a platform"

This reverts commit e48aa093402173f03e4e912f1450ee42ea97787e.
---
 hack/verify-typecheck.sh | 25 +++----------------------
 test/typecheck/main.go   |  6 +-----
 2 files changed, 4 insertions(+), 27 deletions(-)

diff --git a/hack/verify-typecheck.sh b/hack/verify-typecheck.sh
index 3c6edea33e2..590a9e75ebd 100755
--- a/hack/verify-typecheck.sh
+++ b/hack/verify-typecheck.sh
@@ -28,32 +28,13 @@ kube::golang::verify_go_version
 
 cd "${KUBE_ROOT}"
 
-ret=0
-TYPECHECK_SERIAL="${TYPECHECK_SERIAL:-false}"
-
-SERVER_PLATFORMS=$(echo "${KUBE_SUPPORTED_SERVER_PLATFORMS[@]}" | tr ' ' ',')
-CLIENT_PLATFORMS=$(echo "${KUBE_SUPPORTED_CLIENT_PLATFORMS[@]}" | tr ' ' ',')
-NODE_PLATFORMS=$(echo "${KUBE_SUPPORTED_NODE_PLATFORMS[@]}" | tr ' ' ',')
-TEST_PLATFORMS=$(echo "${KUBE_SUPPORTED_TEST_PLATFORMS[@]}" | tr ' ' ',')
-
 # As of June, 2020 the typecheck tool is written in terms of go/packages, but
 # that library doesn't work well with multiple modules.  Until that is done,
 # force this tooling to run in a fake GOPATH.
+ret=0
+TYPECHECK_SERIAL="${TYPECHECK_SERIAL:-false}"
 hack/run-in-gopath.sh \
-    go run test/typecheck/main.go "$@" --serial="${TYPECHECK_SERIAL}" --platform "${SERVER_PLATFORMS}" "${KUBE_SERVER_TARGETS[@]}" \
-    || ret=$?
-hack/run-in-gopath.sh \
-    go run test/typecheck/main.go "$@" --serial="${TYPECHECK_SERIAL}" --platform "${CLIENT_PLATFORMS}" "${KUBE_CLIENT_TARGETS[@]}" \
-    || ret=$?
-hack/run-in-gopath.sh \
-    go run test/typecheck/main.go "$@" --serial="${TYPECHECK_SERIAL}" --platform "${NODE_PLATFORMS}" "${KUBE_NODE_TARGETS[@]}" \
-    || ret=$?
-
-# $KUBE_TEST_TARGETS doesn't seem to work like the other TARGETS variables...
-hack/run-in-gopath.sh \
-    go run test/typecheck/main.go "$@" --serial="${TYPECHECK_SERIAL}" --platform "${TEST_PLATFORMS}" test/e2e \
-    || ret=$?
-
+    go run test/typecheck/main.go "$@" "--serial=$TYPECHECK_SERIAL" || ret=$?
 if [[ $ret -ne 0 ]]; then
   echo "!!! Type Check has failed. This may cause cross platform build failures." >&2
   echo "!!! Please see https://git.k8s.io/kubernetes/test/typecheck for more information." >&2
diff --git a/test/typecheck/main.go b/test/typecheck/main.go
index a2a91059557..eb213293cfd 100644
--- a/test/typecheck/main.go
+++ b/test/typecheck/main.go
@@ -294,11 +294,7 @@ func main() {
 			}()
 
 			f := false
-			if len(args) != 0 {
-				serialFprintf(os.Stdout, "type-checking %s against %s\n", plat, args)
-			} else {
-				serialFprintf(os.Stdout, "type-checking %s\n", plat)
-			}
+			serialFprintf(os.Stdout, "type-checking %s\n", plat)
 			errors, err := c.verify(plat)
 			if err != nil {
 				serialFprintf(os.Stderr, "ERROR(%s): failed to verify: %v\n", plat, err)