Skip to content

Commit 1441ebe

Browse files
committed
Fix waiting test
1 parent c113e01 commit 1441ebe

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

internal/controller/operator/factory/vmdistributedcluster/vmdistributedcluster.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ func CreateOrUpdate(ctx context.Context, cr *vmv1alpha1.VMDistributedCluster, rc
114114
if err := rclient.Status().Update(ctx, cr); err != nil {
115115
return fmt.Errorf("failed to update status: %w", err)
116116
}
117-
return fmt.Errorf("unexpected generations or zones config change detected: %w", errors.New("unexpected generations or zones config change detected"))
117+
return fmt.Errorf("unexpected generations or zones config change detected: unexpected generations or zones config change detected")
118118
}
119119

120120
// TODO[vrutkovs]: Mark all VMClusters as paused?

test/e2e/vmdistributedcluster_test.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -546,6 +546,9 @@ var _ = Describe("e2e vmdistributedcluster", Label("vm", "vmdistributedcluster")
546546
cr.Spec.Zones[0].OverrideSpec = &apiextensionsv1.JSON{
547547
Raw: []byte(fmt.Sprintf(`{"clusterVersion": "%s"}`, updateVersion)),
548548
}
549+
cr.Spec.Zones[1].OverrideSpec = &apiextensionsv1.JSON{
550+
Raw: []byte(fmt.Sprintf(`{"clusterVersion": "%s"}`, updateVersion)),
551+
}
549552
Expect(k8sClient.Update(ctx, cr)).To(Succeed())
550553
// Wait for VMDistributedCluster to become operational after its own upgrade
551554
Eventually(func() error {

0 commit comments

Comments
 (0)