Simplify thinruntime reconcile process and resource creation

Signed-off-by: 玖宇 <[email protected]>

Author: 玖宇

charts/thin/templates/config/runtime.yaml

@@ -119,9 +119,6 @@ spec:
           - mountPath: /etc/fluid/config
             name: thin-conf
             readOnly: true
-          - mountPath: /etc/fluid/runtime
-            name: runtime
-            readOnly: true
           {{- if .Values.fuse.cacheDir }}
           - name: cache-dir
             mountPath: {{ .Values.fuse.cacheDir }}
@@ -155,13 +152,6 @@ spec:
                 path: config.json
             defaultMode: 0444
         {{- end }}
-        - name: runtime
-          configMap:
-            name: {{ template "thin.fullname" . }}-runtimeset
-            items:
-              - key: runtime.json
-                path: runtime.json
-            defaultMode: 0444
         {{- if .Values.fuse.volumes }}
 {{ toYaml .Values.fuse.volumes | indent 8 }}
         {{- end }}

charts/thin/templates/fuse/daemonset.yaml

@@ -1,3 +1,4 @@
+{{ if .Values.worker.enabled -}}
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
@@ -107,3 +108,4 @@ spec:
       {{- if .Values.worker.volumes }}
 {{ toYaml .Values.worker.volumes | indent 8 }}
       {{- end }}
+{{- end -}}

charts/thin/templates/worker/statefuleset.yaml

@@ -33,6 +33,7 @@ runtimeValue: ""
 
 ## WORKER ##
 worker:
+  enabled: false
   image: ""
   imageTag: ""
   imagePullPolicy: ""

charts/thin/values.yaml

@@ -24,7 +24,6 @@ import (
 	"github.com/go-logr/logr"
 	"github.com/pkg/errors"
 	corev1 "k8s.io/api/core/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
@@ -331,24 +330,16 @@ func (helper *defaultMutatorHelper) prepareFuseContainerPostStartScript() error
 		return err
 	}
 
-	ownerReference := metav1.OwnerReference{
-		APIVersion: dataset.APIVersion,
-		Kind:       dataset.Kind,
-		Name:       dataset.Name,
-		UID:        dataset.UID,
-	}
-
 	// Fluid assumes pvc name is the same with runtime's name
 	gen := poststart.NewDefaultPostStartScriptGenerator()
