Feature: add datasetReferenceLabel to all the resources created by fluid

Signed-off-by: jiuyu <guotongyu.gty@alibaba-inc.com>
fluid-cloudnative · Jan 16, 2025 · 56fba58 · 56fba58
1 parent 228af51
commit 56fba58
Show file tree

Hide file tree

Showing 71 changed files with 299 additions and 190 deletions.
diff --git a/charts/alluxio/templates/fuse/daemonset.yaml b/charts/alluxio/templates/fuse/daemonset.yaml
@@ -59,6 +59,7 @@ spec:
         release: {{ .Release.Name }}
         heritage: {{ .Release.Service }}
         role: alluxio-fuse
+        {{- include "library.fluid.labels" . | nindent 8 }}
         {{- if .Values.fuse.labels }}
         {{- range $key, $val := .Values.fuse.labels }}
         {{ $key | quote }}: {{ $val | quote }}

diff --git a/charts/alluxio/templates/master/statefulset.yaml b/charts/alluxio/templates/master/statefulset.yaml
@@ -67,6 +67,7 @@ spec:
         release: {{ .Release.Name }}
         heritage: {{ .Release.Service }}
         role: alluxio-master
+        {{- include "library.fluid.labels" . | nindent 8 }}
         {{- if .Values.master.labels }}
         {{- range $key, $val := .Values.master.labels }}
         {{ $key | quote }}: {{ $val | quote }}

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

diff --git a/charts/efc/templates/worker/statefulset.yaml b/charts/efc/templates/worker/statefulset.yaml
@@ -8,7 +8,6 @@ metadata:
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
     role: efc-worker
-    fluid.io/dataset: {{ .Values.fullNamespacedNameOverride }}
     fluid.io/dataset-placement: {{ .Values.placement }}
     {{- include "library.fluid.labels" . | nindent 4 }}
   ownerReferences:
@@ -45,7 +44,7 @@ spec:
         release: {{ .Release.Name }}
         heritage: {{ .Release.Service }}
         role: efc-worker
-        fluid.io/dataset: {{ .Values.fullNamespacedNameOverride }}
+        fluid.io/dataset: {{ .Values.OwnedDatasetReference }}
         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-{{ .Values.fullNamespacedNameOverride }}
