Skip to content

K
k3s
Commit 62bbef72 authored by Brian Downs's avatar Brian Downs
Browse files
Options

update struct field doc comment and get basename on s3 obj

Signed-off-by: 's avatarBrian Downs <brian.downs@gmail.com>
parent 83ae76fe
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 3 deletions
pkg/etcd/etcd.go
View file @ 62bbef72
...@@ -884,8 +884,7 @@ type s3Config struct { ...@@ -884,8 +884,7 @@ type s3Config struct {
type snapshotFile struct { type snapshotFile struct {
Name string `json:"name"` Name string `json:"name"`
// Location contains the full path of the snapshot. For // Location contains the full path of the snapshot. For
// local paths, the location will be prefixed with "file://" // local paths, the location will be prefixed with "file://".
// and for S3 will be "s3://".
Location string `json:"location,omitempty"` Location string `json:"location,omitempty"`
NodeName string `json:"nodeName,omitempty"` NodeName string `json:"nodeName,omitempty"`
CreatedAt *metav1.Time `json:"createdAt,omitempty"` CreatedAt *metav1.Time `json:"createdAt,omitempty"`
...@@ -918,7 +917,7 @@ func (e *ETCD) listSnapshots(ctx context.Context, snapshotDir string) ([]snapsho ...@@ -918,7 +917,7 @@ func (e *ETCD) listSnapshots(ctx context.Context, snapshotDir string) ([]snapsho
return nil, err return nil, err
} }
snapshots = append(snapshots, snapshotFile{ snapshots = append(snapshots, snapshotFile{
Name: obj.Key, Name: filepath.Base(obj.Key),
NodeName: nodeName, NodeName: nodeName,
CreatedAt: &metav1.Time{ CreatedAt: &metav1.Time{
Time: ca, Time: ca,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment