etcd-snapshot save ignores s3-folder param provided and saves only in s3-bucket location about k3s

[aganesh-suse]

Validated on master branch with commit d3b6054

Environment Details

Infrastructure

• Cloud
• Hosted

Node(s) CPU architecture, OS, and Version:

$ cat /etc/os-release
PRETTY_NAME="Ubuntu 22.04.2 LTS"

$ uname -m
x86_64

Cluster Configuration:

HA: 3 server/ 1 agent

Config.yaml:

token: xxxx
cluster-init: true
write-kubeconfig-mode: "0644"
node-external-ip: 1.1.1.1
node-label:
- k3s-upgrade=server

Testing Steps

1. Copy config.yaml

$ sudo mkdir -p /etc/rancher/k3s && sudo cp config.yaml /etc/rancher/k3s

2. Install k3s

curl -sfL https://get.k3s.io | sudo INSTALL_K3S_COMMIT='d3b60543e7df924881854108984593aafb557d3c' sh -s - server

3. Verify Cluster Status:

kubectl get nodes -o wide
kubectl get pods -A

4. Perform etcd-snapshot save with s3 details provided:

$ sudo /usr/local/bin/k3s etcd-snapshot save --s3 --s3-bucket=<bucket> --s3-folder=<folder> --s3-region=<region> --s3-access-key=xxxx --s3-secret-key="xxxx" --debug 

5. Verify the etcdsnapshotfile path location for the s3 snapshot includes both the s3 bucket and the s3 folder location:

$ sudo /usr/local/bin/kubectl --kubeconfig /etc/rancher/k3s/k3s.yaml get etcdsnapshotfile

Validation Results:

• k3s version used for validation:

$ k3s -v
k3s version v1.29.4+k3s-d3b60543 (d3b60543)
go version go1.21.9

 $ sudo /usr/local/bin/kubectl --kubeconfig /etc/rancher/k3s/k3s.yaml get etcdsnapshotfile
NAME                                                 SNAPSHOTNAME                            NODE               LOCATION                                                                                   SIZE      CREATIONTIME
local-on-demand-ip-172-31-16-180-1713803552-1fc677   on-demand-ip-172-31-16-180-1713803552   ip-172-31-16-180   file:///var/lib/rancher/k3s/server/db/snapshots/on-demand-ip-172-31-16-180-1713803552      5529632   2024-04-22T16:32:32Z
local-on-demand-ip-172-31-16-180-1713803621-e205c5   on-demand-ip-172-31-16-180-1713803621   ip-172-31-16-180   file:///var/lib/rancher/k3s/server/db/snapshots/on-demand-ip-172-31-16-180-1713803621      5726240   2024-04-22T16:33:41Z
s3-on-demand-ip-172-31-16-180-1713803552-60bff9      on-demand-ip-172-31-16-180-1713803552   ip-172-31-16-180   s3://<s3-bucket>/<s3-folder>/on-demand-ip-172-31-16-180-1713803552   5529632   2024-04-22T16:32:32Z
s3-on-demand-ip-172-31-16-180-1713803621-db8c7c      on-demand-ip-172-31-16-180-1713803621   ip-172-31-16-180   s3://<s3-bucket>/<s3-folder>/on-demand-ip-172-31-16-180-1713803621   5726240   2024-04-22T16:33:41Z

As we can see, the s3-folder location was honored. Closing the bug.