Skip to content
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

[20.10 backport] Bump go 1.16.6 #3224

Merged
merged 4 commits into from
Jul 29, 2021

Conversation

thaJeztah
Copy link
Member

backport of:

Keeping the dockerfiles/Dockerfile.cross image at 1.13, as we don't
have more current versions of that image. However, I don't think it's
still used, so we should remove it.

Some tests were using domain names that were intended to be "fake", but are
actually registered domain names (such as mycorp.com).

Even though we were not actually making connections to these domains, it's
better to use domains that are designated for testing/examples in RFC2606:
https://tools.ietf.org/html/rfc2606

Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit f3886f3)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
- use var/const blocks when declaring a list of variables
- use const where possible

TestCheckKubernetesConfigurationRaiseAnErrorOnInvalidValue:

- use keys when assigning values
- make sure test is dereferenced in the loop
- use subtests

Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit be327a4)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
Golang uses a `sync.Once` when determining the proxy to use. This means
that it's not possible to test the proxy configuration in unit tests,
because the proxy configuration will be "fixated" the first time Golang
detects the proxy configuration.

This patch changes TestNewAPIClientFromFlagsWithHttpProxyEnv to an e2e
test so that we can verify the CLI picks up the proxy configuration.

Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit 40c6b11)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
Keeping the dockerfiles/Dockerfile.cross image at 1.13, as we don't
have more current versions of that image. However, I don't think it's
still used, so we should remove it.

Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit a477a72)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
@codecov-commenter
Copy link

Codecov Report

Merging #3224 (0b924e5) into 20.10 (a6f6b5f) will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##            20.10    #3224   +/-   ##
=======================================
  Coverage   58.53%   58.53%           
=======================================
  Files         299      299           
  Lines       21446    21446           
=======================================
  Hits        12554    12554           
  Misses       7973     7973           
  Partials      919      919           

@thaJeztah
Copy link
Member Author

@silvin-lubecki @StefanScherer ptal 🤗

Copy link
Contributor

@silvin-lubecki silvin-lubecki left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Member

@StefanScherer StefanScherer 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 3967b7d into docker:20.10 Jul 29, 2021
@thaJeztah thaJeztah deleted the 20.10_backport_bump_go_1.16.6 branch July 29, 2021 13:55
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.

4 participants