Skip to content

Various libnetwork cleanups#42539

Merged
thaJeztah merged 7 commits intomoby:masterfrom
cpuguy83:libnet_cleanup
Jun 26, 2021
Merged

Various libnetwork cleanups#42539
thaJeztah merged 7 commits intomoby:masterfrom
cpuguy83:libnet_cleanup

Conversation

@cpuguy83
Copy link
Member

See commits for details.
Related to #42471

@cpuguy83 cpuguy83 requested a review from tianon as a code owner June 18, 2021 22:22
@cpuguy83 cpuguy83 requested a review from thaJeztah June 18, 2021 22:22
@thaJeztah
Copy link
Member

❤️❤️ thanks! will have a closer look tomorrow, but SGTM

Comment on lines -103 to -106
Copy link
Member

Choose a reason for hiding this comment

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

Did we integrate this somewhere else?

@thaJeztah
Copy link
Member

Looks like CI is failing; probably some changes needed for the move of docker-proxy to a different location;

=== RUN   TestNetworkNat
    nat_test.go:30: assertion failed: error is not nil: Error response from daemon: driver failed programming external connectivity on endpoint server-TestNetworkNat (37609f18f3c616cad5f6e55b316778d0d083ab2c341d4c7900efc35b8f9b171d): exec: "docker-proxy": executable file not found in $PATH

Copy link
Member

Choose a reason for hiding this comment

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

Ah! Guess this is the cause;

Suggested change
GO_PACKAGE='github.com/docker/docker/cmd/dockeer-proxy'
GO_PACKAGE='github.com/docker/docker/cmd/docker-proxy'

cpuguy83 and others added 7 commits June 25, 2021 17:59
This was used for testing purposes when libnetwork was in a separate
repo.
Now that it is integrated we no longer need it since dockerd and docker
cli provide the same function.

Signed-off-by: Brian Goff <[email protected]>
Since this command is part of the official distribution and even
required for tests, let's move this up to the main cmd's.

Signed-off-by: Brian Goff <[email protected]>
This is another one of those tools to mimic the docker network cli.
It is not needed anymore, along with an old fork of the docker flag
packages which was a fork of the go flag package.

Signed-off-by: Brian Goff <[email protected]>
These were purposefully ignored before but this goes ahead and "fixes"
most of them.
Note that none of the things gosec flagged are problematic, just
quieting the linter here.

Signed-off-by: Brian Goff <[email protected]>
Not sure how this got added in there...

Signed-off-by: Brian Goff <[email protected]>
It's no longer used

Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah
Copy link
Member

I rebased, fixed the typo (to see if that fixes the issue), and removed the proxy.installer script (should no longer be needed)

@thaJeztah thaJeztah added area/networking Networking kind/refactor PR's that refactor, or clean-up code status/2-code-review labels Jun 25, 2021
@thaJeztah thaJeztah added this to the 21.xx milestone Jun 25, 2021
Copy link
Member

@tianon tianon left a comment

Choose a reason for hiding this comment

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

👀

Copy link
Member

@samuelkarp samuelkarp left a comment

Choose a reason for hiding this comment

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

LGTM

@samuelkarp
Copy link
Member

More flakes of #42459 in CI, rerunning.

Copy link
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

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

LGTM

@thaJeztah thaJeztah merged commit 050929a into moby:master Jun 26, 2021
akerouanton added a commit to akerouanton/docker that referenced this pull request Feb 9, 2023
- GetIfaceAddr is unused since moby/libnetwork#670
- ValidateAlias and ParseAlias are unused since moby#42539

Signed-off-by: Albin Kerouanton <[email protected]>
akerouanton added a commit to akerouanton/docker that referenced this pull request Feb 16, 2023
- GetIfaceAddr is unused since moby/libnetwork@e51ead59
  (moby/libnetwork#670).
- ValidateAlias and ParseAlias are unused since moby/moby@0645eb84
  (moby#42539).

Signed-off-by: Albin Kerouanton <[email protected]>
akerouanton added a commit to akerouanton/docker that referenced this pull request Feb 16, 2023
- GetIfaceAddr is unused since moby/libnetwork@e51ead59
  (moby/libnetwork#670).
- ValidateAlias and ParseAlias are unused since moby/moby@0645eb84
  (moby#42539).

Signed-off-by: Albin Kerouanton <[email protected]>
akerouanton added a commit to akerouanton/docker that referenced this pull request Mar 2, 2023
- GetIfaceAddr is unused since moby/libnetwork@e51ead59
  (moby/libnetwork#670).
- ValidateAlias and ParseAlias are unused since moby/moby@0645eb84
  (moby#42539).

Signed-off-by: Albin Kerouanton <[email protected]>
akerouanton added a commit to akerouanton/docker that referenced this pull request Mar 2, 2023
- GetIfaceAddr is unused since moby/libnetwork@e51ead59
  (moby/libnetwork#670).
- ValidateAlias and ParseAlias are unused since moby/moby@0645eb84
  (moby#42539).

Signed-off-by: Albin Kerouanton <[email protected]>
akerouanton added a commit to akerouanton/docker that referenced this pull request Mar 6, 2023
- GetIfaceAddr is unused since moby/libnetwork@e51ead59
  (moby/libnetwork#670).
- ValidateAlias and ParseAlias are unused since moby/moby@0645eb84
  (moby#42539).

Signed-off-by: Albin Kerouanton <[email protected]>
akerouanton added a commit to akerouanton/docker that referenced this pull request Mar 31, 2023
- GetIfaceAddr is unused since moby/libnetwork@e51ead59
  (moby/libnetwork#670).
- ValidateAlias and ParseAlias are unused since moby/moby@0645eb84
  (moby#42539).

Signed-off-by: Albin Kerouanton <[email protected]>
akerouanton added a commit to akerouanton/docker that referenced this pull request Mar 31, 2023
- GetIfaceAddr is unused since moby/libnetwork@e51ead59
  (moby/libnetwork#670).
- ValidateAlias and ParseAlias are unused since moby/moby@0645eb84
  (moby#42539).

Signed-off-by: Albin Kerouanton <[email protected]>
akerouanton added a commit to akerouanton/docker that referenced this pull request Apr 6, 2023
- GetIfaceAddr is unused since moby/libnetwork@e51ead59
  (moby/libnetwork#670).
- ValidateAlias and ParseAlias are unused since moby/moby@0645eb84
  (moby#42539).

Signed-off-by: Albin Kerouanton <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area/networking Networking kind/refactor PR's that refactor, or clean-up code status/2-code-review

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants