api: ContainerCreate: clean up BC conditions #46720
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Albin Kerouanton <albinker@gmail.com>
akerouanton
added
area/api
status/2-code-review
kind/refactor
akerouanton
changed the title
thaJeztah
approved these changes
Oct 25, 2023
runconfig/errors.go
Outdated
| @@ -31,6 +31,8 @@ const ( | |||
| ErrUnsupportedNetworkAndAlias validationError = "network-scoped alias is supported only for containers in user defined networks" | |||
| // ErrConflictUTSHostname conflict between the hostname and the UTS mode | |||
| ErrConflictUTSHostname validationError = "conflicting options: hostname and the UTS mode" | |||
| // ErrEmptyConfig when container config is nil | |||
| ErrEmptyConfig validationError = "Config cannot be empty in order to create a container" | |||
There was a problem hiding this comment.
Do we know if anything checks for this error message? (Was considering to fix the capitalisation (lowercase Config))
There was a problem hiding this comment.
At least not the CLI. Is that enough to consider fixing the capitalization?
There was a problem hiding this comment.
Yes, probably; if CI still passes on 17.06 (and docker-py), we're probably good to go.
I'm ok with doing it separately though; perhaps better for this case to have a clear commit where we changed it (in case we missed it being used somewhere, and need to find a regression point)
akerouanton
force-pushed
the
container-create-init-structs
branch
from
639eb62 to
6f1beb4
Compare
rumpl
reviewed
Oct 25, 2023
Comment on lines
+631
to
+638
| if hostConfig.PidsLimit != nil && *hostConfig.PidsLimit <= 0 { | ||
| // Don't set a limit if either no limit was specified, or "unlimited" was | ||
| // explicitly set. | ||
| // Both `0` and `-1` are accepted as "unlimited", and historically any | ||
| // negative value was accepted, so treat those as "unlimited" as well. | ||
| hostConfig.PidsLimit = nil | ||
| } | ||
|
|
There was a problem hiding this comment.
Funny how this is different in postContainerUpdate
moby/api/server/router/container/container_routes.go
Lines 456 to 462 in e36260f
rumpl
approved these changes
Oct 25, 2023
The same error is already returned by `(*Daemon).containerCreate()` but since this function is also called by the cluster executor, the error has to be duplicated. Doing that allows to remove a nil check on container config in `postContainersCreate`. Signed-off-by: Albin Kerouanton <albinker@gmail.com>
Signed-off-by: Albin Kerouanton <albinker@gmail.com>
Signed-off-by: Albin Kerouanton <albinker@gmail.com>
- Merge BC conds for API < v1.42 together - Merge BC conds for API < v1.44 together - Re-order BC conds by API version - Move pids-limit normalization after BC conds Signed-off-by: Albin Kerouanton <albinker@gmail.com>
akerouanton
force-pushed
the
container-create-init-structs
branch
from
6f1beb4 to
4f0cab3
Compare
thaJeztah
approved these changes
Oct 25, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
- What I did
In
postContainersCreate:hostConfigandnetworkingConfigwhen they're nil ;configis nil ;config,hostConfigandnetworkingConfig;- How to verify it
CI is green.
- A picture of a cute animal (not mandatory but encouraged)