Merge pull request #28584 from jcpowermac/ignore-aws-edge-workers

SPLAT-1439: Ignore edge workers when listing nodes
openshift · May 16, 2024 · 6c5f551 · 6c5f551
2 parents 548b00c + 1ef11b5
commit 6c5f551
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 16 deletions.
diff --git a/test/extended/image_ecosystem/helper.go b/test/extended/image_ecosystem/helper.go
@@ -15,6 +15,8 @@ import (
 	exutil "github.com/openshift/origin/test/extended/util"
 )
 
+const nodeLabelSelectorWorker = "node-role.kubernetes.io/worker,!node-role.kubernetes.io/edge"
+
 // RunInPodContainer will run provided command in the specified pod container.
 func RunInPodContainer(oc *exutil.CLI, selector labels.Selector, cmd []string) error {
 	pods, err := exutil.WaitForPods(oc.KubeClient().CoreV1().Pods(oc.Namespace()), selector, exutil.CheckPodIsRunning, 1, 4*time.Minute)

diff --git a/test/extended/image_ecosystem/s2i_perl.go b/test/extended/image_ecosystem/s2i_perl.go
@@ -18,7 +18,7 @@ import (
 )
 
 func archHasModPerl(oc *exutil.CLI) bool {
-	workerNodes, err := oc.AsAdmin().KubeClient().CoreV1().Nodes().List(context.Background(), metav1.ListOptions{LabelSelector: "node-role.kubernetes.io/worker"})
+	workerNodes, err := oc.AsAdmin().KubeClient().CoreV1().Nodes().List(context.Background(), metav1.ListOptions{LabelSelector: nodeLabelSelectorWorker})
 	if err != nil {
 		e2e.Logf("problem getting nodes for arch check: %s", err)
 	}

diff --git a/test/extended/image_ecosystem/scl.go b/test/extended/image_ecosystem/scl.go
@@ -22,7 +22,7 @@ import (
 
 func skipArch(oc *exutil.CLI, arches []string) bool {
 	allWorkerNodes, err := oc.AsAdmin().KubeClient().CoreV1().Nodes().List(context.Background(), metav1.ListOptions{
-		LabelSelector: "node-role.kubernetes.io/worker",
+		LabelSelector: nodeLabelSelectorWorker,
 	})
 	if err != nil {
 		e2e.Logf("problem getting nodes for arch check: %s", err)

diff --git a/test/extended/networking/egressip_helpers.go b/test/extended/networking/egressip_helpers.go
@@ -18,12 +18,6 @@ import (
 	"time"
 
 	"github.com/google/uuid"
-	configv1 "github.com/openshift/api/config/v1"
-	networkv1 "github.com/openshift/api/network/v1"
-	routev1 "github.com/openshift/api/route/v1"
-	cloudnetwork "github.com/openshift/client-go/cloudnetwork/clientset/versioned"
-	networkclient "github.com/openshift/client-go/network/clientset/versioned/typed/network/v1"
-	exutil "github.com/openshift/origin/test/extended/util"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	v1 "k8s.io/api/core/v1"
@@ -39,6 +33,13 @@ import (
 	"k8s.io/kubernetes/test/e2e/framework"
 	frameworkpod "k8s.io/kubernetes/test/e2e/framework/pod"
 
+	configv1 "github.com/openshift/api/config/v1"
+	networkv1 "github.com/openshift/api/network/v1"
+	routev1 "github.com/openshift/api/route/v1"
+	cloudnetwork "github.com/openshift/client-go/cloudnetwork/clientset/versioned"
+	networkclient "github.com/openshift/client-go/network/clientset/versioned/typed/network/v1"
+	exutil "github.com/openshift/origin/test/extended/util"
+
 	imageutils "k8s.io/kubernetes/test/utils/image"
 )
 
@@ -156,7 +157,7 @@ func getWorkerNodesOrdered(clientset kubernetes.Interface) ([]corev1.Node, error
 	nodes, err := clientset.CoreV1().Nodes().List(
 		context.TODO(),
 		metav1.ListOptions{
-			LabelSelector: "node-role.kubernetes.io/worker=",
+			LabelSelector: nodeLabelSelectorWorker,
 		})
 	if err != nil {
 		return nil, err

diff --git a/test/extended/pods/graceful-shutdown.go b/test/extended/pods/graceful-shutdown.go
@@ -26,12 +26,13 @@ import (
 )
 
 const (
-	successPodName     = "success-grace-period-pod"
-	errorPodName       = "error-grace-period-pod"
-	namespace          = "graceful-shutdown-testbed"
-	serviceAccountName = "graceful-shutdown"
-	hostPath           = "/var/graceful-shutdown"
-	nodeReadyTimeout   = 15 * time.Minute
+	successPodName          = "success-grace-period-pod"
+	errorPodName            = "error-grace-period-pod"
+	namespace               = "graceful-shutdown-testbed"
+	serviceAccountName      = "graceful-shutdown"
+	hostPath                = "/var/graceful-shutdown"
+	nodeReadyTimeout        = 15 * time.Minute
+	nodeLabelSelectorWorker = "node-role.kubernetes.io/worker,!node-role.kubernetes.io/edge"
 )
 
 var (
@@ -90,7 +91,7 @@ var _ = Describe("[sig-node][Disruptive][Feature:KubeletGracefulShutdown]", func
 		createTestBed(ctx, oc)
 
 		By("getting first worker node", func() {
-			nodes, err := oc.KubeClient().CoreV1().Nodes().List(ctx, metav1.ListOptions{LabelSelector: "node-role.kubernetes.io/worker="})
+			nodes, err := oc.KubeClient().CoreV1().Nodes().List(ctx, metav1.ListOptions{LabelSelector: nodeLabelSelectorWorker})
 			Expect(err).NotTo(HaveOccurred())
 			Expect(nodes.Items).NotTo(HaveLen(0))
 			node = &nodes.Items[0]