Revert "Add a custom main instead of the standard test main, to reduce stack …"

hack/test-integration.sh

@@ -52,7 +52,7 @@ runTests() {
   # KUBE_RACE="-race"
   KUBE_GOFLAGS="-tags 'integration no-docker' " \
     KUBE_RACE="" \
-    KUBE_TEST_ARGS="--integration-timeout=${KUBE_TIMEOUT}"
+    KUBE_TIMEOUT="${KUBE_TIMEOUT}" \
     KUBE_TEST_API_VERSIONS="$1" \
     "${KUBE_ROOT}/hack/test-go.sh" test/integration
 

hack/verify-flags/known-flags.txt

@@ -206,7 +206,6 @@ insecure-bind-address
 insecure-port
 insecure-skip-tls-verify
 instance-name-prefix
-integration-timeout
 iptables-masquerade-bit
 iptables-sync-period
 ir-data-source
@@ -449,7 +448,6 @@ target-port
 tcp-services
 terminated-pod-gc-threshold
 test-timeout
-timeout-full-stack
 tls-cert-file
 tls-private-key-file
 to-version