Skip to content

fix: Avoid resetting resourceVersion for watch. Fixes #15106 #15107

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
JackTroy wants to merge 1 commit into
base: main
Choose a base branch
from
+16 −4
Open

fix: Avoid resetting resourceVersion for watch. Fixes #15106 #15107

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
5 changes: 4 additions & 1 deletion workflow/controller/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -851,7 +851,10 @@ func (wfc *WorkflowController) tweakListRequestListOptions(options *metav1.ListO
options.LabelSelector = labelSelector.String()
// `ResourceVersion=0` does not honor the `limit` in API calls, which results in making significant List calls
// without `limit`. For details, see https://github.com/argoproj/argo-workflows/pull/11343
options.ResourceVersion = ""
// Check if ResourceVersion is "0" and reset it to empty string to ensure proper pagination behavior
if options.ResourceVersion == "0" {
options.ResourceVersion = ""
}
}

func (wfc *WorkflowController) tweakWatchRequestListOptions(options *metav1.ListOptions) {
Expand Down
5 changes: 4 additions & 1 deletion workflow/controller/informer/tolerant_cluster_workflow_template_informer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,10 @@ func NewTolerantClusterWorkflowTemplateInformer(dynamicInterface dynamic.Interfa
return &tolerantClusterWorkflowTemplateInformer{delegate: dynamicinformer.NewFilteredDynamicSharedInformerFactory(dynamicInterface, defaultResync, "", func(options *metav1.ListOptions) {
// `ResourceVersion=0` does not honor the `limit` in API calls, which results in making significant List calls
// without `limit`. For details, see https://github.com/argoproj/argo-workflows/pull/11343
options.ResourceVersion = ""
// Check if ResourceVersion is "0" and reset it to empty string to ensure proper pagination behavior
if options.ResourceVersion == "0" {
options.ResourceVersion = ""
}
}).ForResource(schema.GroupVersionResource{Group: workflow.Group, Version: workflow.Version, Resource: workflow.ClusterWorkflowTemplatePlural})}
}

Expand Down
5 changes: 4 additions & 1 deletion workflow/controller/informer/tolerant_workflow_template_informer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,10 @@ func NewTolerantWorkflowTemplateInformer(dynamicInterface dynamic.Interface, def
return &tolerantWorkflowTemplateInformer{delegate: dynamicinformer.NewFilteredDynamicSharedInformerFactory(dynamicInterface, defaultResync, namespace, func(options *metav1.ListOptions) {
// `ResourceVersion=0` does not honor the `limit` in API calls, which results in making significant List calls
// without `limit`. For details, see https://github.com/argoproj/argo-workflows/pull/11343
options.ResourceVersion = ""
// Check if ResourceVersion is "0" and reset it to empty string to ensure proper pagination behavior
if options.ResourceVersion == "0" {
options.ResourceVersion = ""
}
}).ForResource(schema.GroupVersionResource{Group: workflow.Group, Version: workflow.Version, Resource: workflow.WorkflowTemplatePlural})}
}

Expand Down
5 changes: 4 additions & 1 deletion workflow/controller/taskresult.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,10 @@ func (wfc *WorkflowController) newWorkflowTaskResultInformer(ctx context.Context
options.LabelSelector = labelSelector
// `ResourceVersion=0` does not honor the `limit` in API calls, which results in making significant List calls
// without `limit`. For details, see https://github.com/argoproj/argo-workflows/pull/11343
options.ResourceVersion = ""
// Check if ResourceVersion is "0" and reset it to empty string to avoid missing watch event.
if options.ResourceVersion == "0" {
options.ResourceVersion = ""
}
},
)
//nolint:errcheck // the error only happens if the informer was stopped, and it hasn't even started (https://github.com/kubernetes/client-go/blob/46588f2726fa3e25b1704d6418190f424f95a990/tools/cache/shared_informer.go#L580)
Expand Down
Loading