Skip to content

vendor: update swarmkit to fix completed job task constraint enforcer - #52786

Merged
thaJeztah merged 1 commit into
moby:masterfrom
lohitkolluri:lk/swarm-constraint-enforcer-jobs
Jun 9, 2026
Merged

thaJeztah merged 1 commit into
moby:masterfrom
lohitkolluri:lk/swarm-constraint-enforcer-jobs

Conversation

@lohitkolluri

Copy link
Copy Markdown
Contributor

Updates swarmkit to latest master to include the upstream fix for constraint enforcer counting completed replicated-job tasks against node capacity (moby/swarmkit#3237).

This replaces the closed #52715, which had originally attempted to patch vendored files directly. The correct approach is to pull the merged upstream change through the normal vendor sync workflow.

Fixes #52652

Signed-off-by: Lohit Kolluri lohitkolluri@gmail.com

@lohitkolluri

lohitkolluri commented Jun 8, 2026 •

Copy link
Copy Markdown
Contributor Author

Hi @thaJeztah sorry for the ping, but I wanted to loop you in since you reviewed the original #52715.

This is the fresh vendor-sync PR that replaces the closed one. The upstream fix from moby/swarmkit#3237 has been merged, so I've updated the swarmkit dependency to the latest master (v2.1.3-0.20260608090550-b0ffe7f2049a) through the normal vendor update workflow no hand-edited vendored files this time.

Please let me know if anything else is needed.

@lohitkolluri lohitkolluri changed the title vendor: github.com/moby/swarmkit/v2 v2.1.3-0.20260608090550-b0ffe7f2049a vendor: update swarmkit to fix completed job task constraint enforcer Jun 8, 2026
Comment thread go.mod Resolved
@lohitkolluri
lohitkolluri force-pushed the lk/swarm-constraint-enforcer-jobs branch from 4ea3ac8 to f3774ec Compare June 8, 2026 14:00
@thaJeztah

Copy link
Copy Markdown
Member

Can you remove the Closes #xxxx and moby/swarmkit#xxx references from the commit message? They tend to produce a lot of noise on GitHub when commits are cherry-picked/merged (which can be in forks), and sometimes pre-maturely close tickets.

Screenshot 2026-06-08 at 16 18 36

@lohitkolluri
lohitkolluri force-pushed the lk/swarm-constraint-enforcer-jobs branch from f3774ec to 8de4331 Compare June 8, 2026 14:24
@lohitkolluri

lohitkolluri commented Jun 8, 2026 •

Copy link
Copy Markdown
Contributor Author

Done removed the Fixes and moby/swarmkit#3237 references from the commit message. The commit now only contains the descriptive body and DCO sign-off.

@thaJeztah thaJeztah added this to the 29.6.0 milestone Jun 8, 2026

@thaJeztah thaJeztah left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Update swarmkit to latest master to include the upstream fix for
constraint enforcer counting completed replicated-job tasks against
node capacity.

Signed-off-by: Lohit Kolluri <lohitkolluri@gmail.com>
@lohitkolluri
lohitkolluri force-pushed the lk/swarm-constraint-enforcer-jobs branch from 8de4331 to 36963fb Compare June 8, 2026 17:42
@thaJeztah
thaJeztah merged commit 67c16bf into moby:master Jun 9, 2026
353 of 357 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Constraint enforcer counts completed ReplicatedJob tasks against node memory

2 participants