[Release 1.25] - Fix for cluster-reset backup from s3 when etcd snapshots are disabled

[vitorsavian]

Proposed Changes

If cluster-reset was called with etcd-disable-snapshots , k3s will verify if the user have etcd-s3 and then restore the snapshot from S3.

Types of Changes

• Backport from Fix for cluster-reset backup from s3 when etcd snapshots are disabled #8155

Verification

Create a config.yaml in the /etc/rancher/k3s with this flags

cluster-init: true
etcd-disable-snapshots: true
etcd-s3: true
etcd-s3-access-key: 'secretKey'
etcd-s3-secret-key: 'secretKey'
etcd-s3-bucket: 'bucketName'
etcd-s3-region: 'awsRegion'
etcd-s3-timeout: '90s'

Now you can create the server

k3s server 

Then you need to save the snapshot, that will backup to s3

k3s etcd-snapshot save

Turn off the k3s and then

k3s server --cluster-reset --cluster-reset-restore-path="s3SnapshotName"

Testing

Linked Issues

• [Release-1.25] - --etcd-disable-snapshots flag usage leads to unexpected behavior #8166

User-Facing Change

Further Comments

With this change, users can now manage and backup their own snapshots on demand from S3.

[codecov]

Codecov Report

Patch and project coverage have no change.

Comparison is base (8e945c5) 19.40% compared to head (6d3a292) 19.40%.

Additional details and impacted files

@@              Coverage Diff              @@
##           release-1.25    #8169   +/-   ##
=============================================
  Coverage         19.40%   19.40%           
=============================================
  Files                83       83           
  Lines              5634     5634           
=============================================
  Hits               1093     1093           
  Misses             4315     4315           
  Partials            226      226           

Flag	Coverage Δ
unittests	19.40% <ø> (ø)

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.