Merge pull request #3117 from chrischdi/pr-test-e2e-clusterclass-roll…

…out-vcsim 🌱 test: enable vcsim for clusterclass rollout test
kubernetes-sigs · Jul 23, 2024 · 9ec3236 · 9ec3236
2 parents 030a53e + 697e984
commit 9ec3236
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/test/e2e/clusterclass_rollout_test.go b/test/e2e/clusterclass_rollout_test.go
@@ -26,7 +26,7 @@ import (
 	"sigs.k8s.io/cluster-api-provider-vsphere/pkg/constants"
 )
 
-var _ = Describe("When testing ClusterClass rollouts [supervisor] [ClusterClass]", func() {
+var _ = Describe("When testing ClusterClass rollouts [vcsim] [supervisor] [ClusterClass]", func() {
 	const specName = "clusterclass-rollouts" // copied from CAPI
 	Setup(specName, func(testSpecificSettingsGetter func() testSettings) {
 		capie2e.ClusterClassRolloutSpec(ctx, func() capie2e.ClusterClassRolloutSpecInput {

diff --git a/test/e2e/e2e_suite_test.go b/test/e2e/e2e_suite_test.go
@@ -24,7 +24,6 @@ import (
 	"path/filepath"
 	"strings"
 	"testing"
-	"time"
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
@@ -209,10 +208,7 @@ var _ = SynchronizedBeforeSuite(func() []byte {
 	vsphereframework.InitBootstrapCluster(ctx, bootstrapClusterProxy, e2eConfig, clusterctlConfigPath, artifactFolder)
 
 	if testTarget == VCSimTestTarget {
-		Byf("Creating a vcsim server")
-		Eventually(func() error {
-			return vspherevcsim.Create(ctx, bootstrapClusterProxy.GetClient())
-		}, time.Minute, 3*time.Second).ShouldNot(HaveOccurred(), "Failed to create VCenterSimulator")
+		createVCSimServer(bootstrapClusterProxy)
 	}
 
 	By("Getting AddressClaim labels")

diff --git a/test/infrastructure/vcsim/controllers/vmbootstrap_controller.go b/test/infrastructure/vcsim/controllers/vmbootstrap_controller.go
@@ -234,8 +234,9 @@ func (r *vmBootstrapReconciler) reconcileBoostrapNode(ctx context.Context, clust
 		Status: corev1.NodeStatus{
 			Conditions: []corev1.NodeCondition{
 				{
-					Type:   corev1.NodeReady,
-					Status: corev1.ConditionTrue,
+					LastTransitionTime: metav1.Now(),
+					Type:               corev1.NodeReady,
+					Status:             corev1.ConditionTrue,
 				},
 			},
 		},