Allow to exclude storageclasses from the annotations #10
Conversation
|
WAIT THIS IS NOT WORKING! |
| @@ -69,10 +69,11 @@ The following table lists the configurable parameters of the `velero-volume-cont | |||
| | `veleroVolumeCfg.includeVolumeTypes` | The comma-separated list of [volume types](https://kubernetes.io/docs/concepts/storage/volumes/) to include in the backup annotation addition (default: all volume types). | `persistentVolumeClaim` | | |||
| | `veleroVolumeCfg.excludeVolumeTypes` | The comma-separated list of [volume types](https://kubernetes.io/docs/concepts/storage/volumes/) to exclude from the backup annotation addition. | | | |||
| | `veleroVolumeCfg.excludeJobs` | The comma-separated list of [job names](https://kubernetes.io/docs/concepts/workloads/controllers/job/) to exclude from the backup annotation addition (support [basic string globs](https://github.com/ryanuber/go-glob)). | | | |||
| | `veleroVolumeCfg.excludeStorageClasses` | The comma-separated list of [storage classes](https://kubernetes.io/docs/concepts/storage/storage-classes/) to exclude from the backup annotation addition. This allows you to exclude storage classes that support snapshoting, since they should be handled by issuing a snapshot creation rather than go through restic. | | | |||
There was a problem hiding this comment.
The comma-separated list of storage classes to exclude from the backup annotation addition. This allows you to exclude storage classes that support snapshot feature since they could choose to be handled by issuing a snapshot creation rather than go through restic.
| @@ -66,7 +67,7 @@ func main() { | |||
| run := func() { | |||
| kubeInformerFactory := kubeinformers.NewSharedInformerFactory(kubeClient, 0) | |||
|
|
|||
| controller := velerovolume.NewController(cfg.VeleroVolumeCfg, kubeClient, kubeInformerFactory.Core().V1().Pods()) | |||
| controller := velerovolume.NewController(cfg.VeleroVolumeCfg, kubeClient, kubeInformerFactory.Core().V1().Pods(), kubeInformerFactory.Core().V1().PersistentVolumeClaims()) | |||
There was a problem hiding this comment.
There's no need to use PersistentVolumeClaimInformer since we don't watch this kind of resource, and use kubeclientset directly to get pvc information.
| @@ -48,6 +48,8 @@ type Controller struct { | |||
| podsLister corelisters.PodLister | |||
| podsSynced cache.InformerSynced | |||
|
|
|||
| pvcLister corelisters.PersistentVolumeClaimLister | |||
| @@ -8,4 +8,5 @@ veleroVolumeCfg: | |||
| excludeNamespaces: | |||
| includeVolumeTypes: persistentVolumeClaim | |||
| excludeVolumeTypes: | |||
| excludeJobs: * | |||
| @@ -15,3 +15,4 @@ data: | |||
| includeVolumeTypes: persistentVolumeClaim | |||
| excludeVolumeTypes: | |||
| excludeJobs: * | |||
| excludeStorageClasses: | |||
There was a problem hiding this comment.
excludeStorageClasses: azurefiles,azurefiles-premium
| pvcName := volume.PersistentVolumeClaim.ClaimName | ||
| pvc, err := c.pvcLister.PersistentVolumeClaims(namespace).Get(pvcName) | ||
| if err != nil { | ||
| klog.Warningf("Did not find the pvc with name %v: %v, cannot proceed", pvcName, err) |
There was a problem hiding this comment.
klog.Warningf("ingore volume %s since failed to get its relevant pvc %s, error: %s", volume.Name, pvcName.Name, err.Error())
| @@ -364,6 +368,21 @@ func (c *Controller) checkVolumeTypeRequirements(volumeType string) bool { | |||
| return false | |||
| } | |||
| } | |||
| } else if c.cfg.ExcludeStorageClasses != "" { | |||
|
Mine wasn't working at first because I had the logic wrong. I have iterated on it yesterday but I couldn't test it, so @duyanghao If you want to proceed with the MR from @benosman feel free, I think he got a bit further than I. |
Fixes #7
I follow up on @fredgate and implemented the filtering of storage classes.
Tell me what you think of it.