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

[release-1.26] Backports for 2024-01 k3s2 #9338

Merged

Conversation

brandond
Copy link
Member

@brandond brandond commented Feb 1, 2024

Proposed Changes

Backports:

Types of Changes

version bump, bugfix, backport

Verification

See linked PRs

Testing

Linked Issues

User-Facing Change

Bump runc to v1.1.12 and helm-controller to v0.15.7
Fix handling of bare hostname or IP as endpoint address in registries.yaml

Further Comments

* Fix issue with bare host or IP as endpoint
* Fix issue with localhost registries not defaulting to http.
* Move the registry template prep to a separate function,
  and adds tests of that function so that we can ensure we're
  generating the correct content.

Signed-off-by: Brad Davidson <[email protected]>
@brandond brandond requested a review from a team as a code owner February 1, 2024 17:42
@brandond brandond force-pushed the 2024-01-k3s2-backports_release-1.26 branch 2 times, most recently from 2e8f519 to e9a52e3 Compare February 1, 2024 19:58
@brandond brandond force-pushed the 2024-01-k3s2-backports_release-1.26 branch from e9a52e3 to 22608d8 Compare February 1, 2024 20:18
Copy link

codecov bot commented Feb 2, 2024

Codecov Report

Attention: 25 lines in your changes are missing coverage. Please review.

Comparison is base (65495bb) 14.23% compared to head (22608d8) 14.98%.

Files Patch % Lines
pkg/agent/containerd/config.go 63.23% 17 Missing and 8 partials ⚠️
Additional details and impacted files
@@               Coverage Diff                @@
##           release-1.26    #9338      +/-   ##
================================================
+ Coverage         14.23%   14.98%   +0.74%     
================================================
  Files               115      115              
  Lines              8389     8430      +41     
================================================
+ Hits               1194     1263      +69     
+ Misses             6955     6918      -37     
- Partials            240      249       +9     
Flag Coverage Δ
unittests 14.98% <65.75%> (+0.74%) ⬆️

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

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@brandond brandond merged commit 893eabd into k3s-io:release-1.26 Feb 2, 2024
15 checks passed
@brandond brandond deleted the 2024-01-k3s2-backports_release-1.26 branch June 6, 2024 21:07
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.

3 participants