Bump to kube 1.19-rc.2

test/e2e/upgrade/service/service.go

@@ -111,7 +111,7 @@ func (t *UpgradeTest) Test(f *framework.Framework, done <-chan struct{}, upgrade
 
 	stopCh := make(chan struct{})
 	defer close(stopCh)
-	newBroadcaster := events.NewBroadcaster(&events.EventSinkImpl{Interface: client.EventsV1beta1().Events("")})
+	newBroadcaster := events.NewBroadcaster(&events.EventSinkImpl{Interface: client.EventsV1()})
 	r := newBroadcaster.NewRecorder(scheme.Scheme, "openshift.io/upgrade-test-service")
 	newBroadcaster.StartRecordingToSink(stopCh)
 

test/e2e/upgrade/upgrade.go

@@ -27,7 +27,7 @@ import (
 	configv1 "github.com/openshift/api/config/v1"
 	configv1client "github.com/openshift/client-go/config/clientset/versioned"
 	"github.com/openshift/origin/test/e2e/upgrade/alert"
-	"github.com/openshift/origin/test/e2e/upgrade/service"
+	// "github.com/openshift/origin/test/e2e/upgrade/service"
 	"github.com/openshift/origin/test/extended/util/disruption"
 	"github.com/openshift/origin/test/extended/util/disruption/controlplane"
 	"github.com/openshift/origin/test/extended/util/disruption/frontends"
@@ -39,7 +39,8 @@ func AllTests() []upgrades.Test {
 		controlplane.NewOpenShiftAvailableTest(),
 		&alert.UpgradeTest{},
 		&frontends.AvailableTest{},
-		&service.UpgradeTest{},
+		// Broken by 1.19 rebase, fix tracked by https://bugzilla.redhat.com/show_bug.cgi?id=1861944
+		// &service.UpgradeTest{},
 		&upgrades.SecretUpgradeTest{},
 		&apps.ReplicaSetUpgradeTest{},
 		&apps.StatefulSetUpgradeTest{},

test/extended/etcd/etcd_storage_path.go

@@ -291,41 +291,16 @@ func testEtcd3StoragePath(t g.GinkgoTInterface, kubeConfig *restclient.Config, e
 		gvr("storage.k8s.io", "v1alpha1", "volumeattachments"),
 	)
 
-	// Apply output of git diff origin/release-1.18 origin/release-1.19 test/integration/etcd/data.go. This is needed
+	// Apply output of git diff origin/release-1.19 origin/release-1.20 test/integration/etcd/data.go. This is needed
 	// to apply the right data depending on the kube version of the running server. Replace this with the next current
 	// and rebase version next time. Don't pile them up.
-	if strings.HasPrefix(version.Minor, "19") {
+	if strings.HasPrefix(version.Minor, "20") {
 		namespace := "etcdstoragepathtestnamespace"
+		_ = namespace
 
 		// Added etcd data.
 		for k, a := range map[schema.GroupVersionResource]etcddata.StorageData{
-			// k8s.io/kubernetes/pkg/apis/certificates/v1
-			gvr("certificates.k8s.io", "v1", "certificatesigningrequests"): {
-				Stub:             `{"metadata": {"name": "csr2"}, "spec": {"signerName":"example.com/signer", "usages":["any"], "request": "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURSBSRVFVRVNULS0tLS0KTUlJQnlqQ0NBVE1DQVFBd2dZa3hDekFKQmdOVkJBWVRBbFZUTVJNd0VRWURWUVFJRXdwRFlXeHBabTl5Ym1saApNUll3RkFZRFZRUUhFdzFOYjNWdWRHRnBiaUJXYVdWM01STXdFUVlEVlFRS0V3cEhiMjluYkdVZ1NXNWpNUjh3CkhRWURWUVFMRXhaSmJtWnZjbTFoZEdsdmJpQlVaV05vYm05c2IyZDVNUmN3RlFZRFZRUURFdzUzZDNjdVoyOXYKWjJ4bExtTnZiVENCbnpBTkJna3Foa2lHOXcwQkFRRUZBQU9CalFBd2dZa0NnWUVBcFp0WUpDSEo0VnBWWEhmVgpJbHN0UVRsTzRxQzAzaGpYK1prUHl2ZFlkMVE0K3FiQWVUd1htQ1VLWUhUaFZSZDVhWFNxbFB6eUlCd2llTVpyCldGbFJRZGRaMUl6WEFsVlJEV3dBbzYwS2VjcWVBWG5uVUsrNWZYb1RJL1VnV3NocmU4dEoreC9UTUhhUUtSL0oKY0lXUGhxYVFoc0p1elpidkFkR0E4MEJMeGRNQ0F3RUFBYUFBTUEwR0NTcUdTSWIzRFFFQkJRVUFBNEdCQUlobAo0UHZGcStlN2lwQVJnSTVaTStHWng2bXBDejQ0RFRvMEprd2ZSRGYrQnRyc2FDMHE2OGVUZjJYaFlPc3E0ZmtIClEwdUEwYVZvZzNmNWlKeENhM0hwNWd4YkpRNnpWNmtKMFRFc3VhYU9oRWtvOXNkcENvUE9uUkJtMmkvWFJEMkQKNmlOaDhmOHowU2hHc0ZxakRnRkh5RjNvK2xVeWorVUM2SDFRVzdibgotLS0tLUVORCBDRVJUSUZJQ0FURSBSRVFVRVNULS0tLS0="}}`,
-				ExpectedEtcdPath: "/registry/certificatesigningrequests/csr2",
-				ExpectedGVK:      gvkP("certificates.k8s.io", "v1beta1", "CertificateSigningRequest"),
-			},
-			// --
-
-			// k8s.io/kubernetes/pkg/apis/events/v1
-			gvr("events.k8s.io", "v1", "events"): {
-				Stub:             `{"metadata": {"name": "event3"}, "regarding": {"namespace": "` + namespace + `"}, "note": "some data here", "eventTime": "2017-08-09T15:04:05.000000Z", "reportingInstance": "node-xyz", "reportingController": "k8s.io/my-controller", "action": "DidNothing", "reason": "Laziness", "type": "Normal"}`,
-				ExpectedEtcdPath: "/registry/events/" + namespace + "/event3",
-				ExpectedGVK:      gvkP("", "v1", "Event"),
-			},
-			// --
-
-			// k8s.io/kubernetes/pkg/apis/networking/v1
-			gvr("networking.k8s.io", "v1", "ingresses"): {
-				Stub:             `{"metadata": {"name": "ingress3"}, "spec": {"defaultBackend": {"service":{"name":"service", "port":{"number": 5000}}}}}`,
-				ExpectedEtcdPath: "/registry/ingress/" + namespace + "/ingress3",
-				ExpectedGVK:      gvkP("networking.k8s.io", "v1beta1", "Ingress"),
-			},
-			gvr("networking.k8s.io", "v1", "ingressclasses"): {
-				Stub:             `{"metadata": {"name": "ingressclass3"}, "spec": {"controller": "example.com/controller"}}`,
-				ExpectedEtcdPath: "/registry/ingressclasses/ingressclass3",
-				ExpectedGVK:      gvkP("networking.k8s.io", "v1beta1", "IngressClass"),
-			},
+			// TODO: fill when 1.20 rebase has started
 		} {
 			if _, preexisting := etcdStorageData[k]; preexisting {
 				t.Errorf("upstream etcd storage data already has data for %v. Update current and rebase version diff to next rebase version", k)
@@ -334,19 +309,18 @@ func testEtcd3StoragePath(t g.GinkgoTInterface, kubeConfig *restclient.Config, e
 		}
 
 		// Modified etcd data.
-
-		// none right now.
+		//
+		// TODO: fill when 1.20 rebase has started
 
 		// Removed etcd data.
-		removeStorageData(t, etcdStorageData,
-			gvr("auditregistration.k8s.io", "v1alpha1", "auditsinks"),
-		)
+		removeStorageData(t, etcdStorageData) // TODO: fill when 1.20 rebase has started
+
 	} else {
-		// Remove 1.18 only alpha versions
-		removeStorageData(t, etcdStorageData,
-			// these alphas resources are not enabled in a real cluster but worked fine in the integration test
-			gvr("auditregistration.k8s.io", "v1alpha1", "auditsinks"),
-		)
+		// Remove 1.19 only alpha versions
+		removeStorageData(t, etcdStorageData) // these alphas resources are not enabled in a real cluster but worked fine in the integration test
+		//
+		// TODO: fill when 1.20 rebase has started
+
 	}
 
 	// flowcontrol may or may not be on.  This allows us to ratchet in turning it on.

test/extended/image_ecosystem/scl.go

@@ -14,6 +14,7 @@ import (
 	"k8s.io/apimachinery/pkg/util/wait"
 	"k8s.io/kubernetes/pkg/client/conditions"
 	e2e "k8s.io/kubernetes/test/e2e/framework"
+	e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
 
 	exutil "github.com/openshift/origin/test/extended/util"
 )
@@ -58,7 +59,7 @@ func defineTest(name string, t tc, oc *exutil.CLI) {
 			o.Expect(err).NotTo(o.HaveOccurred())
 
 			g.By("waiting for the pod to be running")
-			err = oc.KubeFramework().WaitForPodRunningSlow(pod.Name)
+			err = e2epod.WaitForPodRunningInNamespaceSlow(oc.KubeClient(), pod.Name, oc.Namespace())
 			if err != nil {
 				p, e := oc.KubeClient().CoreV1().Pods(oc.Namespace()).Get(context.Background(), pod.Name, metav1.GetOptions{})
 				if e != nil {
@@ -102,7 +103,7 @@ func defineTest(name string, t tc, oc *exutil.CLI) {
 			_, err := oc.KubeClient().CoreV1().Pods(oc.Namespace()).Create(context.Background(), pod, metav1.CreateOptions{})
 			o.Expect(err).NotTo(o.HaveOccurred())
 
-			err = oc.KubeFramework().WaitForPodRunningSlow(pod.Name)
+			err = e2epod.WaitForPodRunningInNamespaceSlow(oc.KubeClient(), pod.Name, oc.Namespace())
 			if err != nil {
 				p, e := oc.KubeClient().CoreV1().Pods(oc.Namespace()).Get(context.Background(), pod.Name, metav1.GetOptions{})
 				if e != nil {
@@ -135,7 +136,7 @@ func defineTest(name string, t tc, oc *exutil.CLI) {
 			_, err = oc.KubeClient().CoreV1().Pods(oc.Namespace()).Create(context.Background(), pod, metav1.CreateOptions{})
 			o.Expect(err).NotTo(o.HaveOccurred())
 
-			err = oc.KubeFramework().WaitForPodRunningSlow(pod.Name)
+			err = e2epod.WaitForPodRunningInNamespaceSlow(oc.KubeClient(), pod.Name, oc.Namespace())
 			o.Expect(err).NotTo(o.HaveOccurred())
 
 			g.By("calling the binary using 'oc exec /bin/bash -c'")

test/extended/include.go

@@ -42,7 +42,6 @@ import (
 	_ "github.com/openshift/origin/test/extended/images"
 	_ "github.com/openshift/origin/test/extended/images/trigger"
 	_ "github.com/openshift/origin/test/extended/jobs"
-	_ "github.com/openshift/origin/test/extended/localquota"
 	_ "github.com/openshift/origin/test/extended/machines"
 	_ "github.com/openshift/origin/test/extended/marketplace"
 	_ "github.com/openshift/origin/test/extended/networking"

test/extended/router/grpc-interop.go

@@ -17,6 +17,7 @@ import (
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	e2e "k8s.io/kubernetes/test/e2e/framework"
+	e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
 )
 
 const (
@@ -55,7 +56,7 @@ var _ = g.Describe("[sig-network-edge][Conformance][Area:Networking][Feature:Rou
 			g.By(fmt.Sprintf("creating test fixture from a config file %q", configPath))
 			err := oc.Run("new-app").Args("-f", configPath).Execute()
 			o.Expect(err).NotTo(o.HaveOccurred())
-			e2e.ExpectNoError(oc.KubeFramework().WaitForPodRunningSlow("grpc-interop"))
+			e2e.ExpectNoError(e2epod.WaitForPodRunningInNamespaceSlow(oc.KubeClient(), "grpc-interop", oc.KubeFramework().Namespace.Name))
 
 			g.By("Discovering the set of supported test cases")
 			ns := oc.KubeFramework().Namespace.Name

test/extended/router/h2spec.go

@@ -21,6 +21,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/wait"
 	e2e "k8s.io/kubernetes/test/e2e/framework"
+	e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
 )
 
 const h2specDialTimeoutInSeconds = 15
@@ -66,7 +67,7 @@ var _ = g.Describe("[sig-network-edge][Conformance][Area:Networking][Feature:Rou
 			err = oc.Run("new-app").Args("-f", configPath, "-p", "HAPROXY_IMAGE="+routerImage).Execute()
 			o.Expect(err).NotTo(o.HaveOccurred())
 
-			e2e.ExpectNoError(oc.KubeFramework().WaitForPodRunning("h2spec-haproxy"))
+			e2e.ExpectNoError(e2epod.WaitForPodNameRunningInNamespace(oc.KubeClient(), "h2spec-haproxy", oc.KubeFramework().Namespace.Name))
 
 			routeTypeTests := []h2specRouteTypeTest{{
 				routeType: routev1.TLSTerminationEdge,
@@ -153,7 +154,7 @@ func failingTests(testSuites []*h2spec.JUnitTestSuite) []h2specFailingTest {
 
 func runConformanceTests(oc *exutil.CLI, t h2specRouteTypeTest) []*h2spec.JUnitTestSuite {
 	podName := "h2spec"
-	e2e.ExpectNoError(oc.KubeFramework().WaitForPodRunning(podName))
+	e2e.ExpectNoError(e2epod.WaitForPodNameRunningInNamespace(oc.KubeClient(), podName, oc.KubeFramework().Namespace.Name))
 
 	var results []*h2spec.JUnitTestSuite
 

test/extended/router/http2.go

@@ -17,6 +17,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/wait"
 	e2e "k8s.io/kubernetes/test/e2e/framework"
+	e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
 
 	exutil "github.com/openshift/origin/test/extended/util"
 	"github.com/openshift/origin/test/extended/util/url"
@@ -75,7 +76,7 @@ var _ = g.Describe("[sig-network-edge][Conformance][Area:Networking][Feature:Rou
 			g.By(fmt.Sprintf("creating test fixture from a config file %q", configPath))
 			err := oc.Run("new-app").Args("-f", configPath).Execute()
 			o.Expect(err).NotTo(o.HaveOccurred())
-			e2e.ExpectNoError(oc.KubeFramework().WaitForPodRunningSlow("http2"))
+			e2e.ExpectNoError(e2epod.WaitForPodRunningInNamespaceSlow(oc.KubeClient(), "http2", oc.KubeFramework().Namespace.Name))
 
 			testCases := []struct {
 				route             string

test/extended/security/supplemental_groups.go

@@ -15,6 +15,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/client-go/util/retry"
 	e2e "k8s.io/kubernetes/test/e2e/framework"
+	e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
 
 	exutil "github.com/openshift/origin/test/extended/util"
 )
@@ -67,7 +68,7 @@ var _ = g.Describe("[sig-node] supplemental groups", func() {
 
 			// wait for the pod to run so we can inspect it.
 			g.By("waiting for the pod to become running")
-			err = f.WaitForPodRunning(submittedPod.Name)
+			err = e2epod.WaitForPodNameRunningInNamespace(f.ClientSet, submittedPod.Name, f.Namespace.Name)
 			o.Expect(err).NotTo(o.HaveOccurred())
 
 			out, stderr, err := oc.Run("exec").Args("-p", supplementalGroupsPod, "--", "/usr/bin/id", "-G").Outputs()