Skip to content
Merged
Changes from all commits
Commits
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
7 changes: 5 additions & 2 deletions pkg/controller/generic_control.go
Original file line number Diff line number Diff line change
Expand Up @@ -386,6 +386,7 @@ func (w *typedWrapper) CreateOrUpdateIngress(controller client.Object, ingress *
func (w *typedWrapper) Create(controller, obj client.Object) error {
return w.GenericControlInterface.Create(controller, obj, true)
}

func (w *typedWrapper) Exist(key client.ObjectKey, obj client.Object) (bool, error) {
return w.GenericControlInterface.Exist(key, obj)
}
Expand Down Expand Up @@ -449,7 +450,6 @@ func (c *realGenericControlInterface) Exist(key client.ObjectKey, obj client.Obj
// call mergeFn to merge the change in new object to the existing object, then update the existing object.
// The object will also be adopted by the given controller.
func (c *realGenericControlInterface) CreateOrUpdate(controller, obj client.Object, mergeFn MergeFn, setOwnerFlag bool) (runtime.Object, error) {

// controller-runtime/client will mutate the object pointer in-place,
// to be consistent with other methods in our controller, we copy the object
// to avoid the in-place mutation here and hereafter.
Expand All @@ -472,7 +472,7 @@ func (c *realGenericControlInterface) CreateOrUpdate(controller, obj client.Obje
}

exist := err == nil
klog.Infof("get obj %s/%s exist=%v", obj.GetNamespace(), obj.GetName(), exist)
klog.V(4).Infof("get obj %s/%s exist=%v", obj.GetNamespace(), obj.GetName(), exist)
if exist {
// 2. object has already existed, merge our desired changes to it

Expand Down Expand Up @@ -607,6 +607,7 @@ func NewFakeGenericControl(initObjects ...runtime.Object) *FakeGenericControl {
RequestTracker{},
}
}

func (c *FakeGenericControl) Create(controller, obj client.Object, setOwnerFlag bool) error {
defer c.createTracker.Inc()
if c.createTracker.ErrorReady() {
Expand All @@ -630,9 +631,11 @@ func (c *FakeGenericControl) Exist(key client.ObjectKey, obj client.Object) (boo
func (c *FakeGenericControl) SetCreateError(err error, after int) {
c.createTracker.SetError(err).SetAfter(after)
}

func (c *FakeGenericControl) SetExistError(err error, after int) {
c.existTracker.SetError(err).SetAfter(after)
}

func (c *FakeGenericControl) SetUpdateStatusError(err error, after int) {
c.updateStatusTracker.SetError(err).SetAfter(after)
}
Expand Down