Add work apply controller #7
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
k8s-ci-robot
added
the
cncf-cla: yes
k8s-ci-robot
added
the
size/XL
qiujian16
force-pushed
the
apply-controller
branch
from
f32ed01 to
06daf1d
Compare
qiujian16
force-pushed
the
apply-controller
branch
from
06daf1d to
ef27668
Compare
k8s-ci-robot
added
size/XXL
qiujian16
force-pushed
the
apply-controller
branch
from
ef27668 to
d9c3fc6
Compare
qiujian16
force-pushed
the
apply-controller
branch
from
d9c3fc6 to
230b39c
Compare
k8s-ci-robot
added
size/XL
|
/assign @RainbowMango |
|
Good job!!! @qiujian16 |
There was a problem hiding this comment.
Just some nits, otherwise LGTM.
Great job! Thanks again! @qiujian16
pkg/controllers/apply_controller.go
Outdated
| // Reconcile implement the control loop logic for Work object. | ||
| func (r *ApplyWorkReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) { | ||
| work := &workv1alpha1.Work{} | ||
| err := r.client.Get(ctx, types.NamespacedName{Name: req.Name, Namespace: req.Namespace}, work) |
There was a problem hiding this comment.
Suggested change
| err := r.client.Get(ctx, types.NamespacedName{Name: req.Name, Namespace: req.Namespace}, work) | |
| err := r.client.Get(ctx, req.NamespacedName, work) |
We don't need to rebuild a NamespaceName here.
pkg/controllers/apply_controller.go
Outdated
Comment on lines
68
to
70
| found := false | ||
| for i := range work.Finalizers { | ||
| if work.Finalizers[i] == workFinalizer { | ||
| found = true | ||
| break | ||
| } | ||
| } | ||
| if !found { | ||
| return ctrl.Result{}, nil | ||
| } |
There was a problem hiding this comment.
Suggested change
| found := false | |
| for i := range work.Finalizers { | |
| if work.Finalizers[i] == workFinalizer { | |
| found = true | |
| break | |
| } | |
| } | |
| if !found { | |
| return ctrl.Result{}, nil | |
| } | |
| if !controllerutil.ContainsFinalizer(work, workFinalizer) { | |
| return ctrl.Result{}, nil | |
| } |
Maybe we can use ContainsFinalizer to simply this logic.
There was a problem hiding this comment.
yeah, this is neat.
Comment on lines
27
to
32
| corev1 "k8s.io/api/core/v1" | ||
| "k8s.io/apimachinery/pkg/api/meta" | ||
| "k8s.io/apimachinery/pkg/runtime" | ||
|
|
||
| metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||
| utilrand "k8s.io/apimachinery/pkg/util/rand" | ||
| workv1alpha1 "sigs.k8s.io/work-api/pkg/apis/v1alpha1" |
There was a problem hiding this comment.
Do you want to group imports?
| // Reconcile implement the control loop logic for finalizing Work object. | ||
| func (r *FinalizeWorkReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) { | ||
| work := &workv1alpha1.Work{} | ||
| err := r.client.Get(ctx, types.NamespacedName{Name: req.Name, Namespace: req.Namespace}, work) |
There was a problem hiding this comment.
Suggested change
| err := r.client.Get(ctx, types.NamespacedName{Name: req.Name, Namespace: req.Namespace}, work) | |
| err := r.client.Get(ctx, req.NamespacedName, work) |
Comment on lines
54
to
61
| newFinalizers := []string{} | ||
| for i := range work.Finalizers { | ||
| if work.Finalizers[i] == workFinalizer { | ||
| continue | ||
| } | ||
| newFinalizers = append(newFinalizers, work.Finalizers[i]) | ||
| } | ||
| work.Finalizers = newFinalizers |
There was a problem hiding this comment.
Suggested change
| newFinalizers := []string{} | |
| for i := range work.Finalizers { | |
| if work.Finalizers[i] == workFinalizer { | |
| continue | |
| } | |
| newFinalizers = append(newFinalizers, work.Finalizers[i]) | |
| } | |
| work.Finalizers = newFinalizers | |
| if controllerutil.ContainsFinalizer(work, workFinalizer) { | |
| controllerutil.RemoveFinalizer(work, workFinalizer) | |
| } |
Does this work too?
qiujian16
force-pushed
the
apply-controller
branch
from
21ff2e1 to
a390c74
Compare
|
/lgtm |
k8s-ci-robot
added
the
lgtm
|
/approve |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: qiujian16, RainbowMango The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
k8s-ci-robot
added
the
approved
Ealianis
referenced
this pull request
in Azure/k8s-work-api
Jun 6, 2022
Co-authored-by: Ryan Zhang <[email protected]>
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.
/hold
still need to add ut at least