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.27] Backports for 2023-10 release #8615

Merged
merged 21 commits into from
Oct 13, 2023
Merged
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
044f6b5
Disable HTTP on main etcd client port
brandond Sep 22, 2023
ff3f810
Don't ignore assets in home dir if system assets exist
brandond Sep 26, 2023
fece87a
Pass SystemdCgroup setting through to nvidia runtime options
brandond Sep 27, 2023
e2cdecd
Bump containerd to v1.7.7-k3s1
brandond Oct 12, 2023
ddc7f01
Bump busybox to v1.36.1
brandond Oct 12, 2023
5cc1d41
Add ADR for etcd snapshot CRD migration
brandond Jul 28, 2023
2fe9c4b
Minor updates as per design review discussion
brandond Aug 14, 2023
d72e35b
Add new CRD for etcd snapshots
brandond Sep 8, 2023
b5fa6dd
Move etcd snapshot code into separate file
brandond Sep 28, 2023
ef02cd1
Elide old snapshot data when apiserver rejects configmap with ErrRequ…
brandond Sep 29, 2023
7b960b2
Tidy s3 upload functions
brandond Sep 29, 2023
b3f9969
Consistently set snapshotFile timestamp
brandond Sep 29, 2023
299bf2b
Move s3 snapshot list functionality to s3.go
brandond Sep 30, 2023
d0fac5a
Store extra metadata and cluster ID for snapshots
brandond Oct 2, 2023
865769b
Sort snapshots by time and key in tabwriter output
brandond Oct 10, 2023
75e0491
Move snapshot delete into local/s3 functions
brandond Oct 5, 2023
b7471c9
Switch to managing ETCDSnapshotFile resources
brandond Oct 3, 2023
42bb670
Add server token hash to CR and S3
brandond Oct 10, 2023
825bd81
Fix etcd snapshot integration tests
brandond Oct 10, 2023
7c727f2
Switch build target from main.go to a package. (#8342)
dlorenc Oct 12, 2023
d1ed5c0
Bump traefik, golang.org/x/net, google.golang.org/grpc
brandond Oct 13, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Pass SystemdCgroup setting through to nvidia runtime options
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 0e5c760)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
brandond committed Oct 12, 2023

Unverified

This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
commit fece87afafbe900a4504d0c5a92a5c322b2e9be5
1 change: 1 addition & 0 deletions pkg/agent/templates/templates_linux.go
Original file line number Diff line number Diff line change
@@ -125,6 +125,7 @@ enable_keychain = true
runtime_type = "{{$v.RuntimeType}}"
[plugins."io.containerd.grpc.v1.cri".containerd.runtimes."{{$k}}".options]
BinaryName = "{{$v.BinaryName}}"
SystemdCgroup = {{ .SystemdCgroup }}
{{end}}
`