Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Reset Ready condition when update failed #11

Merged
merged 1 commit into from
Aug 11, 2023
Merged

Reset Ready condition when update failed #11

Show file tree
Hide file tree
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
5 changes: 2 additions & 3 deletions api/v1beta1/barbican_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,10 +101,9 @@ type Barbican struct {
Status BarbicanStatus `json:"status,omitempty"`
}

// IsReady returns true when both API and Worker are ready
// IsReady - returns true if Barbican is reconciled successfully
func (instance Barbican) IsReady() bool {
return instance.Status.Conditions.IsTrue(BarbicanAPIReadyCondition) &&
instance.Status.Conditions.IsTrue(BarbicanWorkerReadyCondition)
return instance.Status.Conditions.IsTrue(condition.ReadyCondition)
}

//+kubebuilder:object:root=true
Expand Down
15 changes: 11 additions & 4 deletions controllers/barbican_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,11 +92,18 @@ func (r *BarbicanReconciler) Reconcile(ctx context.Context, req ctrl.Request) (r

// Always patch the instance status when exiting this function so we can persist any changes.
defer func() {
// update the overall status condition if service is ready
if instance.IsReady() {
instance.Status.Conditions.MarkTrue(condition.ReadyCondition, condition.ReadyMessage)
// update the Ready condition based on the sub conditions
if instance.Status.Conditions.AllSubConditionIsTrue() {
instance.Status.Conditions.MarkTrue(
condition.ReadyCondition, condition.ReadyMessage)
} else {
// something is not ready so reset the Ready condition
instance.Status.Conditions.MarkUnknown(
condition.ReadyCondition, condition.InitReason, condition.ReadyInitMessage)
// and recalculate it based on the state of the rest of the conditions
instance.Status.Conditions.Set(
instance.Status.Conditions.Mirror(condition.ReadyCondition))
}

err := helper.PatchInstance(ctx, instance)
if err != nil {
_err = err
Expand Down