Enhancement: Unify the implementation of label concatenation across d…

…ifferent Runtimes, and support labels with over limit length Signed-off-by: jiuyu <[email protected]>
fluid-cloudnative · Jan 8, 2025 · d667065 · d667065
1 parent 4e199c8
commit d667065
Show file tree

Hide file tree

Showing 87 changed files with 428 additions and 955 deletions.
diff --git a/charts/alluxio/templates/worker/statefulset.yaml b/charts/alluxio/templates/worker/statefulset.yaml
@@ -23,7 +23,7 @@ metadata:
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
     role: alluxio-worker
-    fluid.io/dataset: {{ .Release.Namespace }}-{{ .Release.Name }}
+    fluid.io/dataset: {{ .Values.fullNamespacedNameOverride }}
     fluid.io/dataset-placement: {{ .Values.placement }}
     {{- include "library.fluid.labels" . | nindent 4 }}
   ownerReferences:
@@ -60,7 +60,7 @@ spec:
         release: {{ .Release.Name }}
         heritage: {{ .Release.Service }}
         role: alluxio-worker
-        fluid.io/dataset: {{ .Release.Namespace }}-{{ .Release.Name }}
+        fluid.io/dataset: {{ .Values.fullNamespacedNameOverride }}
         fluid.io/dataset-placement: {{ .Values.placement }}
         {{- if .Values.worker.labels }}
         {{- range $key, $val := .Values.worker.labels }}

diff --git a/charts/efc/templates/worker/statefulset.yaml b/charts/efc/templates/worker/statefulset.yaml
@@ -8,7 +8,7 @@ metadata:
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
     role: efc-worker
-    fluid.io/dataset: {{ .Release.Namespace }}-{{ .Release.Name }}
+    fluid.io/dataset: {{ .Values.fullNamespacedNameOverride }}
     fluid.io/dataset-placement: {{ .Values.placement }}
     {{- include "library.fluid.labels" . | nindent 4 }}
   ownerReferences:
@@ -45,7 +45,7 @@ spec:
         release: {{ .Release.Name }}
         heritage: {{ .Release.Service }}
         role: efc-worker
-        fluid.io/dataset: {{ .Release.Namespace }}-{{ .Release.Name }}
+        fluid.io/dataset: {{ .Values.fullNamespacedNameOverride }}
         fluid.io/dataset-placement: {{ .Values.placement }}
         {{- if .Values.worker.labels }}
         {{- range $key, $val := .Values.worker.labels }}

diff --git a/charts/fluid-datamigrate/juicefs/templates/job.yaml b/charts/fluid-datamigrate/juicefs/templates/job.yaml
@@ -39,7 +39,7 @@ spec:
         role: datamigrate-pod
         app: juicefs
         targetDataset: {{ required "targetDataset should be set" .Values.datamigrate.targetDataset }}
-        fluid.io/operation: migrate-{{ .Release.Namespace }}-{{ .Release.Name }}
+        fluid.io/operation: migrate-{{ .Values.fullNamespacedNameOverride }}
         {{- include "library.fluid.labels" . | nindent 8 }}
       {{- if .Values.datamigrate.labels }}
       {{- range $key, $val := .Values.datamigrate.labels }}

diff --git a/charts/fluid-datamigrate/juicefs/templates/statefulset.yaml b/charts/fluid-datamigrate/juicefs/templates/statefulset.yaml
@@ -34,7 +34,7 @@ spec:
     metadata:
       labels:
         app: {{ printf "%s-workers" .Release.Name }}
-        fluid.io/operation: migrate-{{ .Release.Namespace }}-{{ .Release.Name }}
+        fluid.io/operation: migrate-{{ .Values.fullNamespacedNameOverride }}
     spec:
       containers:
         - name: worker

diff --git a/charts/goosefs/templates/worker/statefulset.yaml b/charts/goosefs/templates/worker/statefulset.yaml
@@ -12,7 +12,7 @@ metadata:
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
     role: goosefs-worker
