change the marker label value to vcluster's name

loft-sh · Feb 12, 2025 · aaab73d · aaab73d
1 parent 24bd598
commit aaab73d
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/pkg/controllers/resources/csinodes/syncer.go b/pkg/controllers/resources/csinodes/syncer.go
@@ -104,14 +104,14 @@ func (s *csinodeSyncer) Sync(ctx *synccontext.SyncContext, event *synccontext.Sy
 	if len(event.Virtual.Labels) == 0 {
 		event.Virtual.Labels = map[string]string{}
 	}
-	event.Virtual.Labels[translate.MarkerLabel] = translate.MarkerLabelValue
+	event.Virtual.Labels[translate.MarkerLabel] = translate.VClusterName
 
 	return ctrl.Result{}, nil
 }
 
 func (s *csinodeSyncer) SyncToHost(ctx *synccontext.SyncContext, event *synccontext.SyncToHostEvent[*storagev1.CSINode]) (ctrl.Result, error) {
 	if event.HostOld == nil {
-		ManagedByLabelDoesNotExist := event.Virtual.GetLabels() == nil || (event.Virtual.GetLabels() != nil && event.Virtual.GetLabels()[translate.MarkerLabel] != translate.MarkerLabelValue)
+		ManagedByLabelDoesNotExist := event.Virtual.GetLabels() == nil || (event.Virtual.GetLabels() != nil && event.Virtual.GetLabels()[translate.MarkerLabel] != translate.VClusterName)
 		if ManagedByLabelDoesNotExist {
 			return ctrl.Result{}, nil
 		}

diff --git a/pkg/controllers/resources/nodes/syncer.go b/pkg/controllers/resources/nodes/syncer.go
@@ -273,7 +273,7 @@ func registerIndices(ctx *synccontext.RegisterContext) error {
 
 func (s *nodeSyncer) SyncToHost(ctx *synccontext.SyncContext, event *synccontext.SyncToHostEvent[*corev1.Node]) (ctrl.Result, error) {
 	if event.HostOld == nil {
-		ManagedByLabelDoesNotExist := event.Virtual.GetLabels() == nil || (event.Virtual.GetLabels() != nil && event.Virtual.GetLabels()[translate.MarkerLabel] != translate.MarkerLabelValue)
+		ManagedByLabelDoesNotExist := event.Virtual.GetLabels() == nil || (event.Virtual.GetLabels() != nil && event.Virtual.GetLabels()[translate.VClusterName] != translate.MarkerLabelValue)
 		if ManagedByLabelDoesNotExist {
 			return ctrl.Result{}, nil
 		}

diff --git a/pkg/controllers/resources/nodes/translate.go b/pkg/controllers/resources/nodes/translate.go
@@ -114,7 +114,7 @@ func (s *nodeSyncer) translateUpdateBackwards(pNode *corev1.Node, vNode *corev1.
 	// Set the marker of managed-by vcluster so that
 	// we skip deleting the nodes which are not managed
 	// by vcluster in `SyncToHost` function
-	labels[translate.MarkerLabel] = translate.MarkerLabelValue
+	labels[translate.MarkerLabel] = translate.VClusterName
 
 	// set annotations, spec & labels
 	vNode.Spec = *translatedSpec

diff --git a/pkg/util/translate/types.go b/pkg/util/translate/types.go
@@ -29,7 +29,6 @@ var (
 
 	ManagedAnnotationsAnnotation = "vcluster.loft.sh/managed-annotations"
 	ManagedLabelsAnnotation      = "vcluster.loft.sh/managed-labels"
-	MarkerLabelValue             = "vcluster"
 )
 
 var Default Translator = &singleNamespace{}