+        fluid.io/operation: migrate-{{ .Values.OwnedDatasetReference }}
         {{- 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-{{ .Values.fullNamespacedNameOverride }}
+        fluid.io/operation: migrate-{{ .Values.OwnedDatasetReference }}
     spec:
       containers:
         - name: worker

diff --git a/charts/goosefs/templates/fuse/daemonset.yaml b/charts/goosefs/templates/fuse/daemonset.yaml
@@ -35,6 +35,7 @@ spec:
         release: {{ .Release.Name }}
         heritage: {{ .Release.Service }}
         role: goosefs-fuse
+        {{- include "library.fluid.labels" . | nindent 8 }}
     spec:
       {{- if .Values.fuse.criticalPod }}
       priorityClassName: system-node-critical

diff --git a/charts/goosefs/templates/master/statefulset.yaml b/charts/goosefs/templates/master/statefulset.yaml
@@ -44,6 +44,7 @@ spec:
         release: {{ .Release.Name }}
         heritage: {{ .Release.Service }}
         role: goosefs-master
+        {{- include "library.fluid.labels" . | nindent 8 }}
     spec:
       enableServiceLinks: false
       hostNetwork: {{ $hostNetwork }}

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

diff --git a/charts/jindocache/templates/fuse/daemonset.yaml b/charts/jindocache/templates/fuse/daemonset.yaml
@@ -45,6 +45,7 @@ spec:
         release: {{ .Release.Name }}
         heritage: {{ .Release.Service }}
         role: jindofs-fuse
+        {{- include "library.fluid.labels" . | nindent 8 }}
         {{- if .Values.fuse.labels }}
         {{- range $key, $val := .Values.fuse.labels }}
         {{ $key | quote }}: {{ $val | quote }}

diff --git a/charts/jindocache/templates/master/statefulset.yaml b/charts/jindocache/templates/master/statefulset.yaml
@@ -48,6 +48,7 @@ spec:
         release: {{ .Release.Name }}
         heritage: {{ .Release.Service }}
         role: jindofs-master
+        {{- include "library.fluid.labels" . | nindent 8 }}
         {{- if .Values.master.labels }}
         {{- range $key, $val := .Values.master.labels }}
         {{ $key | quote }}: {{ $val | quote }}

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

diff --git a/charts/jindofs/templates/fuse/daemonset.yaml b/charts/jindofs/templates/fuse/daemonset.yaml
@@ -41,6 +41,7 @@ spec:
         release: {{ .Release.Name }}
         heritage: {{ .Release.Service }}
         role: jindofs-fuse
+        {{- include "library.fluid.labels" . | nindent 8 }}
 {{- if .Values.labels }}
 {{ toYaml .Values.labels | trim | indent 8 }}
 {{- end }}

diff --git a/charts/jindofs/templates/master/statefulset.yaml b/charts/jindofs/templates/master/statefulset.yaml
@@ -43,6 +43,7 @@ spec:
         release: {{ .Release.Name }}
         heritage: {{ .Release.Service }}
         role: jindofs-master
+        {{- include "library.fluid.labels" . | nindent 8 }}
 {{- if .Values.labels }}
 {{ toYaml .Values.labels | trim | indent 8 }}
 {{- end }}

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

diff --git a/charts/jindofsx/templates/fuse/daemonset.yaml b/charts/jindofsx/templates/fuse/daemonset.yaml
@@ -45,6 +45,7 @@ spec:
         release: {{ .Release.Name }}
         heritage: {{ .Release.Service }}
         role: jindofs-fuse
+        {{- include "library.fluid.labels" . | nindent 8 }}
         {{- if .Values.fuse.labels }}
         {{- range $key, $val := .Values.fuse.labels }}
         {{ $key | quote }}: {{ $val | quote }}

diff --git a/charts/jindofsx/templates/master/statefulset.yaml b/charts/jindofsx/templates/master/statefulset.yaml
@@ -48,6 +48,7 @@ spec:
         release: {{ .Release.Name }}
         heritage: {{ .Release.Service }}
         role: jindofs-master
+        {{- include "library.fluid.labels" . | nindent 8 }}
         {{- if .Values.master.labels }}
         {{- range $key, $val := .Values.master.labels }}
         {{ $key | quote }}: {{ $val | quote }}

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

diff --git a/charts/juicefs/templates/fuse/daemonset.yaml b/charts/juicefs/templates/fuse/daemonset.yaml
@@ -45,6 +45,7 @@ spec:
         release: {{ .Release.Name }}
         heritage: {{ .Release.Service }}
         role: juicefs-fuse
+        {{- include "library.fluid.labels" . | nindent 8 }}
         {{- if .Values.fuse.labels }}
         {{- range $key, $val := .Values.fuse.labels }}
         {{ $key | quote }}: {{ $val | quote }}

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

diff --git a/charts/library/templates/_recommended_labels.tpl b/charts/library/templates/_recommended_labels.tpl
@@ -8,4 +8,5 @@ app.kubernetes.io/name: {{ .Chart.Name }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
 fluid.io/managed-by: fluid
+fluid.io/dataset: {{ .Values.OwnedDatasetReference }}
 {{- end }}
diff --git a/charts/thin/templates/fuse/daemonset.yaml b/charts/thin/templates/fuse/daemonset.yaml
@@ -38,6 +38,7 @@ spec:
         release: {{ .Release.Name }}
         heritage: {{ .Release.Service }}
         role: thin-fuse
+        {{- include "library.fluid.labels" . | nindent 8 }}
     spec:
       {{- if .Values.fuse.imagePullSecrets }}
       imagePullSecrets:

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

diff --git a/charts/vineyard/templates/fuse/daemonset.yaml b/charts/vineyard/templates/fuse/daemonset.yaml
@@ -57,6 +57,7 @@ spec:
         chart: {{ $chart }}
         release: {{ .Release.Name }}
         role: vineyard-fuse
+        {{- include "library.fluid.labels" . | nindent 8 }}
         {{- if .Values.fuse.labels }}
         {{- range $key, $val := .Values.fuse.labels }}
         {{ $key | quote }}: {{ $val | quote }}

diff --git a/charts/vineyard/templates/master/statefulset.yaml b/charts/vineyard/templates/master/statefulset.yaml
@@ -66,6 +66,7 @@ spec:
         release: {{ .Release.Name }}
         heritage: {{ .Release.Service }}
         role: vineyard-master
+        {{- include "library.fluid.labels" . | nindent 8 }}
         {{- if .Values.master.labels }}
         {{- range $key, $val := .Values.master.labels }}
         {{ $key | quote }}: {{ $val | quote }}

diff --git a/charts/vineyard/templates/worker/statefulset.yaml b/charts/vineyard/templates/worker/statefulset.yaml
@@ -25,7 +25,6 @@ metadata:
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
     role: vineyard-worker
-    fluid.io/dataset: {{ .Values.fullNamespacedNameOverride }}
     {{- include "library.fluid.labels" . | nindent 4 }}
   {{- if .Values.owner.enabled }}
   ownerReferences:
@@ -46,7 +45,7 @@ spec:
       chart: {{ $chart }}
       release: {{ .Release.Name }}
       role: vineyard-worker
-      app.kubernetes.io/instance: {{ .Values.fullNamespacedNameOverride }}-worker
+      app.kubernetes.io/instance: {{ .Values.OwnedDatasetReference }}-worker
   template:
     metadata:
       annotations:
@@ -62,8 +61,8 @@ spec:
         release: {{ .Release.Name }}
         heritage: {{ .Release.Service }}
         role: vineyard-worker
-        fluid.io/dataset: {{ .Values.fullNamespacedNameOverride }}
-        app.kubernetes.io/instance: {{ .Values.fullNamespacedNameOverride }}-worker
+        app.kubernetes.io/instance: {{ .Values.OwnedDatasetReference }}-worker
+        {{- include "library.fluid.labels" . | nindent 8 }}
         {{- if .Values.worker.labels }}
         {{- range $key, $val := .Values.worker.labels }}
         {{ $key | quote }}: {{ $val | quote }}
@@ -215,5 +214,5 @@ spec:
                   - key: app.kubernetes.io/instance
                     operator: In
                     values:
-                     - {{ .Values.fullNamespacedNameOverride }}-worker
+                     - {{ .Values.OwnedDatasetReference }}-worker
               topologyKey: "kubernetes.io/hostname"
diff --git a/pkg/application/inject/fuse/poststart/check_fuse_app.go b/pkg/application/inject/fuse/poststart/check_fuse_app.go
@@ -18,7 +18,6 @@ package poststart
 
 import (
 	"fmt"
-
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/utils/ptr"

diff --git a/pkg/application/inject/fuse/poststart/script_gen_helper.go b/pkg/application/inject/fuse/poststart/script_gen_helper.go
@@ -17,6 +17,8 @@ limitations under the License.
 package poststart
 
 import (
+	"github.com/fluid-cloudnative/fluid/pkg/common"
+	"github.com/fluid-cloudnative/fluid/pkg/utils"
 	"strings"
 
 	corev1 "k8s.io/api/core/v1"
@@ -41,6 +43,9 @@ func (helper *scriptGeneratorHelper) BuildConfigMap(ownerReference metav1.OwnerR
 			Name:            configMapKey.Name,
 			Namespace:       configMapKey.Namespace,
 			OwnerReferences: []metav1.OwnerReference{ownerReference},
+			Labels: map[string]string{
+				common.LabelAnnotationDataset: utils.GetDatasetReferenceValue(configMapKey.Namespace, ownerReference.Name, string(ownerReference.UID)),
+			},
 		},
 		Data: data,
 	}

diff --git a/pkg/common/label.go b/pkg/common/label.go
@@ -46,6 +46,10 @@ const (
 	// i.e. fluid.io/managed-by
 	LabelAnnotationManagedBy = LabelAnnotationPrefix + "managed-by"
 
+	// LabelAnnotationCopyFrom indicates a resource that is copied from another resource
+	// i.e. fluid.io/copied-from
+	LabelAnnotationCopyFrom = LabelAnnotationPrefix + "copied-from"
+
 	// fluid adminssion webhook inject flag
 	// i.e. fluid.io/enable-injection
 	EnableFluidInjectionFlag = LabelAnnotationPrefix + "enable-injection"

diff --git a/pkg/controllers/runtime_controller.go b/pkg/controllers/runtime_controller.go
@@ -139,6 +139,13 @@ func (r *RuntimeReconciler) ReconcileInternal(ctx cruntime.ReconcileRequestConte
 		if !utils.ContainsOwners(objectMeta.GetOwnerReferences(), dataset) {
 			return r.AddOwnerAndRequeue(ctx, dataset)
 		}
+
+		if errs := utils.PatchDatasetLabelToObjects(ctx.Client,
+			utils.GetDatasetReferenceValue(dataset.GetNamespace(), dataset.GetName(), string(dataset.UID)),
+			dataset, runtime); len(errs) > 0 {
+			return utils.RequeueAfterInterval(time.Duration(5 * time.Second))
+		}
+
 		if !dataset.CanbeBound(ctx.Name, ctx.Namespace, ctx.Category) {
 			ctx.Log.Info("the dataset can't be bound to the runtime, because it's already bound to another runtime ",
 				"dataset", dataset.Name)
@@ -332,6 +339,7 @@ func (r *RuntimeReconciler) AddOwnerAndRequeue(ctx cruntime.ReconcileRequestCont
 		Name:       dataset.Name,
 		UID:        dataset.UID,
 	}))
+
 	if err := r.Update(ctx, ctx.Runtime); err != nil {
 		ctx.Log.Error(err, "Failed to add ownerreference", "StatusUpdateError", ctx)
 		return utils.RequeueIfError(err)

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

diff --git a/pkg/ddc/alluxio/master_internal.go b/pkg/ddc/alluxio/master_internal.go
@@ -99,7 +99,9 @@ func (e *AlluxioEngine) generateAlluxioValueFile(runtime *datav1alpha1.AlluxioRu
 	}
 
 	//3. Save the configfile into configmap
-	err = kubeclient.CreateConfigMap(e.Client, e.getHelmValuesConfigMapName(), e.namespace, "data", data)
+	runtimeInfo := e.runtimeInfo
+	referenceDatasetLabelValue := utils.GetDatasetReferenceValue(runtimeInfo.GetNamespace(), runtimeInfo.GetName(), runtimeInfo.GetNamespacedNameAlias())
+	err = kubeclient.CreateConfigMap(e.Client, e.getHelmValuesConfigMapName(), e.namespace, "data", data, referenceDatasetLabelValue)
 	if err != nil {
 		return
 	}