Skip to content

[release-1.26] Backports for 2024-03 release cycle#9692

Merged
brandond merged 22 commits intok3s-io:release-1.26from
brandond:2024-03-backports_release-1.26
Mar 8, 2024
Merged

[release-1.26] Backports for 2024-03 release cycle#9692
brandond merged 22 commits intok3s-io:release-1.26from
brandond:2024-03-backports_release-1.26

Conversation

@brandond
Copy link
Copy Markdown
Member

@brandond brandond commented Mar 7, 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 21 commits March 7, 2024 18:45
Signed-off-by: Edgar Lee <edgarhinshunlee@gmail.com>
(cherry picked from commit 8c83b5e)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
* 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 <brad.davidson@rancher.com>
(cherry picked from commit be569f6)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 513c341)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
* 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 <brad.davidson@rancher.com>
(cherry picked from commit 82432a2)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 109e3e4)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit b164d7a)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 3576ed4)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
…ing from config

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 0b35932)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
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 <brad.davidson@rancher.com>
(cherry picked from commit 88d30f9)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Signed-off-by: Philip Laine <philip.laine@gmail.com>
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 26feb25)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 84a071a)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit b5a4846)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 091a5c8)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
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 <fcastelli@suse.com>
(cherry picked from commit 64e4f0e)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
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 <fcastelli@suse.com>
(cherry picked from commit f82d438)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Signed-off-by: Vitor Savian <vitor.savian@suse.com>
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 59c724f)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
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 <alienware505@gmail.com>
(cherry picked from commit ff7cfa2)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Also, if NO_COLOR is empty, output will be colored, otherwise not colored.

Signed-off-by: Rishikesh Nair <alienware505@gmail.com>
(cherry picked from commit ce0765c)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Co-authored-by: Brad Davidson <brad@oatmail.org>
Signed-off-by: Rishikesh Nair <42700059+rishinair11@users.noreply.github.com>
(cherry picked from commit 82cfacb)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
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 <brad.davidson@rancher.com>
(cherry picked from commit 6f331ea)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
@brandond brandond requested a review from a team as a code owner March 7, 2024 19:01
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
@codecov
Copy link
Copy Markdown

codecov bot commented Mar 8, 2024

Codecov Report

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

Project coverage is 15.08%. Comparing base (be5d577) to head (8ba2aa1).
Report is 2 commits behind head on release-1.26.

Files Patch % Lines
pkg/spegel/spegel.go 0.00% 22 Missing ⚠️
pkg/etcd/snapshot.go 0.00% 19 Missing ⚠️
pkg/agent/containerd/config.go 77.41% 8 Missing and 6 partials ⚠️
pkg/agent/run.go 0.00% 6 Missing ⚠️
pkg/agent/netpol/netpol.go 0.00% 3 Missing ⚠️
pkg/etcd/etcd.go 0.00% 2 Missing and 1 partial ⚠️
pkg/cli/cmds/etcd_snapshot.go 0.00% 1 Missing ⚠️
pkg/spegel/bootstrap.go 0.00% 1 Missing ⚠️
Additional details and impacted files
@@               Coverage Diff                @@
##           release-1.26    #9692      +/-   ##
================================================
+ Coverage         14.84%   15.08%   +0.24%     
================================================
  Files               115      115              
  Lines              8480     8517      +37     
================================================
+ Hits               1259     1285      +26     
- Misses             6971     6979       +8     
- Partials            250      253       +3     
Flag Coverage Δ
unittests 15.08% <44.80%> (+0.24%) ⬆️

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 8d24a9d into k3s-io:release-1.26 Mar 8, 2024
@brandond brandond deleted the 2024-03-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.

6 participants