fix virt annotation (#258)

Signed-off-by: Aleksandr Zimin <[email protected]>

Author: AleksZimin

images/sds-replicated-volume-controller/pkg/controller/replicated_storage_class.go

@@ -23,6 +23,7 @@ import (
 	"maps"
 	"reflect"
 	"slices"
+	"strconv"
 	"strings"
 	"time"
 
@@ -149,7 +150,7 @@ func NewReplicatedStorageClass(
 			log.Debug(fmt.Sprintf("[ReplicatedStorageClassReconciler] Get UPDATE event for ReplicatedStorageClass %s. Check if it was changed.", e.ObjectNew.GetName()))
 			log.Trace(fmt.Sprintf("[ReplicatedStorageClassReconciler] Old ReplicatedStorageClass: %+v", e.ObjectOld))
 			log.Trace(fmt.Sprintf("[ReplicatedStorageClassReconciler] New ReplicatedStorageClass: %+v", e.ObjectNew))
-			if e.ObjectNew.GetDeletionTimestamp() != nil || !reflect.DeepEqual(e.ObjectNew.Spec, e.ObjectOld.Spec) {
+			if e.ObjectNew.GetDeletionTimestamp() != nil || !reflect.DeepEqual(e.ObjectNew.Spec, e.ObjectOld.Spec) || !reflect.DeepEqual(e.ObjectNew.Annotations, e.ObjectOld.Annotations) {
 				log.Debug(fmt.Sprintf("[ReplicatedStorageClassReconciler] ReplicatedStorageClass %s was changed. Add it to queue.", e.ObjectNew.GetName()))
 				request := reconcile.Request{NamespacedName: types.NamespacedName{Namespace: e.ObjectNew.GetNamespace(), Name: e.ObjectNew.GetName()}}
 				q.Add(request)
@@ -690,7 +691,13 @@ func recreateStorageClassIfNeeded(
 
 func GetNewStorageClass(replicatedSC *srv.ReplicatedStorageClass, virtualizationEnabled bool) *storagev1.StorageClass {
 	newSC := GenerateStorageClassFromReplicatedStorageClass(replicatedSC)
-	if replicatedSC.Spec.VolumeAccess == VolumeAccessLocal && virtualizationEnabled {
+	// Do NOT add the virtualization annotation `virtualdisk.virtualization.deckhouse.io/access-mode: ReadWriteOnce` if the source ReplicatedStorageClass
+	// has  replicatedstorageclass.storage.deckhouse.io/ignore-local: "true".
+	ignoreLocal, _ := strconv.ParseBool(
+		replicatedSC.Annotations[StorageClassIgnoreLocalAnnotationKey],
+	)
+
+	if replicatedSC.Spec.VolumeAccess == VolumeAccessLocal && virtualizationEnabled && !ignoreLocal {
 		if newSC.Annotations == nil {
 			newSC.Annotations = make(map[string]string, 1)
 		}

images/sds-replicated-volume-controller/pkg/controller/storage_class_annotations_func.go

@@ -19,19 +19,22 @@ package controller
 import (
 	"context"
 	"fmt"
+	"strconv"
 
 	corev1 "k8s.io/api/core/v1"
 	storagev1 "k8s.io/api/storage/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 
+	srv "github.com/deckhouse/sds-replicated-volume/api/v1alpha1"
 	"github.com/deckhouse/sds-replicated-volume/images/sds-replicated-volume-controller/pkg/logger"
 )
 
 const (
 	StorageClassVirtualizationAnnotationKey   = "virtualdisk.virtualization.deckhouse.io/access-mode"
 	StorageClassVirtualizationAnnotationValue = "ReadWriteOnce"
+	StorageClassIgnoreLocalAnnotationKey      = "replicatedstorageclass.storage.deckhouse.io/ignore-local"
 )
 
 func ReconcileControllerConfigMapEvent(ctx context.Context, cl client.Client, log logger.Logger, request reconcile.Request) (bool, error) {
@@ -90,7 +93,19 @@ func getStorageClassListForAnnotationsReconcile(ctx context.Context, cl client.C
 
 			value, exists := storageClass.Annotations[StorageClassVirtualizationAnnotationKey]
 
-			if virtualizationEnabled {
+			replicatedSC := &srv.ReplicatedStorageClass{}
+			log.Debug(fmt.Sprintf("[getStorageClassForAnnotationsReconcile] Virtualization enabled. Get replicated storage class %s for annotations reconcile", storageClass.Name))
+			err = cl.Get(ctx, client.ObjectKey{Name: storageClass.Name}, replicatedSC)
+			if err != nil {
+				log.Error(err, fmt.Sprintf("[getStorageClassForAnnotationsReconcile] Failed to get replicated storage class %s", storageClass.Name))
+				return nil, err
+			}
+
+			ignoreLocal, _ := strconv.ParseBool(
+				replicatedSC.Annotations[StorageClassIgnoreLocalAnnotationKey],
+			)
+
+			if virtualizationEnabled && !ignoreLocal {
 				if value != StorageClassVirtualizationAnnotationValue {
 					storageClass.Annotations[StorageClassVirtualizationAnnotationKey] = StorageClassVirtualizationAnnotationValue
 					storageClassList.Items = append(storageClassList.Items, storageClass)