k3s-io
/
k3s
mirror of https://github.com/k3s-io/k3s.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix on-demand snapshots not honoring folder 

Also fix etcd s3 tests to actually check that the files are saved to s3 🙃

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
pull/10001/head
Brad Davidson 2024-04-19 17:33:50 +00:00 committed by Brad Davidson
parent d973fadbed
commit 5b431ca531
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/etcd/snapshot_handler.go
View File

@ -170,14 +170,15 @@ func (e *ETCD) withRequest(sr *SnapshotRequest) *ETCD {
} }
if sr.S3 != nil { if sr.S3 != nil {
re.config.EtcdS3 = true re.config.EtcdS3 = true
re.config.EtcdS3BucketName = sr.S3.Bucket
re.config.EtcdS3AccessKey = sr.S3.AccessKey re.config.EtcdS3AccessKey = sr.S3.AccessKey
re.config.EtcdS3SecretKey = sr.S3.SecretKey re.config.EtcdS3BucketName = sr.S3.Bucket
re.config.EtcdS3Endpoint = sr.S3.Endpoint re.config.EtcdS3Endpoint = sr.S3.Endpoint
re.config.EtcdS3EndpointCA = sr.S3.EndpointCA re.config.EtcdS3EndpointCA = sr.S3.EndpointCA
re.config.EtcdS3SkipSSLVerify = sr.S3.SkipSSLVerify re.config.EtcdS3Folder = sr.S3.Folder
re.config.EtcdS3Insecure = sr.S3.Insecure re.config.EtcdS3Insecure = sr.S3.Insecure
re.config.EtcdS3Region = sr.S3.Region re.config.EtcdS3Region = sr.S3.Region
re.config.EtcdS3SecretKey = sr.S3.SecretKey
re.config.EtcdS3SkipSSLVerify = sr.S3.SkipSSLVerify
re.config.EtcdS3Timeout = sr.S3.Timeout.Duration re.config.EtcdS3Timeout = sr.S3.Timeout.Duration
} }
return re return re

5
tests/e2e/s3/Vagrantfile vendored
View File

@ -29,7 +29,7 @@ def provision(vm, role, role_num, node_num)
runS3mock = <<~'SCRIPT' runS3mock = <<~'SCRIPT'
docker run -p 9090:9090 -p 9191:9191 -d -e initialBuckets=test -e debug=true -t adobe/s3mock docker run -p 9090:9090 -p 9191:9191 -d -e initialBuckets=test-bucket -e debug=true -t adobe/s3mock
SCRIPT SCRIPT
@ -45,7 +45,8 @@ def provision(vm, role, role_num, node_num)
flannel-iface: eth1 flannel-iface: eth1
cluster-init: true cluster-init: true
etcd-s3-insecure: true etcd-s3-insecure: true
etcd-s3-bucket: test etcd-s3-bucket: test-bucket
etcd-s3-folder: test-folder
etcd-s3: true etcd-s3: true
etcd-s3-endpoint: localhost:9090 etcd-s3-endpoint: localhost:9090
etcd-s3-skip-ssl-verify: true etcd-s3-skip-ssl-verify: true

9
tests/e2e/s3/s3_test.go
View File

@ -95,6 +95,7 @@ var _ = Describe("Verify Create", Ordered, func() {
res, err := e2e.RunCmdOnNode("k3s etcd-snapshot list", serverNodeNames[0]) res, err := e2e.RunCmdOnNode("k3s etcd-snapshot list", serverNodeNames[0])
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
Expect(res).To(ContainSubstring("file:///var/lib/rancher/k3s/server/db/snapshots/on-demand-server-0")) Expect(res).To(ContainSubstring("file:///var/lib/rancher/k3s/server/db/snapshots/on-demand-server-0"))
Expect(res).To(ContainSubstring("s3://test-bucket/test-folder/on-demand-server-0"))
}) })
It("save 3 more s3 snapshots", func() { It("save 3 more s3 snapshots", func() {
for _, i := range []string{"1", "2", "3"} { for _, i := range []string{"1", "2", "3"} {
@ -106,10 +107,10 @@ var _ = Describe("Verify Create", Ordered, func() {
It("lists saved s3 snapshot", func() { It("lists saved s3 snapshot", func() {
res, err := e2e.RunCmdOnNode("k3s etcd-snapshot list", serverNodeNames[0]) res, err := e2e.RunCmdOnNode("k3s etcd-snapshot list", serverNodeNames[0])
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
Expect(res).To(ContainSubstring("on-demand-server-0")) Expect(res).To(ContainSubstring("s3://test-bucket/test-folder/on-demand-server-0"))
Expect(res).To(ContainSubstring("special-1-server-0")) Expect(res).To(ContainSubstring("s3://test-bucket/test-folder/special-1-server-0"))
Expect(res).To(ContainSubstring("special-2-server-0")) Expect(res).To(ContainSubstring("s3://test-bucket/test-folder/special-2-server-0"))
Expect(res).To(ContainSubstring("special-3-server-0")) Expect(res).To(ContainSubstring("s3://test-bucket/test-folder/special-3-server-0"))
}) })
It("delete first on-demand s3 snapshot", func() { It("delete first on-demand s3 snapshot", func() {
_, err := e2e.RunCmdOnNode("sudo k3s etcd-snapshot ls >> ./snapshotname.txt", serverNodeNames[0]) _, err := e2e.RunCmdOnNode("sudo k3s etcd-snapshot ls >> ./snapshotname.txt", serverNodeNames[0])