Enhancement: Unify the implementation of label concatenation and support labels with over limit length

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 }}

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 }}

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.ownerDatasetId }}
     fluid.io/dataset-placement: {{ .Values.placement }}
     {{- include "library.fluid.labels" . | nindent 4 }}
   ownerReferences:
@@ -60,8 +60,9 @@ spec:
         release: {{ .Release.Name }}
         heritage: {{ .Release.Service }}
         role: alluxio-worker
-        fluid.io/dataset: {{ .Release.Namespace }}-{{ .Release.Name }}
+        fluid.io/dataset: {{ .Values.ownerDatasetId }}
         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 }}

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.ownerDatasetId }}
     fluid.io/dataset-placement: {{ .Values.placement }}
     {{- include "library.fluid.labels" . | nindent 4 }}
   ownerReferences:
@@ -45,8 +45,9 @@ spec:
         release: {{ .Release.Name }}
         heritage: {{ .Release.Service }}
         role: efc-worker
-        fluid.io/dataset: {{ .Release.Namespace }}-{{ .Release.Name }}
+        fluid.io/dataset: {{ .Values.ownerDatasetId }}
         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 }}

charts/fluid-dataloader/alluxio/templates/cronjob.yaml

@@ -55,6 +55,7 @@ spec:
             app: alluxio
             cronjob: {{ printf "%s-job" .Release.Name }}
             targetDataset: {{ required "targetDataset should be set" .Values.dataloader.targetDataset }}
+            {{- include "library.fluid.labels" . | nindent 12 }}
           {{- if .Values.dataloader.labels }}
           {{- range $key, $val := .Values.dataloader.labels }}
             {{ $key | quote }}: {{ $val | quote }}

charts/fluid-dataloader/goosefs/templates/cronjob.yaml

@@ -47,6 +47,7 @@ spec:
             app: goosefs
             cronjob: {{ printf "%s-job" .Release.Name }}
             targetDataset: {{ required "targetDataset should be set" .Values.dataloader.targetDataset }}
+            {{- include "library.fluid.labels" . | nindent 12 }}
         spec:
           {{- include "library.fluid.dataload.cronJobCommonTemplateSpec" . | nindent 10 }}
           containers:

charts/fluid-dataloader/jindo/templates/cronjob.yaml

@@ -50,6 +50,7 @@ spec:
             app: jindofs
             cronjob: {{ printf "%s-job" .Release.Name }}
             targetDataset: {{ required "targetDataset should be set" .Values.dataloader.targetDataset }}
+            {{- include "library.fluid.labels" . | nindent 12 }}
         spec:
           {{- include "library.fluid.dataload.cronJobCommonTemplateSpec" . | nindent 10 }}
           containers:

charts/fluid-dataloader/jindocache/templates/cronjob.yaml

@@ -55,6 +55,7 @@ spec:
             app: jindocache
             cronjob: {{ printf "%s-job" .Release.Name }}
             targetDataset: {{ required "targetDataset should be set" .Values.dataloader.targetDataset }}
+            {{- include "library.fluid.labels" . | nindent 12 }}
           {{- if .Values.dataloader.labels }}
           {{- range $key, $val := .Values.dataloader.labels }}
             {{ $key | quote }}: {{ $val | quote }}

charts/fluid-dataloader/jindofsx/templates/cronjob.yaml

@@ -55,6 +55,7 @@ spec:
             app: jondofsx
             cronjob: {{ printf "%s-job" .Release.Name }}
             targetDataset: {{ required "targetDataset should be set" .Values.dataloader.targetDataset }}
+            {{- include "library.fluid.labels" . | nindent 12 }}
           {{- if .Values.dataloader.labels }}
           {{- range $key, $val := .Values.dataloader.labels }}
             {{ $key | quote }}: {{ $val | quote }}

charts/fluid-dataloader/juicefs/templates/cronjob.yaml

@@ -55,6 +55,7 @@ spec:
             app: juicefs
             cronjob: {{ printf "%s-job" .Release.Name }}
             targetDataset: {{ required "targetDataset should be set" .Values.dataloader.targetDataset }}
+            {{- include "library.fluid.labels" . | nindent 12 }}
           {{- if .Values.dataloader.labels }}
           {{- range $key, $val := .Values.dataloader.labels }}
             {{ $key | quote }}: {{ $val | quote }}

charts/fluid-datamigrate/juicefs/templates/cronjob.yaml

@@ -47,6 +47,7 @@ spec:
             app: juicefs
             cronjob: {{ printf "%s-migrate" .Release.Name }}
             targetDataset: {{ required "targetDataset should be set" .Values.datamigrate.targetDataset }}
+            {{- include "library.fluid.labels" . | nindent 12 }}
           {{- if .Values.datamigrate.labels }}
           {{- range $key, $val := .Values.datamigrate.labels }}
             {{ $key | quote }}: {{ $val | quote }}

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.ownerDatasetId }}
         {{- include "library.fluid.labels" . | nindent 8 }}
       {{- if .Values.datamigrate.labels }}
       {{- range $key, $val := .Values.datamigrate.labels }}

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.ownerDatasetId }}
     spec:
       containers:
         - name: worker

