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

Improve flannel code and logging #4550

Merged
merged 1 commit into from
Dec 1, 2021

Conversation

manuelbuil
Copy link
Contributor

Signed-off-by: Manuel Buil [email protected]

Proposed Changes

This PR improves flannel code a bit:

  • Swaps nodeConfig.FlannelConf to nodeConfig.FlannelConfFile, which describes the content of the variable better
  • Adds more logging, especially using the debug option of logrus
  • Fixes a bug where createFlannelConf was returning nil even though there was an error

Types of Changes

Bugfix

Verification

Linked Issues

#4549

User-Facing Change


Further Comments

@manuelbuil manuelbuil requested a review from a team as a code owner November 22, 2021 11:30
@codecov-commenter
Copy link

codecov-commenter commented Nov 22, 2021

Codecov Report

Merging #4550 (e3e404a) into master (d93c82f) will decrease coverage by 0.00%.
The diff coverage is 0.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #4550      +/-   ##
==========================================
- Coverage   12.03%   12.03%   -0.01%     
==========================================
  Files         135      135              
  Lines        9179     9183       +4     
==========================================
  Hits         1105     1105              
- Misses       7838     7842       +4     
  Partials      236      236              
Flag Coverage Δ
inttests 0.76% <0.00%> (-0.01%) ⬇️
unittests 11.59% <0.00%> (-0.01%) ⬇️

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

Impacted Files Coverage Δ
pkg/agent/config/config.go 0.00% <0.00%> (ø)
pkg/agent/flannel/setup.go 0.00% <0.00%> (ø)
pkg/daemons/config/types.go 50.00% <ø> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update d93c82f...e3e404a. Read the comment docs.

pkg/agent/flannel/setup.go Outdated Show resolved Hide resolved
pkg/agent/flannel/setup.go Outdated Show resolved Hide resolved
Signed-off-by: Manuel Buil <[email protected]>
@manuelbuil manuelbuil force-pushed the improve_flannel_logging branch from e3e404a to 7685da3 Compare November 22, 2021 20:52
@manuelbuil manuelbuil requested a review from brandond November 23, 2021 08:20
@manuelbuil manuelbuil merged commit 8141a93 into k3s-io:master Dec 1, 2021
@manuelbuil manuelbuil deleted the improve_flannel_logging branch December 1, 2021 17:22
@VestigeJ
Copy link

VestigeJ commented Dec 9, 2021

Validated

Awaiting approval from Manuel on this Verification process the logs are quite verbose - apologies especially just passing in $ sudo journalctl | grep flannel reveals quite a lot and traces it back to specific go files IMHO.

Release 1.20

Release 1.21

Release 1.22

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