[internal] add volumesnapshot controller mount options and storage classes annotations (#105)

Signed-off-by: v.oleynikov <[email protected]>

Author: duckhawk

images/controller/pkg/controller/nfs_storage_class_watcher.go

@@ -56,6 +56,8 @@ const (
 	NFSStorageClassManagedLabelKey         = "storage.deckhouse.io/managed-by"
 	NFSStorageClassManagedLabelValue       = "nfs-storage-class-controller"
 
+	NFSStorageClassVolumeSnapshotClassAnnotationKey = "storage.deckhouse.io/volumesnapshotclass"
+
 	StorageClassDefaultAnnotationKey     = "storageclass.kubernetes.io/is-default-class"
 	StorageClassDefaultAnnotationValTrue = "true"
 

images/controller/pkg/controller/nfs_storage_class_watcher_func.go

@@ -456,6 +456,9 @@ func ConfigureStorageClass(oldSC *storagev1.StorageClass, nsc *v1alpha1.NFSStora
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      nsc.Name,
 			Namespace: nsc.Namespace,
+			Annotations: map[string]string{
+				NFSStorageClassVolumeSnapshotClassAnnotationKey: nsc.Name,
+			},
 			Labels: map[string]string{
 				NFSStorageClassManagedLabelKey: NFSStorageClassManagedLabelValue,
 			},
@@ -474,7 +477,7 @@ func ConfigureStorageClass(oldSC *storagev1.StorageClass, nsc *v1alpha1.NFSStora
 			newSc.Labels = labels.Merge(oldSC.Labels, newSc.Labels)
 		}
 		if oldSC.Annotations != nil {
-			newSc.Annotations = oldSC.Annotations
+			newSc.Annotations = labels.Merge(oldSC.Annotations, newSc.Annotations)
 		}
 	}
 
@@ -769,6 +772,7 @@ func ConfigureVSClass(oldVSClass *snapshotv1.VolumeSnapshotClass, nsc *v1alpha1.
 		Driver:         NFSStorageClassProvisioner,
 		DeletionPolicy: deletionPolicy,
 		Parameters: map[string]string{
+			"mountOptions":                strings.Join(GetSCMountOptions(nsc), ","),
 			SnapshotterSecretNameKey:      SecretForMountOptionsPrefix + nsc.Name,
 			SnapshotterSecretNamespaceKey: controllerNamespace,
 		},

images/controller/pkg/controller/nfs_storage_class_watcher_test.go

@@ -174,23 +174,6 @@ var _ = Describe(controller.NFSStorageClassCtrlName, func() {
 
 	})
 
-	It("Annotate_sc_as_default_sc", func() {
-		sc := &storagev1.StorageClass{}
-		err := cl.Get(ctx, client.ObjectKey{Name: nameForTestResource}, sc)
-		Expect(err).NotTo(HaveOccurred())
-		Expect(sc.Annotations).To(BeNil())
-
-		sc.Annotations = map[string]string{
-			controller.StorageClassDefaultAnnotationKey: controller.StorageClassDefaultAnnotationValTrue,
-		}
-
-		err = cl.Update(ctx, sc)
-		Expect(err).NotTo(HaveOccurred())
-		Expect(sc.Annotations).To(HaveLen(1))
-		Expect(sc.Annotations).To(HaveKeyWithValue(controller.StorageClassDefaultAnnotationKey, controller.StorageClassDefaultAnnotationValTrue))
-
-	})
-
 	It("Update_nfs_sc_1", func() {
 		nsc := &v1alpha1.NFSStorageClass{}
 		err := cl.Get(ctx, client.ObjectKey{Name: nameForTestResource}, nsc)
@@ -245,7 +228,7 @@ var _ = Describe(controller.NFSStorageClassCtrlName, func() {
 		err := cl.Get(ctx, client.ObjectKey{Name: nameForTestResource}, sc)
 		Expect(err).NotTo(HaveOccurred())
 		Expect(sc.Annotations).To(HaveLen(1))
-		Expect(sc.Annotations).To(HaveKeyWithValue(controller.StorageClassDefaultAnnotationKey, controller.StorageClassDefaultAnnotationValTrue))
+		Expect(sc.Annotations).To(HaveKeyWithValue(controller.NFSStorageClassVolumeSnapshotClassAnnotationKey, sc.Name))
 
 	})