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.31] Backports for 2024-09 #10842

Merged
merged 10 commits into from
Sep 6, 2024

Conversation

dereknola and others added 3 commits September 5, 2024 18:56
Signed-off-by: Derek Nola <derek.nola@suse.com>
(cherry picked from commit fa6940d)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Bumps [aquasecurity/trivy-action](https://github.com/aquasecurity/trivy-action) from 0.20.0 to 0.24.0.
- [Release notes](https://github.com/aquasecurity/trivy-action/releases)
- [Commits](aquasecurity/trivy-action@0.20.0...0.24.0)

---
updated-dependencies:
- dependency-name: aquasecurity/trivy-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
(cherry picked from commit dacc636)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 3d6e4a7)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
@brandond brandond requested a review from a team as a code owner September 5, 2024 20:02
Copy link

codecov bot commented Sep 5, 2024

Codecov Report

Attention: Patch coverage is 10.41667% with 43 lines in your changes missing coverage. Please review.

Project coverage is 43.91%. Comparing base (e0c4e60) to head (e33a350).
Report is 10 commits behind head on release-1.31.

Files with missing lines Patch % Lines
pkg/agent/containerd/config.go 12.00% 18 Missing and 4 partials ⚠️
pkg/server/cert.go 0.00% 20 Missing ⚠️
pkg/bootstrap/bootstrap.go 66.66% 1 Missing ⚠️

❗ There is a different number of reports uploaded between BASE (e0c4e60) and HEAD (e33a350). Click for more details.

HEAD has 1 upload less than BASE
Flag BASE (e0c4e60) HEAD (e33a350)
e2etests 7 6
Additional details and impacted files
@@               Coverage Diff                @@
##           release-1.31   #10842      +/-   ##
================================================
- Coverage         49.41%   43.91%   -5.50%     
================================================
  Files               178      178              
  Lines             14740    14777      +37     
================================================
- Hits               7284     6490     -794     
- Misses             6145     7097     +952     
+ Partials           1311     1190     -121     
Flag Coverage Δ
e2etests 36.28% <10.41%> (-10.14%) ⬇️
inttests 36.76% <10.41%> (+29.59%) ⬆️
unittests 13.57% <0.00%> (-0.04%) ⬇️

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 and others added 7 commits September 6, 2024 01:53
This is less effort than passing the tag across steps 🤷‍♂️

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 378edb9)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit bd45aa5)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Used https://github.com/coredns/corefile-migration to
migrate the corefile. There are no changes for the
default file from 1.10.1 to 1.11.3.

Notable plugin changes include the k8s_external with fallthrough option
and rewrite with cname_target option.

These changes are not part of the default config that ships
with k3s. Customers using these two plugins can start using the new options

Metrics does not have any new features other than build tooling updates.

Requires rancher/image-mirror#704

Signed-off-by: Harsimran Singh Maan <maan.harry@gmail.com>
(cherry picked from commit 0b4d249)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit d746073)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 662799f)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
…d CAs

Also silences warnings about bootstrap fields that are not intended to be handled by CA rotation

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit fe3324c)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 270f85e)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
@brandond brandond force-pushed the 2024-09-backports_release-1.31 branch from 1b83b65 to e33a350 Compare September 6, 2024 01:54
@brandond brandond merged commit 2caa785 into k3s-io:release-1.31 Sep 6, 2024
30 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.

5 participants