mirrors/velero
1
0
Fork 0
mirror of https://github.com/vmware-tanzu/velero.git synced 2026-01-08 22:23:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

move server's defaultBackupLocation into config struct

Browse Source 
Signed-off-by: Steve Kriss <steve@heptio.com>
This commit is contained in:
Steve Kriss
2018-08-22 19:51:10 -07:00
parent 0e94fa37f9
commit bd4d97b9e4
1 changed files with 18 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -76,10 +76,10 @@ const (
)
type serverConfig struct {
pluginDir, metricsAddress string
backupSyncPeriod, podVolumeOperationTimeout time.Duration
restoreResourcePriorities []string
restoreOnly bool
pluginDir, metricsAddress, defaultBackupLocation string
backupSyncPeriod, podVolumeOperationTimeout time.Duration
restoreResourcePriorities []string
restoreOnly bool
}
func NewCommand() *cobra.Command {
@@ -88,11 +88,11 @@ func NewCommand() *cobra.Command {
config = serverConfig{
pluginDir: "/plugins",
metricsAddress: defaultMetricsAddress,
defaultBackupLocation: "default",
backupSyncPeriod: defaultBackupSyncPeriod,
podVolumeOperationTimeout: defaultPodVolumeOperationTimeout,
restoreResourcePriorities: defaultRestorePriorities,
}
defaultBackupLocation = "default"
)
var command = &cobra.Command{
@@ -127,7 +127,7 @@ func NewCommand() *cobra.Command {
}
namespace := getServerNamespace(namespaceFlag)
s, err := newServer(namespace, fmt.Sprintf("%s-%s", c.Parent().Name(), c.Name()), config, defaultBackupLocation, logger)
s, err := newServer(namespace, fmt.Sprintf("%s-%s", c.Parent().Name(), c.Name()), config, logger)
cmd.CheckError(err)
cmd.CheckError(s.run())
@@ -141,7 +141,7 @@ func NewCommand() *cobra.Command {
command.Flags().DurationVar(&config.podVolumeOperationTimeout, "restic-timeout", config.podVolumeOperationTimeout, "how long backups/restores of pod volumes should be allowed to run before timing out")
command.Flags().BoolVar(&config.restoreOnly, "restore-only", config.restoreOnly, "run in a mode where only restores are allowed; backups, schedules, and garbage-collection are all disabled")
command.Flags().StringSliceVar(&config.restoreResourcePriorities, "restore-resource-priorities", config.restoreResourcePriorities, "desired order of resource restores; any resource not in the list will be restored alphabetically after the prioritized resources")
command.Flags().StringVar(&defaultBackupLocation, "default-backup-storage-location", defaultBackupLocation, "name of the default backup storage location")
command.Flags().StringVar(&config.defaultBackupLocation, "default-backup-storage-location", config.defaultBackupLocation, "name of the default backup storage location")
return command
}
@@ -181,10 +181,9 @@ type server struct {
resticManager restic.RepositoryManager
metrics *metrics.ServerMetrics
config serverConfig
defaultBackupLocation string
}
func newServer(namespace, baseName string, config serverConfig, defaultBackupLocation string, logger *logrus.Logger) (*server, error) {
func newServer(namespace, baseName string, config serverConfig, logger *logrus.Logger) (*server, error) {
clientConfig, err := client.Config("", "", baseName)
if err != nil {
return nil, err
@@ -225,14 +224,13 @@ func newServer(namespace, baseName string, config serverConfig, defaultBackupLoc
discoveryClient: arkClient.Discovery(),
dynamicClient: dynamicClient,
sharedInformerFactory: informers.NewFilteredSharedInformerFactory(arkClient, 0, namespace, nil),
ctx: ctx,
cancelFunc: cancelFunc,
logger: logger,
logLevel: logger.Level,
pluginRegistry: pluginRegistry,
pluginManager: pluginManager,
config: config,
defaultBackupLocation: defaultBackupLocation,
ctx: ctx,
cancelFunc: cancelFunc,
logger: logger,
logLevel: logger.Level,
pluginRegistry: pluginRegistry,
pluginManager: pluginManager,
config: config,
}
return s, nil
@@ -271,7 +269,7 @@ func (s *server) run() error {
s.watchConfig(originalConfig)
backupStorageLocation, err := s.arkClient.ArkV1().BackupStorageLocations(s.namespace).Get(s.defaultBackupLocation, metav1.GetOptions{})
backupStorageLocation, err := s.arkClient.ArkV1().BackupStorageLocations(s.namespace).Get(s.config.defaultBackupLocation, metav1.GetOptions{})
if err != nil {
return errors.WithStack(err)
}
@@ -641,7 +639,7 @@ func (s *server) runControllers(config *api.Config, defaultBackupLocation *api.B
s.pluginRegistry,
backupTracker,
s.sharedInformerFactory.Ark().V1().BackupStorageLocations(),
s.defaultBackupLocation,
s.config.defaultBackupLocation,
s.metrics,
)
wg.Add(1)
@@ -724,7 +722,7 @@ func (s *server) runControllers(config *api.Config, defaultBackupLocation *api.B
s.logger,
s.logLevel,
s.pluginRegistry,
s.defaultBackupLocation,
s.config.defaultBackupLocation,
s.metrics,
)