Merge pull request #497 from deepakkinni/xport-2

[Cherry-pick]Remove health annotation from PVC (#495)

pkg/constants/constants.go

@@ -414,3 +414,11 @@ const (
 	DefaultSecretName         = "velero-vsphere-config-secret"
 	DefaultSecretNamespace    = "velero"
 )
+
+const (
+	// AnnVolumeHealth is the key for HealthStatus annotation on volume claim
+	// for vSphere CSI Driver.
+	AnnVolumeHealth = "volumehealth.storage.kubernetes.io/health"
+        // key for expressing timestamp for volume health annotation
+        AnnVolumeHealthTS = "volumehealth.storage.kubernetes.io/health-timestamp"
+)

pkg/plugin/backup_pvc_action_plugin.go

@@ -191,6 +191,13 @@ func (p *NewPVCBackupItemAction) Execute(item runtime.Unstructured, backup *vele
 	}
 
 	p.Log.Infof("Persisting snapshot with snapshotID :%s under label: %s Snapshot: %v", updatedSnapshot.Status.SnapshotID, constants.ItemSnapshotLabel, updatedSnapshot)
+
+	// Remove the volume health annotations before the backup
+	// because vSphere CSI driver has a webhook that prevents this annotation
+	// from being created/updated by a non-CSI driver system service account
+	healthAnnotations := []string{constants.AnnVolumeHealth, constants.AnnVolumeHealthTS}
+	pluginUtil.RemoveAnnotations(&pvc.ObjectMeta, healthAnnotations)
+
 	// Persist the snapshot blob as an annotation of PVC
 	snapshotAnnotation, err := pluginUtil.GetAnnotationFromSnapshot(updatedSnapshot)
 	if err != nil {

pkg/plugin/util/util.go

@@ -44,6 +44,15 @@ func GetAnnotationFromSnapshot(itemSnapshot interface{}) (string, error) {
 	return base64.StdEncoding.EncodeToString(itemSnapshotByteArray), nil
 }
 
+// RemoveAnnotations removes the supplied keys from the annotations on the object
+func RemoveAnnotations(o *metav1.ObjectMeta, keys []string) {
+	if o.Annotations != nil {
+		for _, k := range keys {
+			delete(o.Annotations, k)
+		}
+	}
+}
+
 // AddAnnotations adds the supplied key-values to the annotations on the object
 func AddAnnotations(o *metav1.ObjectMeta, vals map[string]string) {
 	if o.Annotations == nil {