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.

Sign up for GitHub

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

Jump to bottom

[release-1.31] Backports for 2024-10 #11054

Merged
merged 12 commits into from
Oct 10, 2024
Merged

[release-1.31] Backports for 2024-10 #11054

merged 12 commits into from
Oct 10, 2024

Conversation

brandond
Copy link
Member

@brandond brandond commented Oct 9, 2024 •
edited
Loading

Proposed Changes

Backports:

Types of Changes

backports

Verification

see linked issues

Testing

Linked Issues

User-Facing Change

Further Comments

brandond and others added 10 commits October 9, 2024 22:27
@brandond
Use static CNI bin dir
2f6d159 
Maintain a separate dir for CNI binaries so that additional plugins can be installed in a predictable location that does not change every time k3s is upgraded.

Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit ed14f7f)
Signed-off-by: Brad Davidson <[email protected]>
@brandond
Bump kine to v0.13.0
3627d89 
Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit cda31eb)
Signed-off-by: Brad Davidson <[email protected]>
@brandond
Bump traefik to chart 27.0.2 / appVersion v2.11.10
6e9fceb 
Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit 6c6d87d)
Signed-off-by: Brad Davidson <[email protected]>
@brandond
Bump kine
7dd447f 
Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit c9e7b05)
Signed-off-by: Brad Davidson <[email protected]>
@brandond
Fix sqlite endpoint when migrating from sqlite to etcd
95a250f 
Support for 'sqlite' as the endpoint was removed in
k3s-io/kine#320 and the constant removed in
k3s-io/kine#325

Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit 0942e6a)
Signed-off-by: Brad Davidson <[email protected]>
@brandond
Fix race condition when multiple nodes reconcile S3 snapshots
735ca4d 
Don't delete s3 etcdsnapshotfiles if they are missing from s3 but less than a minute old, its possible the other node just finished uploading it and the object key has not yet become visible.

Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit 0826ebc)
Signed-off-by: Brad Davidson <[email protected]>
@brandond
Add ca-cert rotation integration test
22f3518 
Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit b1a42e5)
Signed-off-by: Brad Davidson <[email protected]>
@brandond
Fix issue that caused passwd file and psk to be regenerated when rota…
f127a0c 
…ting CA certs

Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit c6392c9)
Signed-off-by: Brad Davidson <[email protected]>
@brandond
Update tcpproxy for import path change
a08c1b9 
Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit 1ae9ca7)
Signed-off-by: Brad Davidson <[email protected]>
@github-actions @brandond
chore: Bump Local Path Provisioner version
c62d376 
Made with ❤️️ by updatecli

Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit c00af8e)
Signed-off-by: Brad Davidson <[email protected]>
@brandond brandond requested a review from a team as a code owner October 9, 2024 22:59
@brandond
Bump local-path-provisioner to v0.0.30
4f4632f 
Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit b0ad6d8)
Signed-off-by: Brad Davidson <[email protected]>
@brandond
Bump helm-controller and klipper-helm
9052272 
Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit 7552203)
Signed-off-by: Brad Davidson <[email protected]>
@brandond brandond force-pushed the 2024-10-backports_release-1.31 branch from 6f82c97 to 9052272 Compare October 10, 2024 07:05
@codecov Codecov
Copy link

codecov bot commented Oct 10, 2024 •
edited
Loading

Codecov Report

Attention: Patch coverage is 17.50000% with 33 lines in your changes missing coverage. Please review.

Project coverage is 43.81%. Comparing base (efa2804) to head (9052272).
Report is 14 commits behind head on release-1.31.

Files with missing lines Patch % Lines
pkg/server/cert.go 0.00% 14 Missing ⚠️
pkg/etcd/snapshot.go 13.33% 13 Missing ⚠️
pkg/etcd/s3/s3.go 50.00% 2 Missing and 3 partials ⚠️
pkg/etcd/etcd.go 0.00% 1 Missing ⚠️

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

HEAD has 1 upload less than BASE
Flag BASE (efa2804) HEAD (9052272)
e2etests 7 6
Additional details and impacted files 
@@               Coverage Diff                @@
##           release-1.31   #11054      +/-   ##
================================================
- Coverage         49.82%   43.81%   -6.01%     
================================================
  Files               178      178              
  Lines             14777    14790      +13     
================================================
- Hits               7362     6480     -882     
- Misses             6080     7113    +1033     
+ Partials           1335     1197     -138
Flag Coverage Δ
e2etests 36.17% <0.00%> (-9.85%) ⬇️
inttests 19.81% <5.00%> (-16.93%) ⬇️
unittests 13.57% <12.50%> (+<0.01%) ⬆️

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.

@cwayne18
Copy link
Member

/trivy

@github-actions GitHub Actions
Copy link
Contributor

❌ Trivy scan action failed, check logs ❌

@cwayne18
Copy link
Member

/trivy

@github-actions GitHub Actions
Copy link
Contributor 


bin/cni (gobinary)
==================
Total: 1 (HIGH: 1, CRITICAL: 0)

