Skip to content
This repository was archived by the owner on Sep 9, 2026. It is now read-only.

MGMT-23404: fix flaky Tenant StorageClass test #170

Merged
openshift-merge-bot merged 1 commit into from
Mar 31, 2026
Merged

MGMT-23404: fix flaky Tenant StorageClass test #170

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 18 additions & 20 deletions internal/controller/tenant_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ var _ = Describe("Tenant Controller", func() {
})

It("should transition through all Ready/Progressing phases with conditions", func() {
fakeRecorder := events.NewFakeRecorder(10)
fakeRecorder := events.NewFakeRecorder(100)
controllerReconciler := NewTenantReconciler(testMcManager, "default", mcmanager.LocalCluster)
controllerReconciler.Recorder = fakeRecorder

Expand All @@ -87,7 +87,13 @@ var _ = Describe("Tenant Controller", func() {
}})
return err
}
assertStatus := func(
// reconcileAndAssertStatus re-reconciles on each retry so that
// the controller's informer cache has time to observe recent
// creates / deletes before the assertions are evaluated.
// The reconcile error is intentionally ignored because the
// reconciler may return transient errors (e.g. namespace not
// found) while still correctly setting status conditions.
reconcileAndAssertStatus := func(
expectedPhase v1alpha1.TenantPhaseType,
expectedSC string,
expectedNSStatus metav1.ConditionStatus,
Expand All @@ -96,6 +102,7 @@ var _ = Describe("Tenant Controller", func() {
expectedSCReason string,
) {
Eventually(func(g Gomega) {
_ = doReconcile()
g.Expect(k8sClient.Get(ctx, typeNamespacedName, tenant)).To(Succeed())
g.Expect(tenant.Status.Phase).To(Equal(expectedPhase))
g.Expect(tenant.Status.StorageClass).To(Equal(expectedSC))
Expand Down Expand Up @@ -124,8 +131,7 @@ var _ = Describe("Tenant Controller", func() {

// ── Step 1: no namespace → Progressing, NamespaceReady=False ──────────
By("reconciling when namespace does not exist")
_ = doReconcile()
assertStatus(
reconcileAndAssertStatus(
v1alpha1.TenantPhaseProgressing, "",
metav1.ConditionFalse, v1alpha1.TenantReasonNotFound,
metav1.ConditionFalse, v1alpha1.TenantReasonNotFound,
Expand All @@ -140,8 +146,7 @@ var _ = Describe("Tenant Controller", func() {
DeferCleanup(func() { _ = k8sClient.Delete(ctx, namespace) })

By("reconciling with namespace but no StorageClass")
Expect(doReconcile()).NotTo(HaveOccurred())
assertStatus(
reconcileAndAssertStatus(
v1alpha1.TenantPhaseProgressing, "",
metav1.ConditionTrue, v1alpha1.TenantReasonFound,
metav1.ConditionFalse, v1alpha1.TenantReasonNotFound,
Expand All @@ -159,8 +164,7 @@ var _ = Describe("Tenant Controller", func() {
Expect(k8sClient.Create(ctx, defaultSC)).To(Succeed())
DeferCleanup(func() { _ = k8sClient.Delete(ctx, defaultSC) })

Expect(doReconcile()).NotTo(HaveOccurred())
assertStatus(
reconcileAndAssertStatus(
v1alpha1.TenantPhaseReady, "shared-default-sc",
metav1.ConditionTrue, v1alpha1.TenantReasonFound,
metav1.ConditionTrue, v1alpha1.TenantReasonSharedDefault,
Expand All @@ -178,8 +182,7 @@ var _ = Describe("Tenant Controller", func() {
Expect(k8sClient.Create(ctx, tenantSC)).To(Succeed())
DeferCleanup(func() { _ = k8sClient.Delete(ctx, tenantSC) })

Expect(doReconcile()).NotTo(HaveOccurred())
assertStatus(
reconcileAndAssertStatus(
v1alpha1.TenantPhaseReady, resourceName+"-sc",
metav1.ConditionTrue, v1alpha1.TenantReasonFound,
metav1.ConditionTrue, v1alpha1.TenantReasonFound,
Expand All @@ -197,8 +200,7 @@ var _ = Describe("Tenant Controller", func() {
Expect(k8sClient.Create(ctx, extraSC)).To(Succeed())
DeferCleanup(func() { _ = k8sClient.Delete(ctx, extraSC) })

Expect(doReconcile()).NotTo(HaveOccurred())
assertStatus(
reconcileAndAssertStatus(
v1alpha1.TenantPhaseProgressing, "",
metav1.ConditionTrue, v1alpha1.TenantReasonFound,
metav1.ConditionFalse, v1alpha1.TenantReasonMultipleFound,
Expand All @@ -218,8 +220,7 @@ var _ = Describe("Tenant Controller", func() {
By("removing the extra tenant StorageClass")
Expect(k8sClient.Delete(ctx, extraSC)).To(Succeed())

Expect(doReconcile()).NotTo(HaveOccurred())
assertStatus(
reconcileAndAssertStatus(
v1alpha1.TenantPhaseReady, resourceName+"-sc",
metav1.ConditionTrue, v1alpha1.TenantReasonFound,
metav1.ConditionTrue, v1alpha1.TenantReasonFound,
Expand All @@ -229,8 +230,7 @@ var _ = Describe("Tenant Controller", func() {
By("removing the tenant-specific StorageClass")
Expect(k8sClient.Delete(ctx, tenantSC)).To(Succeed())

Expect(doReconcile()).NotTo(HaveOccurred())
assertStatus(
reconcileAndAssertStatus(
v1alpha1.TenantPhaseReady, "shared-default-sc",
metav1.ConditionTrue, v1alpha1.TenantReasonFound,
metav1.ConditionTrue, v1alpha1.TenantReasonSharedDefault,
Expand All @@ -240,8 +240,7 @@ var _ = Describe("Tenant Controller", func() {
By("removing the shared Default StorageClass")
Expect(k8sClient.Delete(ctx, defaultSC)).To(Succeed())

Expect(doReconcile()).NotTo(HaveOccurred())
assertStatus(
reconcileAndAssertStatus(
v1alpha1.TenantPhaseProgressing, "",
metav1.ConditionTrue, v1alpha1.TenantReasonFound,
metav1.ConditionFalse, v1alpha1.TenantReasonNotFound,
Expand All @@ -268,8 +267,7 @@ var _ = Describe("Tenant Controller", func() {
Expect(k8sClient.Create(ctx, defaultSC2)).To(Succeed())
DeferCleanup(func() { _ = k8sClient.Delete(ctx, defaultSC2) })

Expect(doReconcile()).NotTo(HaveOccurred())
assertStatus(
reconcileAndAssertStatus(
v1alpha1.TenantPhaseProgressing, "",
metav1.ConditionTrue, v1alpha1.TenantReasonFound,
metav1.ConditionFalse, v1alpha1.TenantReasonMultipleDefaultsFound,
Expand Down
Loading