Merge pull request #30494 from eggfoobar/OCPEDGE-1486-cp-node-replacement

OCPEDGE-2082: Added TNF control-plane node replacement test.

Author: openshift-merge-bot[bot]

go.mod

@@ -53,6 +53,7 @@ require (
 	github.com/lestrrat/go-jsschema v0.0.0-20181205002244-5c81c58ffcc3
 	github.com/lithammer/dedent v1.1.0
 	github.com/mattn/go-sqlite3 v1.14.30
+	github.com/metal3-io/baremetal-operator/apis v0.11.0-alpha.0
 	github.com/metallb/frr-k8s v0.0.15
 	github.com/microsoftgraph/msgraph-sdk-go v1.81.0
 	github.com/onsi/ginkgo/v2 v2.23.3

go.sum

@@ -725,6 +725,8 @@ github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWE
 github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 github.com/mattn/go-sqlite3 v1.14.30 h1:bVreufq3EAIG1Quvws73du3/QgdeZ3myglJlrzSYYCY=
 github.com/mattn/go-sqlite3 v1.14.30/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
+github.com/metal3-io/baremetal-operator/apis v0.11.0-alpha.0 h1:DMdk7yuxgLXGTL+HmUNHzm8WyZaZGkSFxxdXJjWq6IU=
+github.com/metal3-io/baremetal-operator/apis v0.11.0-alpha.0/go.mod h1:TB7T7qAumrfrY/TCSuHvKtpEOLGw9QjnG43ez3vX14g=
 github.com/metallb/frr-k8s v0.0.15 h1:6M3UGhovX1EFoaSGjrRD7djUAx3w2I+g81FH8OVtHkM=
 github.com/metallb/frr-k8s v0.0.15/go.mod h1:TjrGoAf+v00hYGlI8jUdyDxY5udMAOs2GWwrvLWnA4E=
 github.com/microsoft/kiota-abstractions-go v1.9.3 h1:cqhbqro+VynJ7kObmo7850h3WN2SbvoyhypPn8uJ1SE=

test/extended/testdata/bindata.go

@@ -0,0 +1,27 @@
+apiVersion: metal3.io/v1alpha1
+kind: BareMetalHost
+metadata:
+  finalizers:
+  - baremetalhost.metal3.io
+  labels:
+    installer.openshift.io/role: control-plane
+  name: {BMH_NAME}
+  namespace: openshift-machine-api
+spec:
+  architecture: x86_64
+  automatedCleaningMode: metadata
+  bmc:
+    address: redfish+https://{REDFISH_IP}:8000/redfish/v1/Systems/{UUID}
+    credentialsName: {CREDENTIALS_NAME}
+    disableCertificateVerification: true
+  bootMACAddress: {BOOT_MAC_ADDRESS}
+  bootMode: UEFI
+  customDeploy:
+    method: install_coreos
+  hardwareProfile: unknown
+  online: true
+  rootDeviceHints:
+    deviceName: /dev/sda
+  userData:
+    name: master-user-data-managed
+    namespace: openshift-machine-api

test/extended/testdata/two_node/baremetalhost-template.yaml

@@ -0,0 +1,30 @@
+apiVersion: machine.openshift.io/v1beta1
+kind: Machine
+metadata:
+  annotations:
+    metal3.io/BareMetalHost: openshift-machine-api/{BMH_NAME}
+  finalizers:
+  - machine.machine.openshift.io
+  labels:
+    machine.openshift.io/cluster-api-cluster: ostest-{MACHINE_HASH}
+    machine.openshift.io/cluster-api-machine-role: master
+    machine.openshift.io/cluster-api-machine-type: master
+  name: {MACHINE_NAME}
+  namespace: openshift-machine-api
+spec:
+  authoritativeAPI: MachineAPI
+  metadata: {}
+  providerSpec:
+    value:
+      apiVersion: baremetal.cluster.k8s.io/v1alpha1
+      customDeploy:
+        method: install_coreos
+      hostSelector: {}
+      image:
+        checksum: ""
+        url: ""
+      kind: BareMetalMachineProviderSpec
+      metadata:
+        creationTimestamp: null
+      userData:
+        name: master-user-data-managed

test/extended/testdata/two_node/machine-template.yaml

@@ -10,6 +10,7 @@ import (
 	o "github.com/onsi/gomega"
 
 	v1 "github.com/openshift/api/config/v1"
+	"github.com/openshift/origin/test/extended/two_node/utils"
 	exutil "github.com/openshift/origin/test/extended/util"
 	"github.com/openshift/origin/test/extended/util/image"
 	appv1 "k8s.io/api/apps/v1"
@@ -40,7 +41,7 @@ var _ = g.Describe("[sig-node][apigroup:config.openshift.io][OCPFeatureGate:High
 	oc := exutil.NewCLIWithoutNamespace("")
 
 	g.BeforeEach(func() {
-		skipIfNotTopology(oc, v1.HighlyAvailableArbiterMode)
+		utils.SkipIfNotTopology(oc, v1.HighlyAvailableArbiterMode)
 	})
 
 	g.It("Should validate that there are Master and Arbiter nodes as specified in the cluster", func() {
@@ -51,15 +52,11 @@ var _ = g.Describe("[sig-node][apigroup:config.openshift.io][OCPFeatureGate:High
 			expectedMasterNodes  = 2
 			expectedArbiterNodes = 1
 		)
-		masterNodes, err := oc.AdminKubeClient().CoreV1().Nodes().List(context.Background(), metav1.ListOptions{
-			LabelSelector: labelNodeRoleMaster,
-		})
+		masterNodes, err := utils.GetNodes(oc, utils.LabelNodeRoleControlPlane)
 		o.Expect(err).To(o.BeNil(), "Expected to retrieve Master nodes without error")
 		o.Expect(len(masterNodes.Items)).To(o.Equal(expectedMasterNodes))
 
-		arbiterNodes, err := oc.AdminKubeClient().CoreV1().Nodes().List(context.Background(), metav1.ListOptions{
-			LabelSelector: labelNodeRoleArbiter,
-		})
+		arbiterNodes, err := utils.GetNodes(oc, utils.LabelNodeRoleArbiter)
 		o.Expect(err).To(o.BeNil(), "Expected to retrieve Arbiter nodes without error")
 		o.Expect(len(arbiterNodes.Items)).To(o.Equal(expectedArbiterNodes))
 	})
@@ -71,13 +68,11 @@ var _ = g.Describe("[sig-node][apigroup:config.openshift.io][OCPFeatureGate:High
 	oc := exutil.NewCLIWithoutNamespace("")
 
 	g.BeforeEach(func() {
-		skipIfNotTopology(oc, v1.HighlyAvailableArbiterMode)
+		utils.SkipIfNotTopology(oc, v1.HighlyAvailableArbiterMode)
 	})
 	g.It("Should verify that the correct number of pods are running on the Arbiter node", func() {
 		g.By("Retrieving the Arbiter node name")
-		nodes, err := oc.AdminKubeClient().CoreV1().Nodes().List(context.Background(), metav1.ListOptions{
-			LabelSelector: labelNodeRoleArbiter,
-		})
+		nodes, err := utils.GetNodes(oc, utils.LabelNodeRoleArbiter)
 		o.Expect(err).To(o.BeNil(), "Expected to retrieve nodes without error")
 		o.Expect(len(nodes.Items)).To(o.Equal(1))
 		g.By("by comparing pod counts")
@@ -102,7 +97,7 @@ var _ = g.Describe("[sig-apps][apigroup:apps.openshift.io][OCPFeatureGate:Highly
 
 	oc := exutil.NewCLI("arbiter-pod-validation").SetManagedNamespace().AsAdmin()
 	g.BeforeEach(func() {
-		skipIfNotTopology(oc, v1.HighlyAvailableArbiterMode)
+		utils.SkipIfNotTopology(oc, v1.HighlyAvailableArbiterMode)
 	})
 
 	g.It("should be created on arbiter nodes when arbiter node is selected", func() {
@@ -112,7 +107,7 @@ var _ = g.Describe("[sig-apps][apigroup:apps.openshift.io][OCPFeatureGate:Highly
 		defer cancel()
 		err := wait.PollUntilContextTimeout(ctx, 5*time.Second, 300*time.Second, true, func(ctx context.Context) (done bool, err error) {
 			arbiterNodes, err := oc.AdminKubeClient().CoreV1().Nodes().List(context.Background(), metav1.ListOptions{
-				LabelSelector: labelNodeRoleArbiter,
+				LabelSelector: utils.LabelNodeRoleArbiter,
 			})
 			if kapierror.IsTimeout(err) {
 				return false, nil
@@ -154,7 +149,7 @@ var _ = g.Describe("[sig-apps][apigroup:apps.openshift.io][OCPFeatureGate:Highly
 		ctx := context.Background()
 		g.By("Retrieving Master nodes")
 		masterNodes, err := oc.AdminKubeClient().CoreV1().Nodes().List(ctx, metav1.ListOptions{
-			LabelSelector: labelNodeRoleMaster,
+			LabelSelector: utils.LabelNodeRoleControlPlane,
 		})
 		o.Expect(err).To(o.BeNil(), "Expected to retrieve Master nodes without error")
 		o.Expect(len(masterNodes.Items)).To(o.Equal(2), "Expected to find two Master nodes")
@@ -197,13 +192,13 @@ var _ = g.Describe("[sig-apps][apigroup:apps.openshift.io][OCPFeatureGate:Highly
 	oc := exutil.NewCLI("daemonset-pod-validation").SetManagedNamespace().AsAdmin()
 
 	g.BeforeEach(func() {
-		skipIfNotTopology(oc, v1.HighlyAvailableArbiterMode)
+		utils.SkipIfNotTopology(oc, v1.HighlyAvailableArbiterMode)
 	})
 
 	g.It("should not create a DaemonSet on the Arbiter node", func() {
 		g.By("Retrieving the Arbiter node")
 		arbiterNodes, err := oc.AdminKubeClient().CoreV1().Nodes().List(context.Background(), metav1.ListOptions{
-			LabelSelector: labelNodeRoleArbiter,
+			LabelSelector: utils.LabelNodeRoleArbiter,
 		})
 		o.Expect(err).To(o.BeNil(), "Expected to retrieve Arbiter node without error")
 		o.Expect(len(arbiterNodes.Items)).To(o.BeNumerically(">", 0), "Expected at least one Arbiter node")
@@ -247,7 +242,7 @@ var _ = g.Describe("[sig-etcd][apigroup:config.openshift.io][OCPFeatureGate:High
 	oc := exutil.NewCLIWithoutNamespace("").AsAdmin()
 
 	g.BeforeEach(func() {
-		skipIfNotTopology(oc, v1.HighlyAvailableArbiterMode)
+		utils.SkipIfNotTopology(oc, v1.HighlyAvailableArbiterMode)
 	})
 
 	g.It("should have all etcd pods running and quorum met", func() {
@@ -276,8 +271,8 @@ var _ = g.Describe("[sig-etcd][apigroup:config.openshift.io][OCPFeatureGate:High
 		o.Expect(err).To(o.BeNil(), "Expected to retrieve etcd ClusterOperator without error")
 
 		g.By("Verifying ClusterOperator conditions for Availability and Degradation")
-		o.Expect(isClusterOperatorAvailable(etcdOperator)).To(o.BeTrue(), "Expected etcd operator to be available, indicating quorum is met")
-		o.Expect(isClusterOperatorDegraded(etcdOperator)).To(o.BeFalse(), "Expected etcd operator not to be degraded")
+		o.Expect(utils.IsClusterOperatorAvailable(etcdOperator)).To(o.BeTrue(), "Expected etcd operator to be available, indicating quorum is met")
+		o.Expect(utils.IsClusterOperatorDegraded(etcdOperator)).To(o.BeFalse(), "Expected etcd operator not to be degraded")
 	})
 })