Skip to content
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.

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

PodWebhook=false will not disable ResourcesDeletionProtection #1526

Merged
merged 3 commits into from Mar 20, 2024

Conversation

zmberg
Copy link
Member

@zmberg zmberg commented Mar 18, 2024

Ⅰ. Describe what this PR does

Ⅱ. Does this pull request fix one issue?

Ⅲ. Describe how to verify it

Ⅳ. Special notes for reviews

Signed-off-by: liheng.zms <liheng.zms@alibaba-inc.com>
@kruise-bot kruise-bot added the size/XS size/XS: 0-9 label Mar 18, 2024
Copy link

codecov bot commented Mar 18, 2024

Codecov Report

Attention: Patch coverage is 0% with 2 lines in your changes are missing coverage. Please review.

Project coverage is 47.92%. Comparing base (dad39bc) to head (b2998f1).
Report is 1 commits behind head on master.

Files Patch % Lines
...controller/imagepulljob/imagepulljob_controller.go 0.00% 2 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##           master    #1526      +/-   ##
==========================================
+ Coverage   47.90%   47.92%   +0.01%     
==========================================
  Files         161      162       +1     
  Lines       23425    23483      +58     
==========================================
+ Hits        11222    11254      +32     
- Misses      10989    11010      +21     
- Partials     1214     1219       +5     
Flag Coverage Δ
unittests 47.92% <0.00%> (+0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

CHANGELOG.md Outdated
@@ -11,6 +11,7 @@ However it's still possible to use OpenKruise with Kubernetes versions 1.16 and
- OpenKruise leader election default to use leases mode. ([#1407](https://github.com/openkruise/kruise/pull/1407), [dsxing](https://github.com/dsxing))
For users with OpenKruise version 1.3.0 or lower, please first upgrade your OpenKruise to version 1.4 or 1.5 before upgrading to 1.6.0, so as to avoid unexpected multiple leader problem during the installation.
- Bump Kubernetes dependency to 1.26.10. ([#1511](https://github.com/openkruise/kruise/pull/1511), [KaiShi](https://github.com/BH4AWS))
- Features of SidecarSet, WorkloadSpread, PodUnavailableBudget, ResourcesDeletionProtection, ContainerLaunchPriority, PersistentPodState no longer work for resources under namespace kube-system.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

plz provide contributor(hantmac) and PR link, and explain why enforce this limitation. e.g.
To avoid potential circular dependency problem, features rely on webhook will no longer work for resources under kube-system, e.g. SidecarSet, WorkloadSpread, PodUnavailableBudget, ResourcesDeletionProtection, ContainerLaunchPriority and PersistentPodState.

…ystem

Signed-off-by: liheng.zms <liheng.zms@alibaba-inc.com>
@furykerry
Copy link
Member

/lgtm

@zmberg
Copy link
Member Author

zmberg commented Mar 20, 2024

#1528

@@ -242,7 +242,7 @@ func (r *ReconcileImagePullJob) Reconcile(_ context.Context, request reconcile.R
return reconcile.Result{}, nil
}
klog.V(4).Infof("Not satisfied resourceVersion for %v, wait for NodeImage %v updating", request.String(), nodeImage.Name)
return reconcile.Result{RequeueAfter: expectations.ExpectationTimeout - unsatisfiedDuration}, nil
return reconcile.Result{RequeueAfter: time.Second * 5}, nil
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

plz leave in the code about what problem to be solved

Signed-off-by: liheng.zms <liheng.zms@alibaba-inc.com>
@furykerry
Copy link
Member

/lgtm

@furykerry
Copy link
Member

/approve

@kruise-bot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: furykerry

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 /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@kruise-bot kruise-bot merged commit fd7e86e into openkruise:master Mar 20, 2024
33 of 34 checks passed
@zmberg zmberg deleted the fix-feature-gates branch March 21, 2024 01:25
zmberg added a commit that referenced this pull request Mar 21, 2024
* PodWebhook=false will not disable ResourcesDeletionProtection

Signed-off-by: liheng.zms <liheng.zms@alibaba-inc.com>

* changelog feature no longer work for resources under namespace kube-system

Signed-off-by: liheng.zms <liheng.zms@alibaba-inc.com>

* change imagepulljob reconcile RequeueAfter=5s

Signed-off-by: liheng.zms <liheng.zms@alibaba-inc.com>

---------

Signed-off-by: liheng.zms <liheng.zms@alibaba-inc.com>
ppbits pushed a commit to ppbits/kruise that referenced this pull request Apr 4, 2024
…uise#1526)

* PodWebhook=false will not disable ResourcesDeletionProtection


* changelog feature no longer work for resources under namespace kube-system


* change imagepulljob reconcile RequeueAfter=5s


---------
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants