-
Notifications
You must be signed in to change notification settings - Fork 568
abandon evaluation of any new catalogsource image which is pathological #3766
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.
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
openshift-merge-bot
merged 2 commits into
operator-framework:master
from
grokspawn:fix-wedged-newcat-eval
Feb 19, 2026
+19
−1
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -30,6 +30,8 @@ const ( | |
| CatalogSourceUpdateKey = "catalogsource.operators.coreos.com/update" | ||
| ServiceHashLabelKey = "olm.service-spec-hash" | ||
| CatalogPollingRequeuePeriod = 30 * time.Second | ||
| // containerReasonCrashLoopBackOff is the kubelet Waiting reason when a container is backing off after repeated crashes. | ||
| containerReasonCrashLoopBackOff = "CrashLoopBackOff" | ||
| ) | ||
|
|
||
| // grpcCatalogSourceDecorator wraps CatalogSource to add additional methods | ||
|
|
@@ -754,9 +756,25 @@ func swapLabels(pod *corev1.Pod, labelKey, updateKey string) *corev1.Pod { | |
| return pod | ||
| } | ||
|
|
||
| // podContainersArePathological returns true if any container in the pod has restarts exceeding pathologicalRestartCountThreshold or is in CrashLoopBackOff. | ||
| func podContainersArePathological(pod *corev1.Pod) bool { | ||
| for _, s := range pod.Status.ContainerStatuses { | ||
| if s.State.Waiting != nil && s.State.Waiting.Reason == containerReasonCrashLoopBackOff { | ||
| return true | ||
| } | ||
| } | ||
| for _, s := range pod.Status.InitContainerStatuses { | ||
| if s.State.Waiting != nil && s.State.Waiting.Reason == containerReasonCrashLoopBackOff { | ||
| return true | ||
| } | ||
| } | ||
| // TODO: currently no ephemeral containers in a catalogsource, should we add checks anyway? | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Ephemeral containers should never be part of the equation I don't think. See: https://kubernetes.io/docs/concepts/workloads/pods/ephemeral-containers/ |
||
| return false | ||
| } | ||
|
|
||
| // podFailed checks whether the pod status is in a failed or unknown state, and deletes the pod if so. | ||
| func (c *GrpcRegistryReconciler) podFailed(pod *corev1.Pod) (bool, error) { | ||
| if pod.Status.Phase == corev1.PodFailed || pod.Status.Phase == corev1.PodUnknown { | ||
| if pod.Status.Phase == corev1.PodFailed || pod.Status.Phase == corev1.PodUnknown || podContainersArePathological(pod) { | ||
| logrus.WithField("UpdatePod", pod.GetName()).Infof("catalog polling result: update pod %s failed to start", pod.GetName()) | ||
| err := c.removePods([]*corev1.Pod{pod}, pod.GetNamespace()) | ||
| if err != nil { | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just checking there isn't already a constant defined for this in corev1 of k8s.io/api?