mirrors/velero
1
0
Fork 0
mirror of https://github.com/vmware-tanzu/velero.git synced 2026-04-28 03:17:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2380 from nrb/fix-2379

Browse Source 
Only add CA cert to plugin config if it's defined
This commit is contained in:
Nolan Brubaker
2020-03-31 14:27:58 -04:00
committed by GitHub
parent 4961040652 7c87aebe5f
commit c850b8225f
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/persistence/object_store.go
View File

@@ -114,7 +114,10 @@ func NewObjectBackupStore(location *velerov1api.BackupStorageLocation, objectSto
}
location.Spec.Config["bucket"] = bucket
location.Spec.Config["prefix"] = prefix
location.Spec.Config["caCert"] = string(location.Spec.ObjectStorage.CACert)
// Only include a CACert if it's specified in order to maintain compatibility with plugins that don't expect it.
if location.Spec.ObjectStorage.CACert != nil {
location.Spec.Config["caCert"] = string(location.Spec.ObjectStorage.CACert)
}
}
objectStore, err := objectStoreGetter.GetObjectStore(location.Spec.Provider)