Skip to content

fix terminal addons #166

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
Aug 13, 2025
Merged

fix terminal addons #166

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
23 changes: 21 additions & 2 deletions pkg/resource/addon/hooks.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,17 @@ var (
ackrequeue.DefaultRequeueAfterDuration,
)
)
var (
// FailedStatuses defines the list of statuses that are a failed state for an addon
FailedStatuses = []string{
StatusCreateFailed,
StatusUpdateFailed,
}
)

var (
// TerminalStatuses defines the list of statuses that are terminal for an addon
TerminalStatuses = []string{
StatusCreateFailed,
StatusUpdateFailed,
StatusDeleteFailed,
// Still not sure if we should consider DEGRADED as terminal
// StatusDegraded,
Expand Down Expand Up @@ -212,11 +217,25 @@ func equalPodIdentityAssociations(desired, latest []*v1alpha1.AddonPodIdentityAs
return true
}

// addonInFailedState returns true if the supplied addon is in a failed state
// that requires retry (CREATE_FAILED or UPDATE_FAILED)
func addonHasFailedStatus(r *resource) bool {
if r.ko.Status.Status == nil {
return false
}
cs := *r.ko.Status.Status
return cs == StatusCreateFailed || cs == StatusUpdateFailed
}

// customPreCompare is a custom pre-compare function that compares the PodIdentityAssociations field
func customPreCompare(delta *ackcompare.Delta, desired, latest *resource) {
if !equalPodIdentityAssociations(desired.ko.Spec.PodIdentityAssociations, latest.ko.Spec.PodIdentityAssociations) {
delta.Add("Spec.PodIdentityAssociations", desired.ko.Spec.PodIdentityAssociations, latest.ko.Spec.PodIdentityAssociations)
}
// Force update if addon is in failed state to attempt recovery
if addonHasFailedStatus(latest) {
delta.Add("Spec.ForceRecovery", desired.ko.Status.Status, latest.ko.Status.Status)
}
}

// formatPodIdentityAssociation returns a string representation of the pod identity association
Expand Down