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.

Sign up for GitHub

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

Jump to bottom

feat: support set BackupStorageLocation(BSL) CA certificate #3167

Merged
merged 5 commits into from
Feb 8, 2021
Merged

feat: support set BackupStorageLocation(BSL) CA certificate #3167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0dec8c7
Rename --cacert-file to --cacert in the CLI design doc
Dec 9, 2020
6577844
Add a new flag --cacert under `velero backup-location set`
Dec 9, 2020
cc47a25
Add changelog
Dec 9, 2020
0046e41
Changelog rewording
Dec 15, 2020
6467e5d
Revert CLI design doc
Dec 15, 2020
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
1 change: 1 addition & 0 deletions changelogs/unreleased/3167-jenting
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
feat: support setting BackupStorageLocation CA certificate via `velero backup-location set --cacert`
17 changes: 17 additions & 0 deletions pkg/cmd/cli/backuplocation/set.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ package backuplocation
import (
"context"
"fmt"
"io/ioutil"
"path/filepath"

"github.com/pkg/errors"
"github.com/spf13/cobra"
Expand Down Expand Up @@ -51,6 +53,7 @@ func NewSetCommand(f client.Factory, use string) *cobra.Command {

type SetOptions struct {
Name string
CACertFile string
DefaultBackupStorageLocation bool
}

Expand All @@ -59,6 +62,7 @@ func NewSetOptions() *SetOptions {
}

func (o *SetOptions) BindFlags(flags *pflag.FlagSet) {
flags.StringVar(&o.CACertFile, "cacert", o.CACertFile, "File containing a certificate bundle to use when verifying TLS connections to the object store. Optional.")
flags.BoolVar(&o.DefaultBackupStorageLocation, "default", o.DefaultBackupStorageLocation, "Sets this new location to be the new default backup storage location. Optional.")
}

Expand All @@ -82,6 +86,18 @@ func (o *SetOptions) Run(c *cobra.Command, f client.Factory) error {
return errors.WithStack(err)
}

var caCertData []byte
if o.CACertFile != "" {
realPath, err := filepath.Abs(o.CACertFile)
if err != nil {
return err
}
caCertData, err = ioutil.ReadFile(realPath)
if err != nil {
return err
}
}

if o.DefaultBackupStorageLocation {
// There is one and only one default backup storage location.
// Disable the origin default backup storage location.
Expand All @@ -106,6 +122,7 @@ func (o *SetOptions) Run(c *cobra.Command, f client.Factory) error {
}

location.Spec.Default = o.DefaultBackupStorageLocation
location.Spec.StorageType.ObjectStorage.CACert = caCertData
if err := kbClient.Update(context.Background(), location, &kbclient.UpdateOptions{}); err != nil {
return errors.WithStack(err)
}
Expand Down