quadlet: Handle booleans that have defaults better #16893
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
We add a regular LookupBoolean that can fail lookups, which is used by the WithDefault version. We want to use this directly later in some places. It is fina to change API here because this has not been in a release yet. Signed-off-by: Alexander Larsson <[email protected]>
The ReadOnly and the RunInit keys affect options that have a variable default (configurable in containers.conf). This means we need to handle them a bit differently in quadlet to allow overriding the default. For example, we can't assume ReadOnly=false doesn't need to add any argument because no argument may mean readonly=true if the default is changed. We now don't add any argument (leaving the default) if the key is not specified, or we always add an argument (--foo or --foo=false) if the key is specified (overriding whatever the default is). Signed-off-by: Alexander Larsson <[email protected]>
|
Weird CI error: |
vrothberg
approved these changes
Dec 20, 2022
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: alexlarsson, vrothberg The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
openshift-ci
bot
added
the
approved
ygalblum
reviewed
Dec 20, 2022
| } | ||
|
|
||
| // By default we handle startup notification with conmon, but allow passing it to the container with Notify=yes | ||
| notify := container.LookupBoolean(ContainerGroup, KeyNotify, false) | ||
| notify := container.LookupBooleanWithDefault(ContainerGroup, KeyNotify, false) |
There was a problem hiding this comment.
Since 'LookupBooleanreturnfalsewhen the key is not found. Is there any advantage of usingLookupBooleanWithDefaultwithfalse` as default?
There was a problem hiding this comment.
Not technically, but it imho makes the code intention clearer.
|
Some CI network hickup it seems. |
|
LGTM |
|
/lgtm |
openshift-ci
bot
added
the
do-not-merge/hold
|
/hold cancel |
openshift-ci
bot
removed
the
do-not-merge/hold
This was referenced Jan 3, 2023
github-actions
bot
added
the
locked - please file new issue/PR
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
The ReadOnly and the RunInit keys affect options that have a variable default (configurable in containers.conf). This means we need to handle them a bit differently in quadlet to allow overriding the default. For example, we can't assume
ReadOnly=falsedoesn't need to add any argument because no argument may mean read-only is enabled if the default is changed.We now don't add any argument (leaving the default) if the key is not specified, or we always add an argument (
--fooor--foo=false) if the key is specified (overriding whatever the default is).