-    fluid.io/dataset: {{ .Release.Namespace }}-{{ .Release.Name }}
+    fluid.io/dataset: {{ .Values.fullNamespacedNameOverride }}
     fluid.io/dataset-placement: {{ .Values.placement }}
     {{- include "library.fluid.labels" . | nindent 4 }}
 spec:
@@ -37,7 +37,7 @@ spec:
         release: {{ .Release.Name }}
         heritage: {{ .Release.Service }}
         role: goosefs-worker
-        fluid.io/dataset: {{ .Release.Namespace }}-{{ .Release.Name }}
+        fluid.io/dataset: {{ .Values.fullNamespacedNameOverride }}
         fluid.io/dataset-placement: {{ .Values.placement }}
     spec:
       enableServiceLinks: false

diff --git a/charts/jindocache/templates/worker/statefulset.yaml b/charts/jindocache/templates/worker/statefulset.yaml
@@ -13,7 +13,7 @@ metadata:
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
     role: jindofs-worker
-    fluid.io/dataset: {{ .Release.Namespace }}-{{ .Release.Name }}
+    fluid.io/dataset: {{ .Values.fullNamespacedNameOverride }}
     fluid.io/dataset-placement: {{ .Values.placement }}
     {{- include "library.fluid.labels" . | nindent 4 }}
   ownerReferences:
@@ -49,7 +49,7 @@ spec:
         release: {{ .Release.Name }}
         heritage: {{ .Release.Service }}
         role: jindofs-worker
-        fluid.io/dataset: {{ .Release.Namespace }}-{{ .Release.Name }}
+        fluid.io/dataset: {{ .Values.fullNamespacedNameOverride }}
         fluid.io/dataset-placement: {{ .Values.placement }}
         {{- if .Values.worker.labels }}
         {{- range $key, $val := .Values.worker.labels }}

diff --git a/charts/jindofs/templates/worker/statefulset.yaml b/charts/jindofs/templates/worker/statefulset.yaml
@@ -13,7 +13,7 @@ metadata:
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
     role: jindofs-worker
-    fluid.io/dataset: {{ .Release.Namespace }}-{{ .Release.Name }}
+    fluid.io/dataset: {{ .Values.fullNamespacedNameOverride }}
     fluid.io/dataset-placement: {{ .Values.placement }}
     {{- include "library.fluid.labels" . | nindent 4 }}
   ownerReferences:
@@ -44,7 +44,7 @@ spec:
         release: {{ .Release.Name }}
         heritage: {{ .Release.Service }}
         role: jindofs-worker
-        fluid.io/dataset: {{ .Release.Namespace }}-{{ .Release.Name }}
+        fluid.io/dataset: {{ .Values.fullNamespacedNameOverride }}
         fluid.io/dataset-placement: {{ .Values.placement }}
 {{- if .Values.labels }}
 {{ toYaml .Values.labels | trim | indent 8 }}

diff --git a/charts/jindofsx/templates/worker/statefulset.yaml b/charts/jindofsx/templates/worker/statefulset.yaml
@@ -13,7 +13,7 @@ metadata:
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
     role: jindofs-worker
-    fluid.io/dataset: {{ .Release.Namespace }}-{{ .Release.Name }}
+    fluid.io/dataset: {{ .Values.fullNamespacedNameOverride }}
     fluid.io/dataset-placement: {{ .Values.placement }}
     {{- include "library.fluid.labels" . | nindent 4 }}
   ownerReferences:
@@ -49,7 +49,7 @@ spec:
         release: {{ .Release.Name }}
         heritage: {{ .Release.Service }}
         role: jindofs-worker
-        fluid.io/dataset: {{ .Release.Namespace }}-{{ .Release.Name }}
+        fluid.io/dataset: {{ .Values.fullNamespacedNameOverride }}
         fluid.io/dataset-placement: {{ .Values.placement }}
         {{- if .Values.worker.labels }}
         {{- range $key, $val := .Values.worker.labels }}

