vmware-tanzu
/
velero
mirror of https://github.com/vmware-tanzu/velero.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #930 from skriss/fix-898 

don't require a default backup storage location to exist
pull/935/head
KubeKween 2018-10-12 12:34:44 -07:00 committed by GitHub
parent 37031d5e7c 4173515435
commit 0e7f442f00
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/cmd/server/server.go
View File

@ -272,9 +272,9 @@ func (s *server) run() error {
s.watchConfig(originalConfig)
backupStorageLocation, err := s.arkClient.ArkV1().BackupStorageLocations(s.namespace).Get(s.config.defaultBackupLocation, metav1.GetOptions{})
if err != nil {
return errors.WithStack(err)
if _, err = s.arkClient.ArkV1().BackupStorageLocations(s.namespace).Get(s.config.defaultBackupLocation, metav1.GetOptions{}); err != nil {
s.logger.WithError(errors.WithStack(err)).
Warnf("Default backup storage location %q not found; backups must explicitly specify a location", s.config.defaultBackupLocation)
}
if config.PersistentVolumeProvider == nil {
@ -288,11 +288,11 @@ func (s *server) run() error {
s.blockStore = blockStore
}
if err := s.initRestic(backupStorageLocation); err != nil {
if err := s.initRestic(); err != nil {
return err
}
if err := s.runControllers(config, backupStorageLocation); err != nil {
if err := s.runControllers(config); err != nil {
return err
}
@ -524,7 +524,7 @@ func getBlockStore(cloudConfig api.CloudProviderConfig, manager plugin.Manager)
return blockStore, nil
}
func (s *server) initRestic(location *api.BackupStorageLocation) error {
func (s *server) initRestic() error {
// warn if restic daemonset does not exist
if _, err := s.kubeClient.AppsV1().DaemonSets(s.namespace).Get(restic.DaemonSet, metav1.GetOptions{}); apierrors.IsNotFound(err) {
s.logger.Warn("Ark restic daemonset not found; restic backups/restores will not work until it's created")
@ -572,7 +572,7 @@ func (s *server) initRestic(location *api.BackupStorageLocation) error {
return nil
}
func (s *server) runControllers(config *api.Config, defaultBackupLocation *api.BackupStorageLocation) error {
func (s *server) runControllers(config *api.Config) error {
s.logger.Info("Starting controllers")
ctx := s.ctx