charts/goosefs/templates/fuse/client-daemonset.yaml

@@ -26,6 +26,7 @@ spec:
         release: {{ .Release.Name }}
         heritage: {{ .Release.Service }}
         role: goosefs-fuse-client
+        {{- include "library.fluid.labels" . | nindent 8 }}
     spec:
       tolerations:
         - operator: Exists

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

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 }}

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.ownerDatasetId }}
     fluid.io/dataset-placement: {{ .Values.placement }}
     {{- include "library.fluid.labels" . | nindent 4 }}
 spec:
@@ -37,8 +37,9 @@ spec:
         release: {{ .Release.Name }}
         heritage: {{ .Release.Service }}
         role: goosefs-worker
-        fluid.io/dataset: {{ .Release.Namespace }}-{{ .Release.Name }}
+        fluid.io/dataset: {{ .Values.ownerDatasetId }}
         fluid.io/dataset-placement: {{ .Values.placement }}
+        {{- include "library.fluid.labels" . | nindent 8 }}
     spec:
       enableServiceLinks: false
       hostNetwork: {{ $hostNetwork }}

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 }}

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 }}

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.ownerDatasetId }}
     fluid.io/dataset-placement: {{ .Values.placement }}
     {{- include "library.fluid.labels" . | nindent 4 }}
   ownerReferences:
@@ -49,8 +49,9 @@ spec:
         release: {{ .Release.Name }}
         heritage: {{ .Release.Service }}
         role: jindofs-worker
-        fluid.io/dataset: {{ .Release.Namespace }}-{{ .Release.Name }}
+        fluid.io/dataset: {{ .Values.ownerDatasetId }}
         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 }}

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 }}

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 }}

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.ownerDatasetId }}
     fluid.io/dataset-placement: {{ .Values.placement }}
     {{- include "library.fluid.labels" . | nindent 4 }}
   ownerReferences:
@@ -44,8 +44,9 @@ spec:
         release: {{ .Release.Name }}
         heritage: {{ .Release.Service }}
         role: jindofs-worker
-        fluid.io/dataset: {{ .Release.Namespace }}-{{ .Release.Name }}
+        fluid.io/dataset: {{ .Values.ownerDatasetId }}
         fluid.io/dataset-placement: {{ .Values.placement }}
+        {{- include "library.fluid.labels" . | nindent 8 }}
 {{- if .Values.labels }}
 {{ toYaml .Values.labels | trim | indent 8 }}
 {{- end }}

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 }}

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 }}

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.ownerDatasetId }}
     fluid.io/dataset-placement: {{ .Values.placement }}
     {{- include "library.fluid.labels" . | nindent 4 }}
   ownerReferences:
@@ -49,8 +49,9 @@ spec:
         release: {{ .Release.Name }}
         heritage: {{ .Release.Service }}
         role: jindofs-worker
-        fluid.io/dataset: {{ .Release.Namespace }}-{{ .Release.Name }}
+        fluid.io/dataset: {{ .Values.ownerDatasetId }}
         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 }}

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 }}

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.ownerDatasetId }}
     fluid.io/dataset-placement: {{ .Values.placement }}
     {{- include "library.fluid.labels" . | nindent 4 }}
   ownerReferences:
@@ -48,8 +48,9 @@ spec:
         release: {{ .Release.Name }}
         heritage: {{ .Release.Service }}
         role: juicefs-worker
-        fluid.io/dataset: {{ .Release.Namespace }}-{{ .Release.Name }}
+        fluid.io/dataset: {{ .Values.ownerDatasetId }}
         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 }}

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-id: {{ .Values.ownerDatasetId }}
 {{- end }}

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:

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.ownerDatasetId }}
     fluid.io/dataset-placement: {{ .Values.placement }}
     {{- include "library.fluid.labels" . | nindent 4 }}
   ownerReferences:
@@ -41,8 +41,9 @@ spec:
         release: {{ .Release.Name }}
         heritage: {{ .Release.Service }}
         role: thin-worker
-        fluid.io/dataset: {{ .Release.Namespace }}-{{ .Release.Name }}
+        fluid.io/dataset: {{ .Values.ownerDatasetId }}
         fluid.io/dataset-placement: {{ .Values.placement }}
+        {{- include "library.fluid.labels" . | nindent 8 }}
     spec:
       {{- if .Values.worker.imagePullSecrets }}
       imagePullSecrets:

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 }}

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 }}

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.ownerDatasetId }}
     {{- include "library.fluid.labels" . | nindent 4 }}
   {{- if .Values.owner.enabled }}
   ownerReferences:
@@ -46,7 +46,6 @@ spec:
       chart: {{ $chart }}
       release: {{ .Release.Name }}
       role: vineyard-worker
-      app.kubernetes.io/instance: {{ .Release.Namespace }}-{{ $fullName }}-worker
   template:
     metadata:
       annotations:
@@ -62,8 +61,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.ownerDatasetId }}
+        {{- 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:
-                     - {{ .Release.Namespace }}-{{ $fullName }}-worker
+                     - {{ .Values.ownerDatasetId }}-worker
               topologyKey: "kubernetes.io/hostname"