Skip to content

drop autopilotExempt annotation #221

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

Merged
merged 1 commit into from
Jul 30, 2024
Merged

drop autopilotExempt annotation #221

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
1 change: 0 additions & 1 deletion api/v1beta2/appwrapper_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,6 @@ const (
SuccessTTLAnnotation = "workload.codeflare.dev.appwrapper/successTTLDuration"
TerminalExitCodesAnnotation = "workload.codeflare.dev.appwrapper/terminalExitCodes"
RetryableExitCodesAnnotation = "workload.codeflare.dev.appwrapper/retryableExitCodes"
AutopilotExemptAnnotation = "workload.codeflare.dev.appwrapper/autopilotExempt"
)

//+kubebuilder:object:root=true
Expand Down
13 changes: 1 addition & 12 deletions internal/controller/appwrapper/appwrapper_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -521,7 +521,7 @@ func (r *AppWrapperReconciler) getPodStatus(ctx context.Context, aw *workloadv1b
return nil, err
}
summary := &podStatusSummary{expected: pc}
checkUnhealthyNodes := r.Config.Autopilot != nil && r.Config.Autopilot.MonitorNodes && !r.isAutopilotExempt(ctx, aw)
checkUnhealthyNodes := r.Config.Autopilot != nil && r.Config.Autopilot.MonitorNodes

for _, pod := range pods.Items {
switch pod.Status.Phase {
Expand Down Expand Up @@ -866,17 +866,6 @@ func (r *AppWrapperReconciler) retryableExitCodes(_ context.Context, aw *workloa
return ans
}

func (r *AppWrapperReconciler) isAutopilotExempt(ctx context.Context, aw *workloadv1beta2.AppWrapper) bool {
if v, ok := aw.Annotations[workloadv1beta2.AutopilotExemptAnnotation]; ok {
if isExempt, err := strconv.ParseBool(v); err == nil {
return isExempt
} else {
log.FromContext(ctx).Error(err, "Malformed autopilotExempt annotation; treating as false", "annotation", v)
}
}
return false
}

func clearCondition(aw *workloadv1beta2.AppWrapper, condition workloadv1beta2.AppWrapperCondition, reason string, message string) {
if meta.IsStatusConditionTrue(aw.Status.Conditions, string(condition)) {
meta.SetStatusCondition(&aw.Status.Conditions, metav1.Condition{
Expand Down
2 changes: 1 addition & 1 deletion internal/controller/appwrapper/resource_management.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ func (r *AppWrapperReconciler) createComponent(ctx context.Context, aw *workload
}
}

if r.Config.Autopilot != nil && r.Config.Autopilot.InjectAntiAffinities && !r.isAutopilotExempt(ctx, aw) {
if r.Config.Autopilot != nil && r.Config.Autopilot.InjectAntiAffinities {
toAdd := map[string][]string{}
for resource, taints := range r.Config.Autopilot.ResourceTaints {
if hasResourceRequest(spec, resource) {
Expand Down
8 changes: 0 additions & 8 deletions site/_pages/arch-fault-tolerance.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,13 +127,6 @@ begins. Since the AppWrapper continues to consume quota during this delayed dele
this annotation should be used sparingly and only when interactive debugging of
the failed workload is being actively pursued.

An AppWrapper can be annotated as `autopilotExempt` to disable the
injection of Autopilot Node anti-affinities into its Pods and the
automatic migration of its Pods away from Nodes with Autopilot tagged
unhealthy resources. This annotation should only be used for workloads
that will be closely monitored by other means to identify and recover from
unhealthy Nodes in the cluster.

All child resources for an AppWrapper that successfully completed will be automatically
deleted after a `SuccessTTL` after the AppWrapper entered the `Succeeded` state.

Expand All @@ -154,7 +147,6 @@ can be used to customize them.
| DeletionOnFailureGracePeriod | 0 Seconds | workload.codeflare.dev.appwrapper/deletionOnFailureGracePeriodDuration |
| ForcefulDeletionGracePeriod | 10 Minutes | workload.codeflare.dev.appwrapper/forcefulDeletionGracePeriodDuration |
| SuccessTTL | 7 Days | workload.codeflare.dev.appwrapper/successTTLDuration |
| AutopilotExempt | false | workload.codeflare.dev.appwrapper/autopilotExempt |
| GracePeriodMaximum | 24 Hours | Not Applicable |

The `GracePeriodMaximum` imposes a system-wide upper limit on all other grace periods to
Expand Down