jond

.ci-operator.yaml

@@ -0,0 +1,4 @@
+build_root_image:
+  name: release
+  namespace: openshift
+  tag: rhel-8-release-golang-1.17-openshift-4.11

Makefile

@@ -9,7 +9,7 @@ include $(addprefix ./vendor/github.com/openshift/build-machinery-go/make/, \
 	targets/openshift/deps.mk \
 )
 
-IMAGE_REGISTRY :=registry.svc.ci.openshift.org
+IMAGE_REGISTRY :=registry.ci.openshift.org
 
 # This will call a macro called "build-image" which will generate image specific targets based on the parameters:
 # $0 - macro name
@@ -61,7 +61,7 @@ update: update-bindata
 #	make update-examples
 update-examples:
 	hack/update-external-examples.sh
-	update-bindata
+	$(MAKE) update-bindata
 .PHONY: update-examples
 
 # Run tools tests.
@@ -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/... e2echart,testextended,testdata,test/extended/testdata/bindata.go)

OWNERS

@@ -8,7 +8,6 @@ filters:
     - sjenning
     - smarterclayton
     - soltysh
-    - tbielawa
     approvers:
     - bparees
     - deads2k
@@ -19,12 +18,16 @@ filters:
     - pweil-
     - sjenning
     - soltysh
+    - stbenjam
     - sttts
     - smarterclayton
-    - tbielawa # also for build and automated release tooling changes
   "^\\.go.(mod|sum)$":
     labels:
     - "vendor-update"
   "^vendor/.*":
     labels:
     - "vendor-update"
+
+# This is a Red Hat extension, mapping the Git repository to an OpenShift Bugzilla component:
+# https://bugzilla.redhat.com/enter_bug.cgi?product=OpenShift%20Container%20Platform
+component: "Test Framework"

OWNERS_ALIASES

@@ -0,0 +1,53 @@
+# See the OWNERS_ALIASES docs: https://git.k8s.io/community/contributors/guide/owners.md#owners_aliases
+
+aliases:
+  cluster-version-operator-test-case-approvers:
+  - LalatenduMohanty
+  - jottofar
+  - vrutkovs
+  - wking
+  cluster-version-operator-test-case-reviewers:
+  - LalatenduMohanty
+  - jottofar
+  - vrutkovs
+  - wking
+  team-leads:
+  - JAORMX # Infrastructure Security and Compliance
+  - JoelSpeed # Cluster Infrastructure
+  - LalatenduMohanty # Over the Air Updates
+  - Miciah # Network Edge
+  - adambkaplan # Build + Jenkins
+  - ashishkamra # Performance and Latency Sensitive Application Platform
+  - beekhof # Machine Lifecycle
+  - brenton # Technical Release Team
+  - bthurber # Partner Accelerators
+  - c3d # OpenShift Sandboxed Containers
+  - celebdor # Ecosystem Edge
+  - dmage # Image Registry
+  - dulek # Kuryr Networking
+  - hexfusion # etcd
+  - jaypoulz # Multi Arch
+  - jcantrill # Cluster Logging
+  - jmrodri # Operator SDK
+  - joelddiaz # Hive
+  - jparrill # Portfolio Integration
+  - jsafrane # Storage
+  - jwmatthews # App Migration
+  - kevinrizza # Operator Lifecycle Manager
+  - mandre # Shift on Stack
+  - miabbott # CoreOS
+  - pedjak # App Services
+  - petr-muller # Test Platform
+  - romfreiman # Single Node OpenShift
+  - rphillips # Node
+  - s-urbaniak # Authentication
+  - sadasu # Metal Platform
+  - selansen # Windows Containers
+  - simonpasquier # Monitoring - In Cluster
+  - sinnykumari # MCO
+  - soltysh # Workloads
+  - sosiouxme # Automated Release Tooling
+  - staebler # OpenShift Installer
+  - sttts # API Server
+  - trozet # Networking
+  - umohnani8 # Container Engine Tools

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
@@ -97,6 +97,26 @@ $ hack/update-kube-vendor.sh <branch name or SHA> github.com/myname/kubernetes
 Once the script has executed, the vendoring changes will need to be
 committed and proposed to the repo.
 
+#### Working around '410 Gone' error
+
+If the script returns '410 Gone' as per the error that follows, it may
+be that the golang checksum server does not yet know about the target
+SHA.
+
+```
+go: k8s.io/kubernetes@v1.21.1 (replaced by github.com/openshift/kubernetes@v1.21.2-0.20210603185452-2dfc46b23003): verifying go.mod: g
+ithub.com/openshift/kubernetes@v1.21.2-0.20210603185452-2dfc46b23003/go.mod: reading https://sum.golang.org/lookup/github.com/openshif
+t/kubernetes@v1.21.2-0.20210603185452-2dfc46b23003: 410 Gone
+        server response: not found:
+```
+
+The workaround is to set `GOSUMDB=off` to disable the checksum
+database for the vendoring update:
+
+```bash
+$ GOSUMDB=off hack/update-kube-vendor.sh <branch name or SHA>
+```
+
 ## Maintenance of release-4.5, release-4.4 and release-4.3
 
 Releases prior to 4.6 continue to maintain hyperkube in the `origin`

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, ",")