diff --git a/charts/juicefs/templates/worker/statefulset.yaml b/charts/juicefs/templates/worker/statefulset.yaml
@@ -9,7 +9,7 @@ metadata:
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
     role: juicefs-worker
-    fluid.io/dataset: {{ .Release.Namespace }}-{{ .Release.Name }}
+    fluid.io/dataset: {{ .Values.fullNamespacedNameOverride }}
     fluid.io/dataset-placement: {{ .Values.placement }}
     {{- include "library.fluid.labels" . | nindent 4 }}
   ownerReferences:
@@ -48,7 +48,7 @@ spec:
         release: {{ .Release.Name }}
         heritage: {{ .Release.Service }}
         role: juicefs-worker
-        fluid.io/dataset: {{ .Release.Namespace }}-{{ .Release.Name }}
+        fluid.io/dataset: {{ .Values.fullNamespacedNameOverride }}
         fluid.io/dataset-placement: {{ .Values.placement }}
         {{- if .Values.worker.labels }}
         {{- range $key, $val := .Values.worker.labels }}

diff --git a/charts/thin/templates/worker/statefuleset.yaml b/charts/thin/templates/worker/statefuleset.yaml
@@ -8,7 +8,7 @@ metadata:
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
     role: thin-worker
-    fluid.io/dataset: {{ .Release.Namespace }}-{{ .Release.Name }}
+    fluid.io/dataset: {{ .Values.fullNamespacedNameOverride }}
     fluid.io/dataset-placement: {{ .Values.placement }}
     {{- include "library.fluid.labels" . | nindent 4 }}
   ownerReferences:
@@ -41,7 +41,7 @@ spec:
         release: {{ .Release.Name }}
         heritage: {{ .Release.Service }}
         role: thin-worker
-        fluid.io/dataset: {{ .Release.Namespace }}-{{ .Release.Name }}
+        fluid.io/dataset: {{ .Values.fullNamespacedNameOverride }}
         fluid.io/dataset-placement: {{ .Values.placement }}
     spec:
       {{- if .Values.worker.imagePullSecrets }}

diff --git a/charts/vineyard/templates/worker/statefulset.yaml b/charts/vineyard/templates/worker/statefulset.yaml
@@ -25,7 +25,7 @@ metadata:
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
     role: vineyard-worker
-    fluid.io/dataset: {{ .Release.Namespace }}-{{ .Release.Name }}
+    fluid.io/dataset: {{ .Values.fullNamespacedNameOverride }}
     {{- include "library.fluid.labels" . | nindent 4 }}
   {{- if .Values.owner.enabled }}
   ownerReferences:
@@ -46,7 +46,7 @@ spec:
       chart: {{ $chart }}
       release: {{ .Release.Name }}
       role: vineyard-worker
-      app.kubernetes.io/instance: {{ .Release.Namespace }}-{{ $fullName }}-worker
+      app.kubernetes.io/instance: {{ .Values.fullNamespacedNameOverride }}-worker
   template:
     metadata:
       annotations:
@@ -62,8 +62,8 @@ spec:
         release: {{ .Release.Name }}
         heritage: {{ .Release.Service }}
         role: vineyard-worker
-        fluid.io/dataset: {{ .Release.Namespace }}-{{ .Release.Name }}
-        app.kubernetes.io/instance: {{ .Release.Namespace }}-{{ $fullName }}-worker
+        fluid.io/dataset: {{ .Values.fullNamespacedNameOverride }}
+        app.kubernetes.io/instance: {{ .Values.fullNamespacedNameOverride }}-worker
         {{- if .Values.worker.labels }}
         {{- range $key, $val := .Values.worker.labels }}
         {{ $key | quote }}: {{ $val | quote }}

diff --git a/pkg/controllers/runtime_controller.go b/pkg/controllers/runtime_controller.go
@@ -187,7 +187,7 @@ func (r *RuntimeReconciler) ReconcileRuntimeDeletion(engine base.Engine, ctx cru
 		return utils.RequeueAfterInterval(time.Duration(20 * time.Second))
 	}
 
