Skip to content

Commit fc777e4

Browse files
committed
fixup! [OCTRL-1095] add k3s observability docs
1 parent b8c1927 commit fc777e4

2 files changed

Lines changed: 7 additions & 7 deletions

File tree

control-operator/api/v1alpha1/task_types.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,10 @@ type TaskSpec struct {
8989
}
9090

9191
const (
92-
ConditionPodReady = "PodReady"
93-
ConditionGRPCConnected = "GRPCConnected"
94-
ConditionStateInitialized = "StateInitialized"
95-
ConditionStateTransitioned = "StateTransitioned"
92+
ConditionPodReady = "PodReady"
93+
ConditionGRPCConnected = "GRPCConnected"
94+
ConditionStateAccessible = "StateAccessible"
95+
ConditionStateTransitionResult = "StateTransitionResult"
9696
)
9797

9898
// TaskStatus defines the observed state of Task

control-operator/internal/controller/task_controller.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ func (r *TaskReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.
176176
if err := r.Status().Update(ctx, t); err != nil {
177177
return ctrl.Result{}, err
178178
}
179-
if err := r.recordCondition(ctx, t, aliecsv1alpha1.ConditionStateInitialized, metav1.ConditionTrue, "StateQueried", fmt.Sprintf("Initial state: %s", t.Status.State)); err != nil {
179+
if err := r.recordCondition(ctx, t, aliecsv1alpha1.ConditionStateAccessible, metav1.ConditionTrue, "StateQueried", fmt.Sprintf("Initial state: %s", t.Status.State)); err != nil {
180180
return ctrl.Result{}, err
181181
}
182182
return ctrl.Result{}, nil
@@ -224,7 +224,7 @@ func (r *TaskReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.
224224
if err := r.Status().Update(ctx, t); err != nil {
225225
return ctrl.Result{}, err
226226
}
227-
if err := r.recordCondition(ctx, t, aliecsv1alpha1.ConditionStateTransitioned, metav1.ConditionFalse, "TransitionFailed", fmt.Sprintf("Transition from %s to %s failed: %s", stateReply.GetState(), t.Spec.State, transErr.Error())); err != nil {
227+
if err := r.recordCondition(ctx, t, aliecsv1alpha1.ConditionStateTransitionResult, metav1.ConditionFalse, "TransitionFailed", fmt.Sprintf("Transition from %s to %s failed: %s", stateReply.GetState(), t.Spec.State, transErr.Error())); err != nil {
228228
return ctrl.Result{}, err
229229
}
230230
return ctrl.Result{}, nil
@@ -246,7 +246,7 @@ func (r *TaskReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.
246246
return ctrl.Result{}, err
247247
}
248248
if t.Status.State != oldStatus.State {
249-
if err := r.recordCondition(ctx, t, aliecsv1alpha1.ConditionStateTransitioned, metav1.ConditionTrue, "TransitionComplete", fmt.Sprintf("Transitioned from %s to %s", oldStatus.State, t.Status.State)); err != nil {
249+
if err := r.recordCondition(ctx, t, aliecsv1alpha1.ConditionStateTransitionResult, metav1.ConditionTrue, "TransitionComplete", fmt.Sprintf("Transitioned from %s to %s", oldStatus.State, t.Status.State)); err != nil {
250250
return ctrl.Result{}, err
251251
}
252252
}

0 commit comments

Comments
 (0)