From 24d27d64a516023a2bd76e4dd35eed00a942e963 Mon Sep 17 00:00:00 2001
From: Stephen Benjamin <stephen@redhat.com>
Date: Tue, 12 Mar 2024 09:57:54 -0400
Subject: [PATCH] OCPBUGS-30604: fix panic on non-standard node-role labels

There was a second copy of the nodeRoles function that has the same
problem, where non-standard format of the node-role label in ROSA causes
a panic.

See 330feda5d5a2aecfec7ec14f42024cd656cf3fd3.

I would refactor this to move the function to util and share it between
both, but for backportability I fixed it in-place.
---
 .../testframework/watchevents/event.go            | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/pkg/monitortests/testframework/watchevents/event.go b/pkg/monitortests/testframework/watchevents/event.go
index edc9b5ba9eca..a0e3aa5c5ae9 100644
--- a/pkg/monitortests/testframework/watchevents/event.go
+++ b/pkg/monitortests/testframework/watchevents/event.go
@@ -9,10 +9,10 @@ import (
 	"time"
 
 	v1 "github.com/openshift/api/config/v1"
-	"github.com/openshift/origin/pkg/monitortestlibrary/pathologicaleventlibrary"
 	"github.com/sirupsen/logrus"
 
-	"github.com/openshift/origin/pkg/monitor/monitorapi"
+	"github.com/openshift/origin/pkg/monitortestlibrary/pathologicaleventlibrary"
+
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/fields"
@@ -20,6 +20,8 @@ import (
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/cache"
+
+	"github.com/openshift/origin/pkg/monitor/monitorapi"
 )
 
 var reMatchFirstQuote = regexp.MustCompile(`"([^"]+)"( in (\d+(\.\d+)?(s|ms)$))?`)
@@ -244,11 +246,16 @@ func eventForContainer(fieldPath string) (string, bool) {
 }
 
 func nodeRoles(node *corev1.Node) string {
-	const roleLabel = "node-role.kubernetes.io"
+	const roleLabel = "node-role.kubernetes.io/"
 	var roles []string
 	for label := range node.Labels {
 		if strings.Contains(label, roleLabel) {
-			roles = append(roles, label[len(roleLabel)+1:])
+			role := label[len(roleLabel):]
+			if role == "" {
+				logrus.Warningf("ignoring blank role label %s", roleLabel)
+				continue
+			}
+			roles = append(roles, role)
 		}
 	}