Support the caCert object storage entry #23
Conversation
Velero PR #2353 added the caCert into the object storage by default. The GCP plugin needs to honor this standard. Signed-off-by: Nolan Brubaker <brubakern@vmware.com>
| @@ -76,7 +77,7 @@ func newObjectStore(logger logrus.FieldLogger) *ObjectStore { | |||
| } | |||
|
|
|||
| func (o *ObjectStore) Init(config map[string]string) error { | |||
| if err := veleroplugin.ValidateObjectStoreConfigKeys(config, kmsKeyNameConfigKey, serviceAccountConfig); err != nil { | |||
| if err := veleroplugin.ValidateObjectStoreConfigKeys(config, kmsKeyNameConfigKey, serviceAccountConfig, caCert); err != nil { | |||
There was a problem hiding this comment.
the plugin framework function has been updated to always allow this key - see https://github.com/vmware-tanzu/velero/blob/master/pkg/plugin/framework/validation.go#L30. So we shouldn't have to add the key here, we can just update the velero dependency (for better or worse, this repo still uses dep and the master branch of velero so should just need a dep ensure -update github.com/vmware-tanzu/velero).
I do think we should probably change https://github.com/vmware-tanzu/velero/blob/master/pkg/persistence/object_store.go#L115-L117 to only add these items to the Config map if they're non-empty since we'll likely hit this issue for community plugins when we release the ca cert change.
There was a problem hiding this comment.
Got it, thanks. I saw this when I was testing against a branch based off master, so the GCP plugin hadn't been updated yet. I didn't catch the plugin framework part of the change, but I agree that's a better place to put it than updating each plugin individually.
I'll close out this PR.
|
This change is handled in https://github.com/vmware-tanzu/velero/blob/master/pkg/plugin/framework/validation.go#L30 more generically, which is a better solution than each plugin handling it themselves. Will open a separate PR to update the Velero dependency when a new version is out. |
Velero PR #2353 added the caCert into the object storage by default. The
GCP plugin needs to honor this standard.
Fixes #22
Signed-off-by: Nolan Brubaker brubakern@vmware.com