Skip to content

Ensure Ready status first #717

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

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Ensure Ready status first #717

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
160bdf9
Added import statement for v1 rc
miuponn Aug 13, 2025
a36f7a0
Added helper and sanitiser to ensure ready condition always exists an…
miuponn Aug 13, 2025
5236f2a
Updated ManageError and ManageSuccess
miuponn Aug 13, 2025
bac2ccf
Merge branch 'main' into ready-status-priority
miuponn Aug 21, 2025
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
54 changes: 54 additions & 0 deletions utils/reconciler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import (
networkingv1 "k8s.io/api/networking/v1"

"github.com/application-stacks/runtime-component-operator/common"
v1 "github.com/application-stacks/runtime-component-operator/api/v1"
certmanagerv1 "github.com/cert-manager/cert-manager/pkg/apis/certmanager/v1"
certmanagermetav1 "github.com/cert-manager/cert-manager/pkg/apis/meta/v1"
routev1 "github.com/openshift/api/route/v1"
Expand Down Expand Up @@ -279,6 +280,51 @@ func updateReconcileInterval(maxSeconds int, s common.BaseComponentStatus, ba co
return time.Duration(newInterval) * time.Second
}

func (r *ReconcilerBase) ensureReadyExists(ba common.BaseComponent) {
status := ba.GetStatus()

readyExists := false
for _, condition := range status.GetConditions() {
if condition.GetType() == common.StatusConditionTypeReady {
readyExists = true
break
}
}

if !readyExists {
readyCondition := status.NewCondition(common.StatusConditionTypeReady)
readyCondition.SetStatus(corev1.ConditionFalse)
readyCondition.SetReason("Reconciling")
readyCondition.SetMessage("Application is being reconciled")
readyCondition.SetLastTransitionTime(&metav1.Time{Time: time.Now()})
status.SetCondition(readyCondition)
}
}

func (r *ReconcilerBase) sanitizeReadyFirst(ba common.BaseComponent) {
status := ba.GetStatus()
rcs, ok := status.(*v1.RuntimeComponentStatus)
if !ok || len(rcs.Conditions) <= 1 {
return
}

var ready v1.StatusCondition
var others []v1.StatusCondition
for _, c := range rcs.Conditions {
if c.GetType() == common.StatusConditionTypeReady {
ready = c
} else {
others = append(others, c)
}
}

if ready.GetType() == "" || rcs.Conditions[0].GetType() == common.StatusConditionTypeReady {
return
}

rcs.Conditions = append([]v1.StatusCondition{ready}, others...)
}

// ManageError ...
func (r *ReconcilerBase) ManageError(issue error, conditionType common.StatusConditionType, ba common.BaseComponent) (reconcile.Result, error) {
s := ba.GetStatus()
Expand Down Expand Up @@ -325,6 +371,10 @@ func (r *ReconcilerBase) ManageError(issue error, conditionType common.StatusCon
maxSeconds := getMaxReconcileInterval(false)
retryInterval = updateReconcileInterval(maxSeconds, s, ba)
}

// Ensure Ready condition exists before updating status
r.ensureReadyExists(ba)
r.sanitizeReadyFirst(ba)

err := r.UpdateStatus(obj)
if err != nil {
Expand Down Expand Up @@ -383,6 +433,10 @@ func (r *ReconcilerBase) ManageSuccess(conditionType common.StatusConditionType,
retryInterval = updateReconcileInterval(maxSeconds, s, ba)
}
}

// Ensure Ready condition exists before updating status
r.ensureReadyExists(ba)
r.sanitizeReadyFirst(ba)

err := r.UpdateStatus(ba.(client.Object))
if err != nil {
Expand Down