From e5c45a74ce3436c33a3e79fc2fa3a5989c83c678 Mon Sep 17 00:00:00 2001 From: Andrew Bays Date: Mon, 20 Nov 2023 17:48:45 +0000 Subject: [PATCH] Remove unused 'DeploymentReady' condition from Cinder status --- controllers/cinder_controller.go | 1 - test/functional/cinder_controller_test.go | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/controllers/cinder_controller.go b/controllers/cinder_controller.go index 8557dc2a..8e849407 100644 --- a/controllers/cinder_controller.go +++ b/controllers/cinder_controller.go @@ -183,7 +183,6 @@ func (r *CinderReconciler) Reconcile(ctx context.Context, req ctrl.Request) (res condition.UnknownCondition(cinderv1beta1.CinderSchedulerReadyCondition, condition.InitReason, cinderv1beta1.CinderSchedulerReadyInitMessage), condition.UnknownCondition(cinderv1beta1.CinderBackupReadyCondition, condition.InitReason, cinderv1beta1.CinderBackupReadyInitMessage), condition.UnknownCondition(cinderv1beta1.CinderVolumeReadyCondition, condition.InitReason, cinderv1beta1.CinderVolumeReadyInitMessage), - condition.UnknownCondition(condition.DeploymentReadyCondition, condition.InitReason, condition.DeploymentReadyInitMessage), condition.UnknownCondition(condition.NetworkAttachmentsReadyCondition, condition.InitReason, condition.NetworkAttachmentsReadyInitMessage), // service account, role, rolebinding conditions condition.UnknownCondition(condition.ServiceAccountReadyCondition, condition.InitReason, condition.ServiceAccountReadyInitMessage), diff --git a/test/functional/cinder_controller_test.go b/test/functional/cinder_controller_test.go index c9c5b95f..52b79b83 100644 --- a/test/functional/cinder_controller_test.go +++ b/test/functional/cinder_controller_test.go @@ -44,7 +44,7 @@ var _ = Describe("Cinder controller", func() { It("initializes the status fields", func() { Eventually(func(g Gomega) { cinder := GetCinder(cinderName) - g.Expect(cinder.Status.Conditions).To(HaveLen(16)) + g.Expect(cinder.Status.Conditions).To(HaveLen(15)) g.Expect(cinder.Status.DatabaseHostname).To(Equal("")) }, timeout*2, interval).Should(Succeed())