Merge pull request #455 from skriss/remove-aws-region

AWS: remove region requirement from config for backupStorageProvider
This commit is contained in:
Andy Goldstein
2018-05-23 11:02:57 -04:00
committed by GitHub
4 changed files with 57 additions and 8 deletions
+9
View File
@@ -335,6 +335,15 @@ func applyConfigDefaults(c *api.Config, logger logrus.FieldLogger) {
} else {
logger.WithField("priorities", c.ResourcePriorities).Info("Using resource priorities from config")
}
if c.BackupStorageProvider.Config == nil {
c.BackupStorageProvider.Config = make(map[string]string)
}
// add the bucket name to the config map so that object stores can use
// it when initializing. The AWS object store uses this to determine the
// bucket's region when setting up its client.
c.BackupStorageProvider.Config["bucket"] = c.BackupStorageProvider.Bucket
}
// watchConfig adds an update event handler to the Config shared informer, invoking s.cancelFunc