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
Topic/docs completions config updates for runtime pull image #8110
base: main
Are you sure you want to change the base?
Topic/docs completions config updates for runtime pull image #8110
Conversation
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: fidencio 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 |
/cc @littlejawa |
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #8110 +/- ##
=======================================
Coverage 49.67% 49.67%
=======================================
Files 153 153
Lines 16826 16829 +3
=======================================
+ Hits 8358 8360 +2
- Misses 7424 7426 +2
+ Partials 1044 1043 -1 |
Hey @fidencio, Now I have a concern: this is not just documenting "runtime_pull_image" and adding it to the template config, it also adds it to the "--runtimes" parameter, which I didn't do in the original PR. The parsing for it is not done, so if you do it, you need to change the following to actually parse the new parameter within the string : cri-o/internal/criocli/criocli.go Lines 124 to 169 in d5666af
And then also cri-o/internal/criocli/criocli.go Line 654 in d5666af
And then the crio CI scripts using it should be adapted in the same PR, otherwise some of them might (silently) fail.
Now I have another concern: changing the "--runtimes" string the way you do, the order of parameters is modified. It means that all users of this parameter will see their configuration broken next time they update crio. |
completions/fish/crio.fish
Outdated
@@ -143,7 +143,7 @@ complete -c crio -n '__fish_crio_no_subcommand' -f -l read-only -d 'Setup all un | |||
complete -c crio -n '__fish_crio_no_subcommand' -f -l registry -r -d 'Registry to be prepended when pulling unqualified images. Can be specified multiple times.' | |||
complete -c crio -n '__fish_crio_no_subcommand' -l root -s r -r -d 'The CRI-O root directory.' | |||
complete -c crio -n '__fish_crio_no_subcommand' -l runroot -r -d 'The CRI-O state directory.' | |||
complete -c crio -n '__fish_crio_no_subcommand' -f -l runtimes -r -d 'OCI runtimes, format is \'runtime_name:runtime_path:runtime_root:runtime_type:privileged_without_host_devices:runtime_config_path:container_min_memory\'.' | |||
complete -c crio -n '__fish_crio_no_subcommand' -f -l runtimes -r -d 'OCI runtimes, format is \'runtime_name:runtime_path:runtime_root:runtime_type:runtime_pull_image:privileged_without_host_devices:runtime_config_path:container_min_memory\'.' |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
it doesn't look like this was wired into the cli flag so I don't think this is accurate
This option has been added as part of fff6493, but completions and docs were not updated at that time. Signed-off-by: Fabiano Fidêncio <fabiano.fidencio@intel.com>
The option was added as part of fff6493, but never added to the template, leading to `crio config default` missing this option when merging config files that do have it set. Signed-off-by: Fabiano Fidêncio <fabiano.fidencio@intel.com>
d8ae774
to
e25ee07
Compare
@fidencio: The following tests failed, say
Full PR test history. Your PR dashboard. Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here. |
@@ -88,6 +88,7 @@ kata_int_test_env: | |||
PRIVILEGED_WITHOUT_HOST_DEVICES: true | |||
RUNTIME_CONFIG_PATH: "/opt/kata/share/defaults/kata-containers/configuration.toml" | |||
PATH: "/opt/kata/bin:{{ ansible_env.PATH }}" | |||
RUNTIME_PULL_IMAGE: true |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Actually, I think we should keep it "false" here (or not set it at all as it is the default)
Our testing is done on kata alone - not peer-pods nor CoCo. We don't want to enable that feature systematically.
There is still one occurrence of "usage" string not updated : cri-o/internal/criocli/criocli.go Line 654 in d5666af
Otherwise lgtm Thanks! |
What type of PR is this?
What this PR does / why we need it:
The
runtime_pull_image
configuration option was introduced as part of fff6493, but missed documentation, completion, and adding it as part of the configuration template.Which issue(s) this PR fixes:
Special notes for your reviewer:
Does this PR introduce a user-facing change?
None