┌─────────┬────────────────┬──────────┬────────┬───────────────────┬────────────────┬───────────────────────────────────────────────────────────┐
│ Library │ Vulnerability  │ Severity │ Status │ Installed Version │ Fixed Version  │                           Title                           │
├─────────┼────────────────┼──────────┼────────┼───────────────────┼────────────────┼───────────────────────────────────────────────────────────┤
│ stdlib  │ CVE-2024-34156 │ HIGH     │ fixed  │ 1.22.6            │ 1.22.7, 1.23.1 │ encoding/gob: golang: Calling Decoder.Decode on a message │
│         │                │          │        │                   │                │ which contains deeply nested structures...                │
│         │                │          │        │                   │                │ https://avd.aquasec.com/nvd/cve-2024-34156                │
└─────────┴────────────────┴──────────┴────────┴───────────────────┴────────────────┴───────────────────────────────────────────────────────────┘

bin/containerd-shim-runc-v2 (gobinary)
======================================
Total: 1 (HIGH: 1, CRITICAL: 0)

┌─────────┬────────────────┬──────────┬────────┬───────────────────┬────────────────┬───────────────────────────────────────────────────────────┐
│ Library │ Vulnerability  │ Severity │ Status │ Installed Version │ Fixed Version  │                           Title                           │
├─────────┼────────────────┼──────────┼────────┼───────────────────┼────────────────┼───────────────────────────────────────────────────────────┤
│ stdlib  │ CVE-2024-34156 │ HIGH     │ fixed  │ 1.22.6            │ 1.22.7, 1.23.1 │ encoding/gob: golang: Calling Decoder.Decode on a message │
│         │                │          │        │                   │                │ which contains deeply nested structures...                │
│         │                │          │        │                   │                │ https://avd.aquasec.com/nvd/cve-2024-34156                │
└─────────┴────────────────┴──────────┴────────┴───────────────────┴────────────────┴───────────────────────────────────────────────────────────┘

bin/k3s (gobinary)
==================
Total: 2 (HIGH: 2, CRITICAL: 0)

┌──────────────────────────────────────────────────────────────┬────────────────┬──────────┬────────┬───────────────────┬────────────────┬─────────────────────────────────────────────────────────────┐
│                           Library                            │ Vulnerability  │ Severity │ Status │ Installed Version │ Fixed Version  │                            Title                            │
├──────────────────────────────────────────────────────────────┼────────────────┼──────────┼────────┼───────────────────┼────────────────┼─────────────────────────────────────────────────────────────┤
│ go.opentelemetry.io/contrib/instrumentation/google.golang.o- │ CVE-2023-47108 │ HIGH     │ fixed  │ v0.45.0           │ 0.46.0         │ opentelemetry-go-contrib: DoS vulnerability in otelgrpc due │
│ rg/grpc/otelgrpc                                             │                │          │        │                   │                │ to unbound cardinality metrics                              │
│                                                              │                │          │        │                   │                │ https://avd.aquasec.com/nvd/cve-2023-47108                  │
├──────────────────────────────────────────────────────────────┼────────────────┤          │        ├───────────────────┼────────────────┼─────────────────────────────────────────────────────────────┤
│ stdlib                                                       │ CVE-2024-34156 │          │        │ 1.22.6            │ 1.22.7, 1.23.1 │ encoding/gob: golang: Calling Decoder.Decode on a message   │
│                                                              │                │          │        │                   │                │ which contains deeply nested structures...                  │
│                                                              │                │          │        │                   │                │ https://avd.aquasec.com/nvd/cve-2024-34156                  │
└──────────────────────────────────────────────────────────────┴────────────────┴──────────┴────────┴───────────────────┴────────────────┴─────────────────────────────────────────────────────────────┘

bin/runc (gobinary)
===================
Total: 1 (HIGH: 1, CRITICAL: 0)

┌─────────┬────────────────┬──────────┬────────┬───────────────────┬────────────────┬───────────────────────────────────────────────────────────┐
│ Library │ Vulnerability  │ Severity │ Status │ Installed Version │ Fixed Version  │                           Title                           │
├─────────┼────────────────┼──────────┼────────┼───────────────────┼────────────────┼───────────────────────────────────────────────────────────┤
│ stdlib  │ CVE-2024-34156 │ HIGH     │ fixed  │ 1.22.6            │ 1.22.7, 1.23.1 │ encoding/gob: golang: Calling Decoder.Decode on a message │
│         │                │          │        │                   │                │ which contains deeply nested structures...                │
│         │                │          │        │                   │                │ https://avd.aquasec.com/nvd/cve-2024-34156                │
└─────────┴────────────────┴──────────┴────────┴───────────────────┴────────────────┴───────────────────────────────────────────────────────────┘

@brandond brandond merged commit 0ec9894 into k3s-io:release-1.31 Oct 10, 2024
30 checks passed
@cguertin14 cguertin14 mentioned this pull request Oct 30, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rbrtbnfgl rbrtbnfgl rbrtbnfgl approved these changes

@dereknola dereknola dereknola approved these changes

@cwayne18 cwayne18 cwayne18 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@brandond @cwayne18 @dereknola @rbrtbnfgl