Skip to content

Remove embedded field #4832

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cheyang wants to merge 1 commit into
base: master
Choose a base branch
from
+12 −11
Open

Remove embedded field #4832

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions pkg/application/inject/fuse/injector_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 "<runtime>-fuse-mount" and "<runtime>-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()
Expand Down
2 changes: 1 addition & 1 deletion pkg/controllers/operation_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions pkg/controllers/v1alpha1/dataset/dataset_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
}

Expand Down
7 changes: 4 additions & 3 deletions pkg/controllers/v1alpha1/fluidapp/dataflowaffinity/dataflowaffinity_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down Expand Up @@ -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)
}
Expand Down Expand Up @@ -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
}

Expand Down
2 changes: 1 addition & 1 deletion pkg/runtime/context.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ type ReconcileRequestContext struct {
context.Context
types.NamespacedName
common.Category
*datav1alpha1.Dataset
Dataset *datav1alpha1.Dataset
Runtime client.Object

RuntimeType string
Expand Down
Loading