Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: moby/swarmkit
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c1c857e2dca1
Choose a base ref
...
head repository: moby/swarmkit
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ea1a7cec35cb
Choose a head ref
  • 4 commits
  • 7 files changed
  • 3 contributors

Commits on Jun 5, 2024

  1. swarmd: remove /v2/ from module path 

    The module path for swarmd is not valid for the location of the swarmd
module within the swarmkit repo. The go command resolves package paths
to the swarmkit/v2 module and fails when the packages don't exist.

    $ go run github.com/moby/swarmkit/v2/swarmd/cmd/swarm-rafttool@master
    go: github.com/moby/swarmkit/v2/swarmd/cmd/swarm-rafttool@master: module github.com/moby/swarmkit/v2@master found (v2.0.0-20240227173239-911c97650f2e), but does not contain package github.com/moby/swarmkit/v2/swarmd/cmd/swarm-rafttool

(This is only a problem when swarmd is not the main module.)

Fix the swarmd module's path to align with the module source location so
that `go run` can once again be used to invoke swarm-rafttool and the
other commands.

Signed-off-by: Cory Snider <csnider@mirantis.com>
Signed-off-by: plaurent <patrick@saint-laurent.us>
    @corhere @psaintlaurent
    corhere authored and psaintlaurent committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    22ee520 View commit details
    Browse the repository at this point in the history

  2. Add OOM adjustment flag to hostconfig via swarmctl cli 

    Signed-off-by: plaurent <patrick@saint-laurent.us>
    @psaintlaurent
    psaintlaurent committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    2248c1e View commit details
    Browse the repository at this point in the history

Commits on Jun 11, 2024

  1. make changes per PR 

    Signed-off-by: plaurent <patrick@saint-laurent.us>
    @psaintlaurent
    psaintlaurent committed Jun 11, 2024
    Configuration menu
    Copy the full SHA
    447c519 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #3177 from psaintlaurent/ENGINE-903 

    Add OOM adjustment flag to hostconfig via swarmctl cli
    @dperny
    dperny authored Jun 11, 2024
    Configuration menu
    Copy the full SHA
    ea1a7ce View commit details
    Browse the repository at this point in the history
Loading