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.28] Backports for 2024-01 k3s2 #9336

Merged

Conversation

brandond
Copy link
Contributor

@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 <brad.davidson@rancher.com>
@brandond brandond requested a review from a team as a code owner February 1, 2024 17:29
@brandond brandond force-pushed the 2024-01-k3s2-backports_release-1.28 branch 2 times, most recently from 319a89e to 5e3bc81 Compare February 1, 2024 19:55
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
@brandond brandond force-pushed the 2024-01-k3s2-backports_release-1.28 branch from 5e3bc81 to 88cdfc7 Compare February 1, 2024 20:17
Copy link

codecov bot commented Feb 2, 2024

Codecov Report

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

Comparison is base (39a0001) 48.88% compared to head (88cdfc7) 46.21%.

Files Patch % Lines
pkg/agent/containerd/config.go 70.10% 20 Missing and 9 partials ⚠️
Additional details and impacted files
@@               Coverage Diff                @@
##           release-1.28    #9336      +/-   ##
================================================
- Coverage         48.88%   46.21%   -2.67%     
================================================
  Files               154      154              
  Lines             16536    16604      +68     
================================================
- Hits               8084     7674     -410     
- Misses             7168     7699     +531     
+ Partials           1284     1231      -53     
Flag Coverage Δ
e2etests ?
inttests 43.07% <10.47%> (+0.73%) ⬆️
unittests 15.43% <65.38%> (+0.89%) ⬆️

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 2f9788a into k3s-io:release-1.28 Feb 2, 2024
15 checks passed
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.

None yet

3 participants