Fix 1.1 e2e's to work with 1.2 clusters with scheduler named "default-scheduler"

pkg/version/semver.go

@@ -44,7 +44,7 @@ func Parse(gitversion string) (semver.Version, error) {
 func MustParse(gitversion string) semver.Version {
 	v, err := Parse(gitversion)
 	if err != nil {
-		glog.Fatalf("failed to parse semver from giversion %q: %v", gitversion, err)
+		glog.Fatalf("failed to parse semver from gitversion %q: %v", gitversion, err)
 	}
 	return v
 }

test/e2e/density.go

@@ -335,7 +335,7 @@ var _ = Describe("Density", func() {
 					fields.Set{
 						"involvedObject.kind":      "Pod",
 						"involvedObject.namespace": ns,
-						"source":                   "scheduler",
+						"source":                   getSchedulerName(c),
 					}.AsSelector())
 				expectNoError(err)
 				for k := range createTimes {

test/e2e/events.go

@@ -91,7 +91,7 @@ var _ = Describe("Events", func() {
 					"involvedObject.kind":      "Pod",
 					"involvedObject.uid":       string(podWithUid.UID),
 					"involvedObject.namespace": framework.Namespace.Name,
-					"source":                   "scheduler",
+					"source":                   getSchedulerName(framework.Client),
 				}.AsSelector(),
 			)
 			if err != nil {

test/e2e/scheduler_predicates.go

@@ -99,14 +99,13 @@ func verifyResult(c *client.Client, podName string, ns string, oldNotRunning int
 	allPods, err := c.Pods(api.NamespaceAll).List(labels.Everything(), fields.Everything())
 	expectNoError(err)
 	_, notRunningPods := getPodsNumbers(allPods)
-
 	schedEvents, err := c.Events(ns).List(
 		labels.Everything(),
 		fields.Set{
 			"involvedObject.kind":      "Pod",
 			"involvedObject.name":      podName,
 			"involvedObject.namespace": ns,
-			"source":                   "scheduler",
+			"source":                   getSchedulerName(c),
 			"reason":                   "FailedScheduling",
 		}.AsSelector())
 	expectNoError(err)
@@ -121,7 +120,7 @@ func verifyResult(c *client.Client, podName string, ns string, oldNotRunning int
 				"involvedObject.kind":      "Pod",
 				"involvedObject.name":      podName,
 				"involvedObject.namespace": ns,
-				"source":                   "scheduler",
+				"source":                   getSchedulerName(c),
 				"reason":                   "failedScheduling",
 			}.AsSelector())
 		expectNoError(err)

test/e2e/util.go

@@ -48,8 +48,10 @@ import (
 	deploymentUtil "k8s.io/kubernetes/pkg/util/deployment"
 	"k8s.io/kubernetes/pkg/util/sets"
 	"k8s.io/kubernetes/pkg/util/wait"
+	"k8s.io/kubernetes/pkg/version"
 	"k8s.io/kubernetes/pkg/watch"
 
+	"github.com/blang/semver"
 	"github.com/davecgh/go-spew/spew"
 	"golang.org/x/crypto/ssh"
 	"golang.org/x/net/websocket"
@@ -879,6 +881,36 @@ func (r podResponseChecker) checkAllResponses() (done bool, err error) {
 	return true, nil
 }
 
+// serverVersionGTE returns true if v is greater than or equal to the server
+// version.
+//
+// TODO(18726): This should be incorporated into client.VersionInterface.
+func serverVersionGTE(v semver.Version, c client.VersionInterface) (bool, error) {
+	serverVersion, err := c.ServerVersion()
+	if err != nil {
+		return false, fmt.Errorf("Unable to get server version: %v", err)
+	}
+	sv, err := version.Parse(serverVersion.GitVersion)
+	if err != nil {
+		return false, fmt.Errorf("Unable to parse server version %q: %v", serverVersion.GitVersion, err)
+	}
+	return sv.GTE(v), nil
+}
+
+// Multi-scheduler was implemented in #17865, first built into v1.2.0-alpha.6.
+// It changed the default scheduler name from "scheduler" to
+// "default-scheduler", breaking forward-compatibility with tests that rely on
+// finding events from the default scheduler.
+var multiSchedulerVersion = version.MustParse("v1.2.0-alpha.6")
+
+func getSchedulerName(c client.VersionInterface) string {
+	serverVersionGTEMultiSchedulerVersion, err := serverVersionGTE(multiSchedulerVersion, c)
+	if err != nil && serverVersionGTEMultiSchedulerVersion {
+		return "default-scheduler"
+	}
+	return "scheduler"
+}
+
 func podsResponding(c *client.Client, ns, name string, wantName bool, pods *api.PodList) error {
 	By("trying to dial each unique pod")
 	label := labels.SelectorFromSet(labels.Set(map[string]string{"name": name}))