Merge pull request #48847 from bsalamat/e2e_test_conversion

test/e2e/scheduling/priorities.go

@@ -83,111 +83,6 @@ var _ = SIGDescribe("SchedulerPriorities [Serial]", func() {
 		Expect(err).NotTo(HaveOccurred())
 	})
 
-	It("Pod should be prefer scheduled to node that satisify the NodeAffinity", func() {
-		nodeName := GetNodeThatCanRunPod(f)
-		By("Trying to apply a label on the found node.")
-		k := fmt.Sprintf("kubernetes.io/e2e-%s", "node-topologyKey")
-		v := "topologyvalue"
-		framework.AddOrUpdateLabelOnNode(cs, nodeName, k, v)
-		framework.ExpectNodeHasLabel(cs, nodeName, k, v)
-		defer framework.RemoveLabelOffNode(cs, nodeName, k)
-
-		// make the nodes have balanced cpu,mem usage ratio
-		err := createBalancedPodForNodes(f, cs, ns, nodeList.Items, podRequestedResource, 0.6)
-		framework.ExpectNoError(err)
-		By("Trying to relaunch the pod, now with labels.")
-		labelPodName := "pod-with-node-affinity"
-		pod := createPausePod(f, pausePodConfig{
-			Name: labelPodName,
-			Affinity: &v1.Affinity{
-				NodeAffinity: &v1.NodeAffinity{
-					PreferredDuringSchedulingIgnoredDuringExecution: []v1.PreferredSchedulingTerm{
-						{
-							Preference: v1.NodeSelectorTerm{
-								MatchExpressions: []v1.NodeSelectorRequirement{
-									{
-										Key:      k,
-										Operator: v1.NodeSelectorOpIn,
-										Values:   []string{v},
-									},
-								},
-							},
-							Weight: 20,
-						},
-					},
-				},
-			},
-		})
-		By("Wait the pod becomes running.")
-		framework.ExpectNoError(f.WaitForPodRunning(pod.Name))
-		labelPod, err := cs.CoreV1().Pods(ns).Get(labelPodName, metav1.GetOptions{})
-		framework.ExpectNoError(err)
-		By("Verify the pod was scheduled to the expected node.")
-		Expect(labelPod.Spec.NodeName).To(Equal(nodeName))
-	})
-
-	It("Pod should be schedule to node that satisify the PodAffinity", func() {
-		By("Trying to launch a pod with a label to get a node which can launch it.")
-		pod := runPausePod(f, pausePodConfig{
-			Name:      "with-label-security-s1",
-			Labels:    map[string]string{"service": "S1"},
-			Resources: podRequestedResource,
-		})
-		nodeName := pod.Spec.NodeName
-
-		By("Trying to apply label on the found node.")
-		k := fmt.Sprintf("kubernetes.io/e2e-%s", "node-topologyKey")
-		v := "topologyvalue"
-		framework.AddOrUpdateLabelOnNode(cs, nodeName, k, v)
-		framework.ExpectNodeHasLabel(cs, nodeName, k, v)
-		defer framework.RemoveLabelOffNode(cs, nodeName, k)
-		// make the nodes have balanced cpu,mem usage
-		err := createBalancedPodForNodes(f, cs, ns, nodeList.Items, podRequestedResource, 0.6)
-		framework.ExpectNoError(err)
-		By("Trying to launch the pod, now with podAffinity.")
-		labelPodName := "pod-with-podaffinity"
-		pod = createPausePod(f, pausePodConfig{
-			Resources: podRequestedResource,
-			Name:      labelPodName,
-			Affinity: &v1.Affinity{
-				PodAffinity: &v1.PodAffinity{
-					PreferredDuringSchedulingIgnoredDuringExecution: []v1.WeightedPodAffinityTerm{
-						{
-							PodAffinityTerm: v1.PodAffinityTerm{
-								LabelSelector: &metav1.LabelSelector{
-									MatchExpressions: []metav1.LabelSelectorRequirement{
-										{
-											Key:      "service",
-											Operator: metav1.LabelSelectorOpIn,
-											Values:   []string{"S1", "value2"},
-										},
-										{
-											Key:      "service",
-											Operator: metav1.LabelSelectorOpNotIn,
-											Values:   []string{"S2"},
-										}, {
-											Key:      "service",
-											Operator: metav1.LabelSelectorOpExists,
-										},
-									},
-								},
-								TopologyKey: k,
-								Namespaces:  []string{ns},
-							},
-							Weight: 20,
-						},
-					},
-				},
-			},
-		})
-		By("Wait the pod becomes running.")
-		framework.ExpectNoError(f.WaitForPodRunning(pod.Name))
-		labelPod, err := cs.CoreV1().Pods(ns).Get(labelPodName, metav1.GetOptions{})
-		framework.ExpectNoError(err)
-		By("Verify the pod was scheduled to the expected node.")
-		Expect(labelPod.Spec.NodeName).To(Equal(nodeName))
-	})
-
 	It("Pod should be schedule to node that don't match the PodAntiAffinity terms", func() {
 		By("Trying to launch a pod with a label to get a node which can launch it.")
 		pod := runPausePod(f, pausePodConfig{

test/integration/framework/BUILD

@@ -14,6 +14,7 @@ go_library(
         "master_utils.go",
         "perf_utils.go",
         "serializer.go",
+        "util.go",
     ],
     data = [
         "@com_coreos_etcd//:etcd",

test/integration/framework/util.go

+/*
+Copyright 2017 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// TODO: This file can potentially be moved to a common place used by both e2e and integration tests.
+
+package framework
+
+import (
+	"strings"
+
+	clientset "k8s.io/client-go/kubernetes"
+)
+
+const (
+	// When these values are updated, also update cmd/kubelet/app/options/options.go
+	// A copy of these values exist in e2e/framework/util.go.
+	currentPodInfraContainerImageName    = "gcr.io/google_containers/pause"
+	currentPodInfraContainerImageVersion = "3.0"
+)
+
+// GetServerArchitecture fetches the architecture of the cluster's apiserver.
+func GetServerArchitecture(c clientset.Interface) string {
+	arch := ""
+	sVer, err := c.Discovery().ServerVersion()
+	if err != nil || sVer.Platform == "" {
+		// If we failed to get the server version for some reason, default to amd64.
+		arch = "amd64"
+	} else {
+		// Split the platform string into OS and Arch separately.
+		// The platform string may for example be "linux/amd64", "linux/arm" or "windows/amd64".
+		osArchArray := strings.Split(sVer.Platform, "/")
+		arch = osArchArray[1]
+	}
+	return arch
+}
+
+// GetPauseImageName fetches the pause image name for the same architecture as the apiserver.
+func GetPauseImageName(c clientset.Interface) string {
+	return currentPodInfraContainerImageName + "-" + GetServerArchitecture(c) + ":" + currentPodInfraContainerImageVersion
+}

test/integration/scheduler/BUILD

@@ -4,6 +4,7 @@ licenses(["notice"])
 
 load(
     "@io_bazel_rules_go//go:def.bzl",
+    "go_library",
     "go_test",
 )
 
@@ -13,8 +14,10 @@ go_test(
     srcs = [
         "extender_test.go",
         "main_test.go",
+        "priorities_test.go",
         "scheduler_test.go",
     ],
+    library = ":go_default_library",
     tags = [
         "automanaged",
         "integration",
@@ -32,8 +35,8 @@ go_test(
         "//plugin/pkg/scheduler/schedulercache:go_default_library",
         "//test/e2e/framework:go_default_library",
         "//test/integration/framework:go_default_library",
+        "//test/utils:go_default_library",
         "//vendor/k8s.io/api/core/v1:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/api/resource:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/util/wait:go_default_library",
@@ -59,3 +62,29 @@ filegroup(
     srcs = [":package-srcs"],
     tags = ["automanaged"],
 )
+
+go_library(
+    name = "go_default_library",
+    srcs = ["util.go"],
+    tags = ["automanaged"],
+    deps = [
+        "//pkg/api:go_default_library",
+        "//pkg/api/testapi:go_default_library",
+        "//plugin/pkg/scheduler:go_default_library",
+        "//plugin/pkg/scheduler/algorithmprovider:go_default_library",
+        "//plugin/pkg/scheduler/factory:go_default_library",
+        "//test/integration/framework:go_default_library",
+        "//vendor/k8s.io/api/core/v1:go_default_library",
+        "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library",
+        "//vendor/k8s.io/apimachinery/pkg/api/resource:go_default_library",
+        "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
+        "//vendor/k8s.io/apimachinery/pkg/util/uuid:go_default_library",
+        "//vendor/k8s.io/apimachinery/pkg/util/wait:go_default_library",
+        "//vendor/k8s.io/client-go/informers:go_default_library",
+        "//vendor/k8s.io/client-go/kubernetes:go_default_library",
+        "//vendor/k8s.io/client-go/kubernetes/typed/core/v1:go_default_library",
+        "//vendor/k8s.io/client-go/listers/core/v1:go_default_library",
+        "//vendor/k8s.io/client-go/rest:go_default_library",
+        "//vendor/k8s.io/client-go/tools/record:go_default_library",
+    ],
+)

test/integration/scheduler/priorities_test.go

+/*
+Copyright 2017 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package scheduler
+
+import (
+	"testing"
+
+	"k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	testutils "k8s.io/kubernetes/test/utils"
+)
+
+// This file tests the scheduler priority functions.
+
+// TestNodeAffinity verifies that scheduler's node affinity priority function
+// works correctly.
+func TestNodeAffinity(t *testing.T) {
+	context := initTest(t, "node-affinity")
+	defer cleanupTest(t, context)
+	// Add a few nodes.
+	nodes, err := createNodes(context.clientSet, "testnode", nil, 5)
+	if err != nil {
+		t.Fatalf("Cannot create nodes: %v", err)
+	}
+	// Add a label to one of the nodes.
+	labeledNode := nodes[1]
+	labelKey := "kubernetes.io/node-topologyKey"
+	labelValue := "topologyvalue"
+	labels := map[string]string{
+		labelKey: labelValue,
+	}
+	if err = testutils.AddLabelsToNode(context.clientSet, labeledNode.Name, labels); err != nil {
+		t.Fatalf("Cannot add labels to node: %v", err)
+	}
+	if err = waitForNodeLabels(context.clientSet, labeledNode.Name, labels); err != nil {
+		t.Fatalf("Adding labels to node didn't succeed: %v", err)
+	}
+	// Create a pod with node affinity.
+	podName := "pod-with-node-affinity"
+	pod, err := runPausePod(context.clientSet, &pausePodConfig{
+		Name:      podName,
+		Namespace: context.ns.Name,
+		Affinity: &v1.Affinity{
+			NodeAffinity: &v1.NodeAffinity{
+				PreferredDuringSchedulingIgnoredDuringExecution: []v1.PreferredSchedulingTerm{
+					{
+						Preference: v1.NodeSelectorTerm{
+							MatchExpressions: []v1.NodeSelectorRequirement{
+								{
+									Key:      labelKey,
+									Operator: v1.NodeSelectorOpIn,
+									Values:   []string{labelValue},
+								},
+							},
+						},
+						Weight: 20,
+					},
+				},
+			},
+		},
+	})
+	if err != nil {
+		t.Fatalf("Error running pause pod: %v", err)
+	}
+	if pod.Spec.NodeName != labeledNode.Name {
+		t.Errorf("Pod %v got scheduled on an unexpected node: %v. Expected node: %v.", podName, pod.Spec.NodeName, labeledNode.Name)
+	} else {
+		t.Logf("Pod %v got successfully scheduled on node %v.", podName, pod.Spec.NodeName)
+	}
+}
+
+// TestPodAffinity verifies that scheduler's pod affinity priority function
+// works correctly.
+func TestPodAffinity(t *testing.T) {
+	context := initTest(t, "pod-affinity")
+	defer cleanupTest(t, context)
+	// Add a few nodes.
+	nodesInTopology, err := createNodes(context.clientSet, "in-topology", nil, 5)
+	if err != nil {
+		t.Fatalf("Cannot create nodes: %v", err)
+	}
+	topologyKey := "node-topologykey"
+	topologyValue := "topologyvalue"
+	nodeLabels := map[string]string{
+		topologyKey: topologyValue,
+	}
+	for _, node := range nodesInTopology {
+		// Add topology key to all the nodes.
+		if err = testutils.AddLabelsToNode(context.clientSet, node.Name, nodeLabels); err != nil {
+			t.Fatalf("Cannot add labels to node %v: %v", node.Name, err)
+		}
+		if err = waitForNodeLabels(context.clientSet, node.Name, nodeLabels); err != nil {
+			t.Fatalf("Adding labels to node %v didn't succeed: %v", node.Name, err)
+		}
+	}
+	// Add a pod with a label and wait for it to schedule.
+	labelKey := "service"
+	labelValue := "S1"
+	_, err = runPausePod(context.clientSet, &pausePodConfig{
+		Name:      "attractor-pod",
+		Namespace: context.ns.Name,
+		Labels:    map[string]string{labelKey: labelValue},
+	})
+	if err != nil {
+		t.Fatalf("Error running the attractor pod: %v", err)
+	}
+	// Add a few more nodes without the topology label.
+	_, err = createNodes(context.clientSet, "other-node", nil, 5)
+	if err != nil {
+		t.Fatalf("Cannot create the second set of nodes: %v", err)
+	}
+	// Add a new pod with affinity to the attractor pod.
+	podName := "pod-with-podaffinity"
+	pod, err := runPausePod(context.clientSet, &pausePodConfig{
+		Name:      podName,
+		Namespace: context.ns.Name,
+		Affinity: &v1.Affinity{
+			PodAffinity: &v1.PodAffinity{
+				PreferredDuringSchedulingIgnoredDuringExecution: []v1.WeightedPodAffinityTerm{
+					{
+						PodAffinityTerm: v1.PodAffinityTerm{
+							LabelSelector: &metav1.LabelSelector{
+								MatchExpressions: []metav1.LabelSelectorRequirement{
+									{
+										Key:      labelKey,
+										Operator: metav1.LabelSelectorOpIn,
+										Values:   []string{labelValue, "S3"},
+									},
+									{
+										Key:      labelKey,
+										Operator: metav1.LabelSelectorOpNotIn,
+										Values:   []string{"S2"},
+									}, {
+										Key:      labelKey,
+										Operator: metav1.LabelSelectorOpExists,
+									},
+								},
+							},
+							TopologyKey: topologyKey,
+							Namespaces:  []string{context.ns.Name},
+						},
+						Weight: 50,
+					},
+				},
+			},
+		},
+	})
+	if err != nil {
+		t.Fatalf("Error running pause pod: %v", err)
+	}
+	// The new pod must be scheduled on one of the nodes with the same topology
+	// key-value as the attractor pod.
+	for _, node := range nodesInTopology {
+		if node.Name == pod.Spec.NodeName {
+			t.Logf("Pod %v got successfully scheduled on node %v.", podName, pod.Spec.NodeName)
+			return
+		}
+	}
+	t.Errorf("Pod %v got scheduled on an unexpected node: %v.", podName, pod.Spec.NodeName)
+}