[release-1.27] Backports for 2024-03 release cycle#9670
Merged
brandond merged 22 commits intok3s-io:release-1.27from Mar 8, 2024
Merged
[release-1.27] Backports for 2024-03 release cycle#9670brandond merged 22 commits intok3s-io:release-1.27from
brandond merged 22 commits intok3s-io:release-1.27from
Conversation
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>
58ebfb1 to
3afbf04
Compare
dereknola
approved these changes
Mar 7, 2024
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## release-1.27 #9670 +/- ##
=================================================
+ Coverage 15.29% 41.02% +25.73%
=================================================
Files 116 154 +38
Lines 11707 16665 +4958
=================================================
+ Hits 1790 6836 +5046
+ Misses 9662 8660 -1002
- Partials 255 1169 +914
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Proposed Changes
Backport:
NO_COLORenv var #9357Types of Changes
backports
Verification
See linked issues
Testing
Linked Issues
etcd-snapshot-dirdoes not exist #9390check-configoutput. #9668nodePortfor rootless k3s #9614Error getting the node objecterror spew on initial startup #9619User-Facing Change
Further Comments