-	cmKey := gen.GetConfigMapKeyByOwner(types.NamespacedName{Namespace: datasetNamespace, Name: datasetName}, template.FuseMountInfo.FsType)
-	cm := gen.BuildConfigMap(ownerReference, cmKey)
-
+	cmKey := gen.GetNamespacedConfigMapKey(types.NamespacedName{Namespace: datasetNamespace, Name: datasetName}, template.FuseMountInfo.FsType)
 	found, err := kubeclient.IsConfigMapExist(helper.client, cmKey.Name, cmKey.Namespace)
 	if err != nil {
 		return err
 	}
 
 	if !found {
+		cm := gen.BuildConfigMap(dataset, cmKey)
 		err = helper.client.Create(context.TODO(), cm)
 		if err != nil {
 			// If ConfigMap creation succeeds concurrently, continue to mutate

pkg/application/inject/fuse/mutator/mutator_default.go

@@ -25,7 +25,6 @@ import (
 	"github.com/fluid-cloudnative/fluid/pkg/utils/kubeclient"
 	"github.com/pkg/errors"
 	corev1 "k8s.io/api/core/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 )
 
@@ -130,17 +129,10 @@ func (mutator *unprivilegedMutatorHelper) prepareFuseContainerPostStartScript()
 		return err
 	}
 
-	ownerReference := metav1.OwnerReference{
-		APIVersion: dataset.APIVersion,
-		Kind:       dataset.Kind,
-		Name:       dataset.Name,
-		UID:        dataset.UID,
-	}
-
 	// Fluid assumes pvc name is the same with runtime's name
 	gen := poststart.NewDefaultPostStartScriptGenerator()
-	cmKey := gen.GetConfigMapKeyByOwner(types.NamespacedName{Namespace: datasetNamespace, Name: datasetName}, template.FuseMountInfo.FsType)
-	cm := gen.BuildConfigMap(ownerReference, cmKey)
+	cmKey := gen.GetNamespacedConfigMapKey(types.NamespacedName{Namespace: datasetNamespace, Name: datasetName}, template.FuseMountInfo.FsType)
+	cm := gen.BuildConfigMap(dataset, cmKey)
 
 	found, err := kubeclient.IsConfigMapExist(mutator.client, cmKey.Name, cmKey.Namespace)
 	if err != nil {

pkg/application/inject/fuse/mutator/mutator_unprivileged.go

@@ -81,7 +81,7 @@ type defaultPostStartScriptGenerator struct {
 func NewDefaultPostStartScriptGenerator() *defaultPostStartScriptGenerator {
 	return &defaultPostStartScriptGenerator{
 		scriptGeneratorHelper: scriptGeneratorHelper{
-			configMapName:   "check-mount",
+			configMapName:   "default-check-mount",
 			scriptFileName:  "check-mount.sh",
 			scriptMountPath: "/check-mount.sh",
 			scriptContent:   replacer.Replace(contentPrivilegedSidecar),

pkg/application/inject/fuse/poststart/check_fuse_default.go

@@ -17,6 +17,7 @@ limitations under the License.
 package poststart
 
 import (
+	datav1alpha1 "github.com/fluid-cloudnative/fluid/api/v1alpha1"
 	"strings"
 
 	corev1 "k8s.io/api/core/v1"
@@ -35,27 +36,26 @@ type scriptGeneratorHelper struct {
 	scriptMountPath string
 }
 
-func (helper *scriptGeneratorHelper) BuildConfigMap(ownerReference metav1.OwnerReference, configMapKey types.NamespacedName) *corev1.ConfigMap {
+func (helper *scriptGeneratorHelper) BuildConfigMap(dataset *datav1alpha1.Dataset, configMapKey types.NamespacedName) *corev1.ConfigMap {
 	data := map[string]string{}
 	data[helper.scriptFileName] = helper.scriptContent
 	// data[helper.scriptFileName] = replacer.Replace(helper.scriptContent)
 	return &corev1.ConfigMap{
 		ObjectMeta: metav1.ObjectMeta{
-			Name:            configMapKey.Name,
-			Namespace:       configMapKey.Namespace,
-			OwnerReferences: []metav1.OwnerReference{ownerReference},
+			Name:      configMapKey.Name,
+			Namespace: configMapKey.Namespace,
 			Labels: map[string]string{
-				common.LabelAnnotationDatasetId: utils.GetDatasetId(configMapKey.Namespace, ownerReference.Name, string(ownerReference.UID)),
+				common.LabelAnnotationDatasetId: utils.GetDatasetId(configMapKey.Namespace, dataset.Name, string(dataset.UID)),
 			},
 		},
 		Data: data,
 	}
 }
 
-func (helper *scriptGeneratorHelper) GetConfigMapKeyByOwner(datasetKey types.NamespacedName, runtimeType string) types.NamespacedName {
+func (helper *scriptGeneratorHelper) GetNamespacedConfigMapKey(datasetKey types.NamespacedName, runtimeType string) types.NamespacedName {
 	return types.NamespacedName{
 		Namespace: datasetKey.Namespace,
-		Name:      datasetKey.Name + "-" + strings.ToLower(runtimeType) + "-" + helper.configMapName,
+		Name:      strings.ToLower(runtimeType) + "-" + helper.configMapName,
 	}
 }
 

pkg/application/inject/fuse/poststart/script_gen_helper.go

@@ -77,6 +77,12 @@ const (
 	//   	"Sidecar": for only sidecar to skip check mount ready,
 	AnnotationSkipCheckMountReadyTarget = LabelAnnotationPrefix + "skip-check-mount-ready-target"
 
+	// AnnotationEnableRuntimeSetConfigMap
+	AnnotationEnableRuntimeSetConfig = "runtime." + LabelAnnotationPrefix + "enable-set-config"
+
+	// AnnotationEnableRuntimeSetConfigMap
+	AnnotationEnableRuntimeHelmValueConfig = "runtime." + LabelAnnotationPrefix + "enable-helm-value-config"
+
 	// LabelAnnotationMountingDatasets is a label/annotation key indicating which datasets are currently being used by a pod.
 	// i.e. fluid.io/datasets-in-use
 	LabelAnnotationDatasetsInUse = LabelAnnotationPrefix + "datasets-in-use"

pkg/common/label.go

@@ -31,11 +31,6 @@ import (
 )
 
 func (t *ThinEngine) UpdateDatasetStatus(phase datav1alpha1.DatasetPhase) (err error) {
-	runtime, err := t.getRuntime()
-	if err != nil {
-		return err
-	}
-
 	// 2. update the dataset status
 	err = retry.RetryOnConflict(retry.DefaultBackoff, func() error {
 		dataset, err := utils.GetDataset(t.Client, t.name, t.namespace)
@@ -85,7 +80,6 @@ func (t *ThinEngine) UpdateDatasetStatus(phase datav1alpha1.DatasetPhase) (err e
 				cond)
 		}
 
-		datasetToUpdate.Status.CacheStates = runtime.Status.CacheStates
 		if !reflect.DeepEqual(dataset.Status, datasetToUpdate.Status) {
 			t.Log.V(1).Info("Update DatasetStatus", "dataset", fmt.Sprintf("%s/%s", datasetToUpdate.GetNamespace(), datasetToUpdate.GetName()))
 			err = t.Client.Status().Update(context.TODO(), datasetToUpdate)
@@ -108,39 +102,6 @@ func (t *ThinEngine) UpdateDatasetStatus(phase datav1alpha1.DatasetPhase) (err e
 }
 
 func (t *ThinEngine) UpdateCacheOfDataset() (err error) {
-	runtime, err := t.getRuntime()
-	if err != nil {
-		return err
-	}
-
-	// 2.update the dataset status
-	err = retry.RetryOnConflict(retry.DefaultBackoff, func() error {
-		dataset, err := utils.GetDataset(t.Client, t.name, t.namespace)
-		if err != nil {
-			return err
-		}
-		datasetToUpdate := dataset.DeepCopy()
-
-		datasetToUpdate.Status.CacheStates = runtime.Status.CacheStates
-
-		t.Log.Info("the dataset status", "status", datasetToUpdate.Status)
-
-		if !reflect.DeepEqual(dataset.Status, datasetToUpdate.Status) {
-			t.Log.V(1).Info("Update RuntimeStatus", "runtime", fmt.Sprintf("%s/%s", runtime.GetNamespace(), runtime.GetName()))
-			err = t.Client.Status().Update(context.TODO(), datasetToUpdate)
-			return err
-		} else {
-			t.Log.Info("No need to update the cache of the data")
-		}
-
-		return nil
-	})
-
-	if err != nil {
-		return utils.LoggingErrorExceptConflict(t.Log, err, "Failed to Update dataset",
-			types.NamespacedName{Namespace: t.namespace, Name: t.name})
-	}
-
 	return
 }