Fix crictl config --set if the YAML defines entries multiple times
#1661
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
Only the first entry would be written before applying this patch. This means that a config like this: ```yaml timeout: 5 timeout: 10 timeout: 20 runtime-endpoint: "" image-endpoint: "" debug: false pull-image-on-create: false disable-pull-on-run: false ``` Would return the right value (the last one): ``` > crictl --config ./crictl.yaml config --get timeout 20 ``` But setting the config will only result in setting the first item: ``` > crictl --config ./crictl.yaml config --set timeout=30 > cat crictl.yaml timeout: 30 timeout: 10 timeout: 20 runtime-endpoint: "" image-endpoint: "" debug: false pull-image-on-create: false disable-pull-on-run: false ``` And therefore also a wrong result of `crictl config --get`: ``` > crictl --config ./crictl.yaml config --get timeout 20 ``` We now change that behavior and set all values without de-duplicating them: ``` > crictl --config ./crictl.yaml config --set timeout=30 > cat crictl.yaml timeout: 30 timeout: 30 timeout: 30 runtime-endpoint: "" image-endpoint: "" debug: false pull-image-on-create: false disable-pull-on-run: false ``` e2e test cases around that scenario have been added as well. Signed-off-by: Sascha Grunert <[email protected]>
k8s-ci-robot
added
kind/bug
k8s-ci-robot
added
approved
k8s-ci-robot
added
the
lgtm
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: saschagrunert, SergeyKanzhelev 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 |
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 type of PR is this?
/kind bug
What this PR does / why we need it:
Only the first entry would be written before applying this patch. This means that a config like this:
Would return the right value (the last one):
But setting the config will only result in setting the first item:
And therefore also a wrong result of
crictl config --get:We now change that behavior and set all values without de-duplicating them:
e2e test cases around that scenario have been added as well.
Which issue(s) this PR fixes:
None
Special notes for your reviewer:
Follow-up on #1659 (comment)
Does this PR introduce a user-facing change?