-	// 1. Delete the implementation of the the runtime
+	// 1. Delete the implementation of the runtime
 	err = engine.Shutdown()
 	if err != nil {
 		r.Recorder.Eventf(ctx.Runtime, corev1.EventTypeWarning, common.ErrorProcessRuntimeReason, "Failed to shutdown engine %v", err)

diff --git a/pkg/csi/plugins/nodeserver.go b/pkg/csi/plugins/nodeserver.go
@@ -344,8 +344,7 @@ func (ns *nodeServer) NodeUnstageVolume(ctx context.Context, req *csi.NodeUnstag
 	// 4. remove label on node
 	// Once the label is removed, fuse pod on corresponding node will be terminated
 	// since node selector in the fuse daemonSet no longer matches.
-	// TODO: move all the label keys into a util func
-	fuseLabelKey := common.LabelAnnotationFusePrefix + namespace + "-" + name
+	fuseLabelKey := utils.GetFuseLabelName(namespace, name)
 	var labelsToModify common.LabelsToModify
 	labelsToModify.Delete(fuseLabelKey)
 
@@ -401,7 +400,7 @@ func (ns *nodeServer) NodeStageVolume(ctx context.Context, req *csi.NodeStageVol
 	}
 
 	// 4. Label node to launch FUSE Pod
-	fuseLabelKey := common.LabelAnnotationFusePrefix + namespace + "-" + name
+	fuseLabelKey := utils.GetFuseLabelName(namespace, name)
 	var labelsToModify common.LabelsToModify
 	labelsToModify.Add(fuseLabelKey, "true")
 

diff --git a/pkg/ctrl/fuse.go b/pkg/ctrl/fuse.go
@@ -109,7 +109,7 @@ func (e *Helper) CheckFuseHealthy(recorder record.EventRecorder, runtime base.Ru
 func (e *Helper) CleanUpFuse() (count int, err error) {
 	var (
 		nodeList     = &corev1.NodeList{}
-		fuseLabelKey = common.LabelAnnotationFusePrefix + e.runtimeInfo.GetNamespace() + "-" + e.runtimeInfo.GetName()
+		fuseLabelKey = utils.GetFuseLabelName(e.runtimeInfo.GetNamespace(), e.runtimeInfo.GetName())
 	)
 
 	labelNames := []string{fuseLabelKey}
@@ -153,7 +153,7 @@ func (e *Helper) CleanUpFuse() (count int, err error) {
 func (e *Helper) GetFuseNodes() (nodes []corev1.Node, err error) {
 	var (
 		nodeList     = &corev1.NodeList{}
-		fuseLabelKey = common.LabelAnnotationFusePrefix + e.runtimeInfo.GetNamespace() + "-" + e.runtimeInfo.GetName()
+		fuseLabelKey = utils.GetFuseLabelName(e.runtimeInfo.GetNamespace(), e.runtimeInfo.GetName())
 	)
 
 	labelNames := []string{fuseLabelKey}

diff --git a/pkg/datamigrate/value.go b/pkg/datamigrate/value.go
@@ -24,9 +24,10 @@ import (
 )
 
 type DataMigrateValue struct {
-	Name            string                 `json:"name"`
-	Owner           *common.OwnerReference `json:"owner,omitempty"`
-	DataMigrateInfo DataMigrateInfo        `json:"datamigrate"`
+	Name                       string                 `json:"name"`
+	FullNamespacedNameOverride string                 `json:"fullNamespacedNameOverride"`
+	Owner                      *common.OwnerReference `json:"owner,omitempty"`
+	DataMigrateInfo            DataMigrateInfo        `json:"datamigrate"`
 }
 
 type DataMigrateInfo struct {

diff --git a/pkg/ddc/alluxio/deprecated_label.go b/pkg/ddc/alluxio/deprecated_label.go
@@ -17,14 +17,10 @@ limitations under the License.
 package alluxio
 
 import (
-	"github.com/fluid-cloudnative/fluid/pkg/common/deprecated"
+	"github.com/fluid-cloudnative/fluid/pkg/utils"
 	apierrs "k8s.io/apimachinery/pkg/api/errors"
 )
 
-func (e *AlluxioEngine) getDeprecatedCommonLabelname() string {
-	return deprecated.LabelAnnotationStorageCapacityPrefix + e.namespace + "-" + e.name
-}
-
 func (e *AlluxioEngine) HasDeprecatedCommonLabelname() (deprecated bool, err error) {
 
 	// return deprecated.LabelAnnotationStorageCapacityPrefix + e.namespace + "-" + e.name
@@ -54,11 +50,12 @@ func (e *AlluxioEngine) HasDeprecatedCommonLabelname() (deprecated bool, err err
 	nodeSelectors := workers.Spec.Template.Spec.NodeSelector
 	e.Log.Info("The current node selectors for worker", "workerName", workerName, "nodeSelector", nodeSelectors)
 
-	if _, deprecated = nodeSelectors[e.getDeprecatedCommonLabelname()]; deprecated {
+	deprecatedCommonLabelName := utils.GetCommonLabelName(true, e.namespace, e.name)
+	if _, deprecated = nodeSelectors[deprecatedCommonLabelName]; deprecated {
 		//
-		e.Log.Info("the deprecated node selector exists", "nodeSelector", e.getDeprecatedCommonLabelname())
+		e.Log.Info("the deprecated node selector exists", "nodeselector", deprecatedCommonLabelName)
 	} else {
-		e.Log.Info("The deprecated node selector doesn't exist", "nodeSelector", e.getDeprecatedCommonLabelname())
+		e.Log.Info("The deprecated node selector doesn't exist", "nodeselector", deprecatedCommonLabelName)
 	}
 
 	return

diff --git a/pkg/ddc/alluxio/deprecated_label_test.go b/pkg/ddc/alluxio/deprecated_label_test.go
@@ -21,6 +21,7 @@ import (
 
 	datav1alpha1 "github.com/fluid-cloudnative/fluid/api/v1alpha1"
 	"github.com/fluid-cloudnative/fluid/pkg/ddc/base"
+	"github.com/fluid-cloudnative/fluid/pkg/utils"
 	"github.com/fluid-cloudnative/fluid/pkg/utils/fake"
 	v1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
@@ -65,10 +66,8 @@ func TestAlluxioEngine_GetDeprecatedCommonLabelname(t *testing.T) {
 			out:       "data.fluid.io/storage-test-fluid",
 		},
 	}
-	fakeClient := fake.NewFakeClientWithScheme(testScheme)
 	for _, test := range testCases {
-		engine := getTestAlluxioEngine(fakeClient, test.name, test.namespace)
-		out := engine.getDeprecatedCommonLabelname()
+		out := utils.GetCommonLabelName(true, test.namespace, test.name)
 		if out != test.out {
 			t.Errorf("input parameter is %s-%s,expected %s, got %s", test.namespace, test.name, test.out, out)
 		}

diff --git a/pkg/ddc/alluxio/label.go b/pkg/ddc/alluxio/label.go
diff --git a/pkg/ddc/alluxio/label_test.go b/pkg/ddc/alluxio/label_test.go
diff --git a/pkg/ddc/alluxio/node_test.go b/pkg/ddc/alluxio/node_test.go
@@ -340,7 +340,7 @@ func TestSyncScheduleInfoToCacheNodes(t *testing.T) {
 		}
 
 		nodeList := &v1.NodeList{}
-		datasetLabels, err := labels.Parse(fmt.Sprintf("%s=true", engine.getCommonLabelname()))
+		datasetLabels, err := labels.Parse(fmt.Sprintf("%s=true", engine.runtimeInfo.GetCommonLabelName()))
 		if err != nil {
 			return
 		}