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

Enable FindString to search dotD config files #7323

Merged
merged 5 commits into from
May 2, 2023

Conversation

dereknola
Copy link
Member

@dereknola dereknola commented Apr 19, 2023

Proposed Changes

  • FindString now correctly searches for a CLI argument inside of the config.yaml.d folder

Types of Changes

CLI Bug Fix

Verification

Create a config folder setup:

  • /etc/rancher/k3s/config.yaml and /etc/rancher/k3s/config.yaml.d/test.yaml
  • Intest.yaml fill with prefer-bundled-bin: true
  • Start K3s, check arguments passed to server
$ kubectl get nodes -o jsonpath='{.items[0].metadata.annotations.k3s\.io/node-args}{"\n"}'
["server","--token","********","--node-external-ip","10.10.10.100","--flannel-iface","eth1","--prefer-bundled-bin","true"]

Testing

New Unit test clause

Linked Issues

#7316

User-Facing Change


Further Comments

Signed-off-by: Derek Nola <derek.nola@suse.com>
@dereknola dereknola requested a review from a team as a code owner April 19, 2023 21:37
Signed-off-by: Derek Nola <derek.nola@suse.com>
Signed-off-by: Derek Nola <derek.nola@suse.com>
@dereknola dereknola requested a review from brandond April 20, 2023 16:41
Signed-off-by: Derek Nola <derek.nola@suse.com>
Signed-off-by: Derek Nola <derek.nola@suse.com>
@codecov-commenter
Copy link

Codecov Report

Patch coverage: 75.00% and project coverage change: +0.11 🎉

Comparison is base (944f811) 19.30% compared to head (780f2be) 19.42%.

📣 This organization is not using Codecov’s GitHub App Integration. We recommend you install it so Codecov can continue to function properly for your repositories. Learn more

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #7323      +/-   ##
==========================================
+ Coverage   19.30%   19.42%   +0.11%     
==========================================
  Files          81       81              
  Lines        5459     5472      +13     
==========================================
+ Hits         1054     1063       +9     
- Misses       4183     4185       +2     
- Partials      222      224       +2     
Flag Coverage Δ
unittests 19.42% <75.00%> (+0.11%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
pkg/configfilearg/parser.go 74.53% <75.00%> (-0.47%) ⬇️

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

@dereknola dereknola merged commit e1d4cff into k3s-io:master May 2, 2023
@dereknola dereknola deleted the findstring_dot branch May 2, 2023 18:44
dereknola added a commit to dereknola/k3s that referenced this pull request May 2, 2023
* Enable FindString to search dotD config files
* Address multiple arg cases

Signed-off-by: Derek Nola <derek.nola@suse.com>
dereknola added a commit to dereknola/k3s that referenced this pull request May 2, 2023
* Enable FindString to search dotD config files
* Address multiple arg cases

Signed-off-by: Derek Nola <derek.nola@suse.com>
dereknola added a commit to dereknola/k3s that referenced this pull request May 2, 2023
* Enable FindString to search dotD config files
* Address multiple arg cases

Signed-off-by: Derek Nola <derek.nola@suse.com>
dereknola added a commit that referenced this pull request May 2, 2023
* Handle multiple arguments with StringSlice flags (#7380)

* Add helper function for multiple arguments in stringslice

Signed-off-by: Derek Nola <derek.nola@suse.com>

* Cleanup server setup with util function

Signed-off-by: Derek Nola <derek.nola@suse.com>

* Enable FindString to search dotD config files (#7323)

* Enable FindString to search dotD config files
* Address multiple arg cases

Signed-off-by: Derek Nola <derek.nola@suse.com>

---------

Signed-off-by: Derek Nola <derek.nola@suse.com>
dereknola added a commit that referenced this pull request May 2, 2023
* Handle multiple arguments with StringSlice flags (#7380)

* Add helper function for multiple arguments in stringslice
* Cleanup server setup with util function

Signed-off-by: Derek Nola <derek.nola@suse.com>

* Enable FindString to search dotD config files (#7323)

* Enable FindString to search dotD config files
* Address multiple arg cases

Signed-off-by: Derek Nola <derek.nola@suse.com>
dereknola added a commit that referenced this pull request May 2, 2023
* Handle multiple arguments with StringSlice flags (#7380)
* Cleanup server setup with util function

Signed-off-by: Derek Nola <derek.nola@suse.com>

* Enable FindString to search dotD config files (#7323)
* Address multiple arg cases

Signed-off-by: Derek Nola <derek.nola@suse.com>
@VestigeJ VestigeJ added this to the v1.27.2+k3s1 milestone May 4, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants