Bug 1919453: Update to latest 4.7 state where possible

Makefile

@@ -98,4 +98,4 @@ test: test-tools
 # $5 - output
 # It will generate targets {update,verify}-bindata-$(1) logically grouping them in unsuffixed versions of these targets
 # and also hooked into {update,verify}-generated for broader integration.
-$(call add-bindata,bindata,-ignore ".*\.(go|md)$\" examples/db-templates examples/image-streams examples/sample-app examples/quickstarts/... examples/hello-openshift examples/jenkins/... examples/quickstarts/cakephp-mysql.json test/extended/testdata/... test/integration/testdata,testextended,testdata,test/extended/testdata/bindata.go)
+$(call add-bindata,bindata,-ignore ".*\.(go|md)$\" examples/db-templates examples/image-streams examples/sample-app examples/quickstarts/... examples/hello-openshift examples/jenkins/... examples/quickstarts/cakephp-mysql.json test/extended/testdata/...,testextended,testdata,test/extended/testdata/bindata.go)

OWNERS

@@ -8,7 +8,6 @@ filters:
     - sjenning
     - smarterclayton
     - soltysh
-    - tbielawa
     approvers:
     - bparees
     - deads2k
@@ -21,7 +20,6 @@ filters:
     - soltysh
     - sttts
     - smarterclayton
-    - tbielawa # also for build and automated release tooling changes
   "^\\.go.(mod|sum)$":
     labels:
     - "vendor-update"

README.md

@@ -8,7 +8,7 @@ Origin Kubernetes
 This repo was previously the core Kubernetes tracking repo for
 [OKD](https://github.com/openshift/okd), and where OpenShift's
 `hyperkube` and `openshift-test` binaries were maintained. As of July
-2020, the purpose and maintenance stratety of the repo varies by
+2020, the purpose and maintenance strategy of the repo varies by
 branch.
 
 ## Maintenance of `master` and `release-x.x` branches for 4.6 and above

cmd/openshift-tests/cni.go

@@ -0,0 +1,23 @@
+package main
+
+import (
+	"strings"
+)
+
+// Determines whether a test should be run for third-party network plugin conformance testing
+func inCNISuite(name string) bool {
+	if strings.Contains(name, "[Suite:k8s]") && strings.Contains(name, "[sig-network]") {
+		// Run all upstream sig-network conformance tests
+		if strings.Contains(name, "[Conformance]") {
+			return true
+		}
+		// Run all upstream NetworkPolicy tests except named port tests. (Neither
+		// openshift-sdn nor ovn-kubernetes supports named ports in NetworkPolicy,
+		// so we don't require third party tests to support them either.)
+		if strings.Contains(name, "NetworkPolicy") && !strings.Contains(name, "named port") {
+			return true
+		}
+	}
+
+	return false
+}

cmd/openshift-tests/csi.go

@@ -8,39 +8,14 @@ import (
 
 	"k8s.io/kubernetes/test/e2e/framework/testfiles"
 	"k8s.io/kubernetes/test/e2e/storage/external"
-
-	"github.com/openshift/origin/test/extended/csi"
 )
 
 const (
-	manifestEnvVar       = "TEST_CSI_DRIVER_FILES"
-	installDriversEnvVar = "TEST_INSTALL_CSI_DRIVERS"
+	manifestEnvVar = "TEST_CSI_DRIVER_FILES"
 )
 
 // Initialize openshift/csi suite, i.e. define CSI tests from TEST_CSI_DRIVER_FILES.
 func initCSITests(dryRun bool) error {
-	driverList := os.Getenv(installDriversEnvVar)
-	if driverList != "" {
-		drivers := strings.Split(driverList, ",")
-		for _, driver := range drivers {
-			manifestFile, err := csi.InstallCSIDriver(driver, dryRun)
-			if err != nil {
-				return fmt.Errorf("failed to install CSI driver from %q: %s", driver, err)
-			}
-			// Children processes need to see the newly introduced manifest,
-			// store it in TEST_CSI_DRIVER_FILES env. var for them.
-			manifestList := os.Getenv(manifestEnvVar)
-			if len(manifestList) > 0 {
-				manifestList += ","
-			}
-			manifestList += manifestFile
-			os.Setenv(manifestEnvVar, manifestList)
-		}
-	}
-
-	// Clear TEST_INSTALL_CSI_DRIVERS, we don't want the driver installed by children too.
-	os.Setenv(installDriversEnvVar, "")
-
 	manifestList := os.Getenv(manifestEnvVar)
 	if manifestList != "" {
 		manifests := strings.Split(manifestList, ",")