diff --git a/pkg/application/inject/fuse/injector_test.go b/pkg/application/inject/fuse/injector_test.go index 8cf0b8a4f21..d3728739269 100644 --- a/pkg/application/inject/fuse/injector_test.go +++ b/pkg/application/inject/fuse/injector_test.go @@ -4225,9 +4225,9 @@ func TestInjectPodUnprivileged(t *testing.T) { for _, injectedFuse := range testcase.fuse { for _, wantVolume := range injectedFuse.Spec.Template.Spec.Volumes { // Skip check for volumes like "-fuse-mount" and "-fuse-device" - if wantVolume.VolumeSource.HostPath != nil && - (strings.HasPrefix(wantVolume.VolumeSource.HostPath.Path, "/dev") || - strings.HasPrefix(wantVolume.VolumeSource.HostPath.Path, "/runtime-mnt")) { + if wantVolume.HostPath != nil && + (strings.HasPrefix(wantVolume.HostPath.Path, "/dev") || + strings.HasPrefix(wantVolume.HostPath.Path, "/runtime-mnt")) { continue } wantTemp := wantVolume.DeepCopy() diff --git a/pkg/controllers/operation_controller.go b/pkg/controllers/operation_controller.go index a857471db07..1b1b20132f7 100644 --- a/pkg/controllers/operation_controller.go +++ b/pkg/controllers/operation_controller.go @@ -240,7 +240,7 @@ func (o *OperationReconciler) addFinalizerAndRequeue(ctx dataoperation.Reconcile finalizers := append(objectMeta.GetFinalizers(), ctx.DataOpFinalizerName) objectMeta.SetFinalizers(finalizers) - ctx.Log.Info("Add finalizer and requeue", "finalizer", ctx.Finalizers) + ctx.Log.Info("Add finalizer and requeue", "finalizer", finalizers) prevGeneration := object.GetGeneration() if err := o.Update(ctx, object); err != nil { diff --git a/pkg/controllers/v1alpha1/dataset/dataset_controller.go b/pkg/controllers/v1alpha1/dataset/dataset_controller.go index 1f1d8c5f9fd..1ec17364a78 100644 --- a/pkg/controllers/v1alpha1/dataset/dataset_controller.go +++ b/pkg/controllers/v1alpha1/dataset/dataset_controller.go @@ -125,8 +125,8 @@ func (r *DatasetReconciler) reconcileDataset(ctx reconcileRequestContext, needRe log.V(1).Info("process the dataset", "dataset", ctx.Dataset) // 0. Validate name is prefixed with a number such as "20-hbase". - if errs := validation.IsDNS1035Label(ctx.Dataset.ObjectMeta.Name); len(ctx.Dataset.ObjectMeta.Name) > 0 && len(errs) > 0 { - err := field.Invalid(field.NewPath("metadata").Child("name"), ctx.Dataset.ObjectMeta.Name, strings.Join(errs, ",")) + if errs := validation.IsDNS1035Label(ctx.Dataset.Name); len(ctx.Dataset.Name) > 0 && len(errs) > 0 { + err := field.Invalid(field.NewPath("metadata").Child("name"), ctx.Dataset.Name, strings.Join(errs, ",")) ctx.Log.Error(err, "Failed to create dataset", "DatasetCreateError", ctx) r.Recorder.Eventf(&ctx.Dataset, v1.EventTypeWarning, common.ErrorCreateDataset, "Failed to create dataset because err: %v", err) return utils.RequeueIfError(err) @@ -138,7 +138,7 @@ func (r *DatasetReconciler) reconcileDataset(ctx reconcileRequestContext, needRe } // 2.Add finalizer - if !utils.ContainsString(ctx.Dataset.ObjectMeta.GetFinalizers(), finalizer) { + if !utils.ContainsString(ctx.Dataset.GetFinalizers(), finalizer) { return r.addFinalizerAndRequeue(ctx) } diff --git a/pkg/controllers/v1alpha1/fluidapp/dataflowaffinity/dataflowaffinity_controller.go b/pkg/controllers/v1alpha1/fluidapp/dataflowaffinity/dataflowaffinity_controller.go index ac7b4f96b57..9f5adc69776 100644 --- a/pkg/controllers/v1alpha1/fluidapp/dataflowaffinity/dataflowaffinity_controller.go +++ b/pkg/controllers/v1alpha1/fluidapp/dataflowaffinity/dataflowaffinity_controller.go @@ -19,6 +19,8 @@ package dataflowaffinity import ( "context" "fmt" + "strings" + "github.com/fluid-cloudnative/fluid/pkg/common" "github.com/fluid-cloudnative/fluid/pkg/ctrl/watch" "github.com/fluid-cloudnative/fluid/pkg/utils" @@ -31,7 +33,6 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/controller" "sigs.k8s.io/controller-runtime/pkg/reconcile" - "strings" ) const DataOpJobControllerName string = "DataOpJobController" @@ -98,7 +99,7 @@ func (f *DataOpJobReconciler) Reconcile(ctx context.Context, request reconcile.R // inject dataflow enabled affinity if not exist. if _, ok := job.Annotations[common.AnnotationDataFlowAffinityInject]; !ok { job.Annotations[common.AnnotationDataFlowAffinityInject] = "true" - if err := f.Client.Update(ctx, job); err != nil { + if err := f.Update(ctx, job); err != nil { requestCtx.Log.Error(err, "Failed to add dataflow affinity enabled label", "AnnotationUpdateError", ctx) return utils.RequeueIfError(err) } @@ -159,7 +160,7 @@ func (f *DataOpJobReconciler) injectPodNodeLabelsToJob(job *batchv1.Job) error { } } - if err = f.Client.Update(context.TODO(), job); err != nil { + if err = f.Update(context.TODO(), job); err != nil { return err } diff --git a/pkg/runtime/context.go b/pkg/runtime/context.go index 8e88a044328..cc5fd15b841 100644 --- a/pkg/runtime/context.go +++ b/pkg/runtime/context.go @@ -32,7 +32,7 @@ type ReconcileRequestContext struct { context.Context types.NamespacedName common.Category - *datav1alpha1.Dataset + Dataset *datav1alpha1.Dataset Runtime client.Object RuntimeType string