Fix type issue of ippool #367
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
zhengxiexie
force-pushed
the
fix_ippool_type
branch
2 times, most recently
from
337b8bd to
077c397
Compare
wyike
reviewed
Oct 27, 2023
|
Let' remove the change on CRD and API? They are not needed. |
Move the logic of deciding type of ippool before add and delete, or else it would fail to delete ippool if user doesn't specify type field.
zhengxiexie
force-pushed
the
fix_ippool_type
branch
from
077c397 to
9d5f38b
Compare
wyike
approved these changes
Nov 8, 2023
zhengxiexie
requested review from
TaoZou1
and removed request for
dantingl and
TaoZou1
TaoZou1
approved these changes
Nov 8, 2023
wyike
reviewed
Nov 9, 2023
| @@ -124,6 +124,17 @@ func (r *IPPoolReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctr | |||
|
|
|||
| // TODO: Xiaopei's suggestions: is there possibility that IPPool was deleted from nsx store but NSX block subnet was not deleted? | |||
|
|
|||
| if obj.Spec.Type == "" { | |||
There was a problem hiding this comment.
sorry for the late awareness.
If spec.Type is set to a value at the beginning, I notice
controllerutil.AddFinalizer(obj, servicecommon.IPPoolFinalizerName)
if err := r.Client.Update(ctx, obj); err != nil {
log.Error(err, "add finalizer", "ippool", req.NamespacedName)
updateFail(r, &ctx, obj, &err)
return resultRequeue, err
}
there will be an add finalizer later.
Will it patch the Type to ippool object when updating finalizer? Is this behavior change also what you want? Have you tested the change locally first?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Move the logic of deciding type of ippool before add and delete,
or else it would fail to delete ippool if user doesn't specify
type field.