diff --git a/api/v1beta1/conditions.go b/api/v1beta1/conditions.go deleted file mode 100644 index 1b33443f..00000000 --- a/api/v1beta1/conditions.go +++ /dev/null @@ -1,26 +0,0 @@ -package v1beta1 - -import ( - condition "github.com/openstack-k8s-operators/lib-common/modules/common/condition" -) - -// Horizon Condition Types used by API objects. -const ( - // HorizonMemcachedReadyCondition - Indicates the Horizon memcached service is ready to be consumed by Horizon - HorizonMemcachedReadyCondition condition.Type = "HorizonMemcachedReady" -) - -// Horizon Messages used by API objects. -const ( - // HorizonMemcachedReadyInitMessage - - HorizonMemcachedReadyInitMessage = "Horizon Memcached create not started" - - // HorizonMemcachedReadyMessage - Provides the message to clarify memcached has been provisioned - HorizonMemcachedReadyMessage = "Horizon Memcached instance has been provisioned" - - // HorizonMemcachedReadyWaitingMessage - Provides the message to clarify memcached has not been provisioned - HorizonMemcachedReadyWaitingMessage = "Horizon Memcached instance has not been provisioned" - - // HorizonMemcachedReadyErrorMessage - - HorizonMemcachedReadyErrorMessage = "Horizon Memcached error occurred %s" -) diff --git a/controllers/horizon_controller.go b/controllers/horizon_controller.go index 9165e086..9839a964 100644 --- a/controllers/horizon_controller.go +++ b/controllers/horizon_controller.go @@ -171,11 +171,11 @@ func (r *HorizonReconciler) Reconcile(ctx context.Context, req ctrl.Request) (re instance.Status.Conditions = condition.Conditions{} cl := condition.CreateList( - condition.UnknownCondition(condition.ExposeServiceReadyCondition, condition.InitReason, condition.ExposeServiceReadyInitMessage), condition.UnknownCondition(condition.InputReadyCondition, condition.InitReason, condition.InputReadyInitMessage), + condition.UnknownCondition(condition.MemcachedReadyCondition, condition.InitReason, condition.MemcachedReadyInitMessage), condition.UnknownCondition(condition.ServiceConfigReadyCondition, condition.InitReason, condition.ServiceConfigReadyInitMessage), + condition.UnknownCondition(condition.ExposeServiceReadyCondition, condition.InitReason, condition.ExposeServiceReadyInitMessage), condition.UnknownCondition(condition.DeploymentReadyCondition, condition.InitReason, condition.DeploymentReadyInitMessage), - condition.UnknownCondition(horizonv1beta1.HorizonMemcachedReadyCondition, condition.InitReason, horizonv1beta1.HorizonMemcachedReadyInitMessage), // service account, role, rolebinding conditions condition.UnknownCondition(condition.ServiceAccountReadyCondition, condition.InitReason, condition.ServiceAccountReadyInitMessage), condition.UnknownCondition(condition.RoleReadyCondition, condition.InitReason, condition.RoleReadyInitMessage), @@ -384,32 +384,32 @@ func (r *HorizonReconciler) reconcileNormal(ctx context.Context, instance *horiz if err != nil { if k8s_errors.IsNotFound(err) { instance.Status.Conditions.Set(condition.FalseCondition( - horizonv1beta1.HorizonMemcachedReadyCondition, + condition.MemcachedReadyCondition, condition.RequestedReason, condition.SeverityInfo, - horizonv1beta1.HorizonMemcachedReadyWaitingMessage)) + condition.MemcachedReadyWaitingMessage)) return ctrl.Result{RequeueAfter: time.Duration(10) * time.Second}, fmt.Errorf("memcached %s not found", instance.Spec.MemcachedInstance) } instance.Status.Conditions.Set(condition.FalseCondition( - horizonv1beta1.HorizonMemcachedReadyCondition, + condition.MemcachedReadyCondition, condition.ErrorReason, condition.SeverityWarning, - horizonv1beta1.HorizonMemcachedReadyErrorMessage, + condition.MemcachedReadyErrorMessage, err.Error())) return ctrl.Result{}, err } if !memcached.IsReady() { instance.Status.Conditions.Set(condition.FalseCondition( - horizonv1beta1.HorizonMemcachedReadyCondition, + condition.MemcachedReadyCondition, condition.RequestedReason, condition.SeverityInfo, - horizonv1beta1.HorizonMemcachedReadyWaitingMessage)) + condition.MemcachedReadyWaitingMessage)) return ctrl.Result{RequeueAfter: time.Duration(10) * time.Second}, fmt.Errorf("memcached %s is not ready", memcached.Name) } // Mark the Memcached Service as Ready if we get to this point with no errors instance.Status.Conditions.MarkTrue( - horizonv1beta1.HorizonMemcachedReadyCondition, horizonv1beta1.HorizonMemcachedReadyMessage) + condition.MemcachedReadyCondition, condition.MemcachedReadyMessage) // run check memcached - end // diff --git a/tests/functional/horizon_controller_test.go b/tests/functional/horizon_controller_test.go index 03554d8c..70338e60 100644 --- a/tests/functional/horizon_controller_test.go +++ b/tests/functional/horizon_controller_test.go @@ -11,7 +11,6 @@ import ( condition "github.com/openstack-k8s-operators/lib-common/modules/common/condition" . "github.com/openstack-k8s-operators/lib-common/modules/common/test/helpers" - horizonv1 "github.com/openstack-k8s-operators/horizon-operator/api/v1beta1" memcachedv1 "github.com/openstack-k8s-operators/infra-operator/apis/memcached/v1beta1" ) @@ -75,10 +74,10 @@ var _ = Describe("Horizon controller", func() { ) for _, cond := range []condition.Type{ + condition.MemcachedReadyCondition, condition.ServiceConfigReadyCondition, condition.ExposeServiceReadyCondition, condition.DeploymentReadyCondition, - horizonv1.HorizonMemcachedReadyCondition, } { th.ExpectCondition( horizonName, @@ -112,7 +111,7 @@ var _ = Describe("Horizon controller", func() { th.ExpectCondition( horizonName, ConditionGetterFunc(HorizonConditionGetter), - horizonv1.HorizonMemcachedReadyCondition, + condition.MemcachedReadyCondition, corev1.ConditionFalse, ) th.ExpectCondition( @@ -145,7 +144,7 @@ var _ = Describe("Horizon controller", func() { th.ExpectCondition( horizonName, ConditionGetterFunc(HorizonConditionGetter), - horizonv1.HorizonMemcachedReadyCondition, + condition.MemcachedReadyCondition, corev1.ConditionTrue, ) th.ExpectCondition(