degraded TNF testing - pdb + MCO reboot validation

test/extended/two_node/common.go

@@ -4,11 +4,14 @@ import (
 	"context"
 	"fmt"
 
+	g "github.com/onsi/ginkgo/v2"
+	o "github.com/onsi/gomega"
 	v1 "github.com/openshift/api/config/v1"
 	"github.com/openshift/origin/test/extended/util"
 	exutil "github.com/openshift/origin/test/extended/util"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/client-go/kubernetes"
 	e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper"
 )
 
@@ -54,3 +57,90 @@ func hasNodeRebooted(oc *util.CLI, node *corev1.Node) (bool, error) {
 		return n.Status.NodeInfo.BootID != node.Status.NodeInfo.BootID, nil
 	}
 }
+
+func ensureTNFDegradedOrSkip(oc *exutil.CLI) {
+	skipIfNotTopology(oc, v1.DualReplicaTopologyMode)
+
+	ctx := context.Background()
+	kubeClient := oc.AdminKubeClient()
+
+	masters, err := listControlPlaneNodes(ctx, kubeClient)
+	o.Expect(err).NotTo(o.HaveOccurred(), "failed to list control-plane nodes")
+
+	if len(masters) != 2 {
+		g.Skip(fmt.Sprintf(
+			"TNF degraded tests expect exactly 2 control-plane nodes, found %d",
+			len(masters),
+		))
+	}
+
+	readyCount := countReadyNodes(masters)
+	if readyCount != 1 {
+		g.Skip(fmt.Sprintf(
+			"cluster is not in TNF degraded mode (expected exactly 1 Ready master, got %d)",
+			readyCount,
+		))
+	}
+}
+
+func listControlPlaneNodes(ctx context.Context, client kubernetes.Interface) ([]corev1.Node, error) {
+	nodes, err := client.CoreV1().Nodes().List(ctx, metav1.ListOptions{
+		LabelSelector: "node-role.kubernetes.io/master",
+	})
+	if err != nil {
+		return nil, err
+	}
+	if len(nodes.Items) > 0 {
+		return nodes.Items, nil
+	}
+
+	nodes, err = client.CoreV1().Nodes().List(ctx, metav1.ListOptions{
+		LabelSelector: "node-role.kubernetes.io/control-plane",
+	})
+	if err != nil {
+		return nil, err
+	}
+	return nodes.Items, nil
+}
+
+func countReadyNodes(nodes []corev1.Node) int {
+	ready := 0
+	for _, n := range nodes {
+		for _, cond := range n.Status.Conditions {
+			if cond.Type == corev1.NodeReady && cond.Status == corev1.ConditionTrue {
+				ready++
+				break
+			}
+		}
+	}
+	return ready
+}
+
+func getReadyMasterNode(
+	ctx context.Context,
+	client kubernetes.Interface,
+) (*corev1.Node, error) {
+	nodes, err := client.CoreV1().Nodes().List(ctx, metav1.ListOptions{
+		LabelSelector: "node-role.kubernetes.io/master=",
+	})
+	if err != nil {
+		return nil, err
+	}
+
+	for i := range nodes.Items {
+		node := &nodes.Items[i]
+		if isNodeReady(node) {
+			return node, nil
+		}
+	}
+	return nil, fmt.Errorf("no Ready master node found")
+}
+
+func isNodeReady(node *corev1.Node) bool {
+	for _, cond := range node.Status.Conditions {
+		if cond.Type == corev1.NodeReady && cond.Status == corev1.ConditionTrue {
+			return true
+		}
+	}
+	return false
+}