Merge v2.11 into v3.0

script/code-gen.sh

@@ -5,7 +5,7 @@ set -e -o pipefail
 
 source /go/src/k8s.io/code-generator/kube_codegen.sh
 
-git config --global --add safe.directory /go/src/${PROJECT_MODULE}
+git config --global --add safe.directory "/go/src/${PROJECT_MODULE}"
 
 rm -rf "/go/src/${PROJECT_MODULE}/${MODULE_VERSION}"
 mkdir -p "/go/src/${PROJECT_MODULE}/${MODULE_VERSION}/"

script/test-integration

@@ -3,18 +3,9 @@ set -e
 
 export DEST=.
 
-TESTFLAGS+=("-test.timeout=20m" -check.v)
-
-if [ -n "${VERBOSE}" ]; then
-    TESTFLAGS+=(-v)
-elif [ -n "${VERBOSE_INTEGRATION}" ]; then
-    TESTFLAGS+=(-v)
-fi
-
-cd integration
 echo "Testing against..."
 docker version
 
 # shellcheck disable=SC2086
 # shellcheck disable=SC2048
-CGO_ENABLED=0 go test -integration ${TESTFLAGS[*]}
+go test ./integration -test.timeout=20m -failfast -v ${TESTFLAGS[*]}

script/validate-lint

@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-golangci-lint run
+golangci-lint run