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-03 release cycle #9669

Merged
merged 22 commits into from
Mar 8, 2024

Conversation

brandond
Copy link
Member

@brandond brandond commented Mar 6, 2024

Proposed Changes

Backport:

Types of Changes

backports

Verification

See linked issues

Testing

Linked Issues

User-Facing Change

fix: use correct wasm shims names
The embedded flannel cni-plugin binary is now built and versioned separate from the rest of the cni plugins and the embedded flannel controller.
Bump spegel to v0.0.18-k3s3
Adds wildcard registry support
Fixes issue with excessive CPU utilization while waiting for containerd to start
Add env var to allow spegel mirroring of latest tag
Tweak netpol node wait logs
Fix coredns NodeHosts on dual-stack clusters
Bump helm-controller/klipper-helm versions
Fix snapshot prune
Fix issue with etcd node name missing hostname
Rootless mode should also bind service nodePort to host for LoadBalancer type, matching UX of rootful mode.
To enable raw output for the `check-config` subcommand, you may now set NO_COLOR=1
Fix additional corner cases in registries handling
Bump metrics-server to v0.7.0
K3s will now warn and suppress duplicate entries in the mirror endpoint list for a registry. Containerd does not support listing the same endpoint multiple times as a mirror for a single upstream registry.

Further Comments

hinshun and others added 9 commits March 6, 2024 22:36
Signed-off-by: Edgar Lee <[email protected]>
(cherry picked from commit 8c83b5e)
Signed-off-by: Brad Davidson <[email protected]>
* Add both dual-stack addresses to the node hosts file
* Add hostname to hosts file as alias for node name to ensure consistent resolution

Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit be569f6)
Signed-off-by: Brad Davidson <[email protected]>
Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit 513c341)
Signed-off-by: Brad Davidson <[email protected]>
* Set ServerNodeName in snapshot CLI setup
* Raise errer if ServerNodeName ends up empty some other way
* Fix status controller to use etcd node name annotation instead of prefix checking

Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit 82432a2)
Signed-off-by: Brad Davidson <[email protected]>
Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit 109e3e4)
Signed-off-by: Brad Davidson <[email protected]>
Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit b164d7a)
Signed-off-by: Brad Davidson <[email protected]>
Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit 3576ed4)
Signed-off-by: Brad Davidson <[email protected]>
…ing from config

Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit 0b35932)
Signed-off-by: Brad Davidson <[email protected]>
Moves us closer to using the proper upstream for our flannel CNI plugin, instead of the snapshot that is vendored into our plugins fork.

Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit 88d30f9)
Signed-off-by: Brad Davidson <[email protected]>
@brandond brandond requested a review from a team as a code owner March 6, 2024 23:01
phillebaba and others added 11 commits March 7, 2024 07:53
Signed-off-by: Philip Laine <[email protected]>
Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit 26feb25)
Signed-off-by: Brad Davidson <[email protected]>
Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit 84a071a)
Signed-off-by: Brad Davidson <[email protected]>
Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit b5a4846)
Signed-off-by: Brad Davidson <[email protected]>
Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit 091a5c8)
Signed-off-by: Brad Davidson <[email protected]>
Fix the wasm shim detection and the containerd configuration generation.

Prior to this commit, the binary and the `RuntimeType` values were not
correct.

Signed-off-by: Flavio Castelli <[email protected]>
(cherry picked from commit 64e4f0e)
Signed-off-by: Brad Davidson <[email protected]>
Add a e2e test that runs some demo WebAssembly applications
using the dedicated containerd shims.

Note: this is not an integration test because we need to install some
binaries (the special containerd shims) on the host.

Signed-off-by: Flavio Castelli <[email protected]>
(cherry picked from commit f82d438)
Signed-off-by: Brad Davidson <[email protected]>
Signed-off-by: Vitor Savian <[email protected]>
Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit 59c724f)
Signed-off-by: Brad Davidson <[email protected]>
Setting this environment variable will not wrap the text in color ANSI code, so that we can print a raw output.

Signed-off-by: Rishikesh Nair <[email protected]>
(cherry picked from commit ff7cfa2)
Signed-off-by: Brad Davidson <[email protected]>
Also, if NO_COLOR is empty, output will be colored, otherwise not colored.

Signed-off-by: Rishikesh Nair <[email protected]>
(cherry picked from commit ce0765c)
Signed-off-by: Brad Davidson <[email protected]>
Co-authored-by: Brad Davidson <[email protected]>
Signed-off-by: Rishikesh Nair <[email protected]>
(cherry picked from commit 82cfacb)
Signed-off-by: Brad Davidson <[email protected]>
We were misreporting the flannel version as the flannel cni plugin version; restore the actual flannel version as build metadata

Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit 6f331ea)
Signed-off-by: Brad Davidson <[email protected]>
@brandond brandond force-pushed the 2024-03-backports_release-1.28 branch from 3249eb3 to 706aaf7 Compare March 7, 2024 07:53
Copy link

codecov bot commented Mar 7, 2024

Codecov Report

Attention: Patch coverage is 56.83761% with 101 lines in your changes are missing coverage. Please review.

Project coverage is 41.04%. Comparing base (0726758) to head (ab630df).

Files Patch % Lines
pkg/node/controller.go 58.73% 14 Missing and 12 partials ⚠️
pkg/spegel/spegel.go 0.00% 24 Missing ⚠️
pkg/agent/containerd/config.go 82.75% 9 Missing and 6 partials ⚠️
pkg/etcd/snapshot.go 36.36% 11 Missing and 3 partials ⚠️
pkg/rootlessports/controller.go 0.00% 6 Missing ⚠️
pkg/spegel/bootstrap.go 0.00% 5 Missing ⚠️
pkg/agent/run.go 50.00% 3 Missing and 1 partial ⚠️
pkg/etcd/etcd.go 0.00% 3 Missing and 1 partial ⚠️
pkg/agent/netpol/netpol.go 0.00% 3 Missing ⚠️
Additional details and impacted files
@@               Coverage Diff                @@
##           release-1.28    #9669      +/-   ##
================================================
- Coverage         42.72%   41.04%   -1.69%     
================================================
  Files               154      154              
  Lines             15769    16785    +1016     
================================================
+ Hits               6738     6889     +151     
- Misses             7851     8728     +877     
+ Partials           1180     1168      -12     
Flag Coverage Δ
e2etests ?
inttests 37.32% <25.64%> (?)
unittests 15.48% <49.69%> (+0.23%) ⬆️

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.

Copy link

@VestigeJ VestigeJ left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@brandond brandond merged commit c15e176 into k3s-io:release-1.28 Mar 8, 2024
15 checks passed
@brandond brandond deleted the 2024-03-backports_release-1.28 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.

7 participants