PodWebhook=false will not disable ResourcesDeletionProtection (#1526)

* 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>
openkruise · Mar 20, 2024 · fd7e86e · fd7e86e
1 parent 7270f40
commit fd7e86e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,8 @@ 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))
+- To avoid potential circular dependency problem, features rely on webhook will no longer work for resources under kube-system,
+e.g. SidecarSet, WorkloadSpread, PodUnavailableBudget, ContainerLaunchPriority and PersistentPodState. ([#92](https://github.com/openkruise/charts/pull/92), [@hantmac](https://github.com/hantmac))
 
 ### Key Features
 - Fix WorkloadSpread incorrect subset allocation after workload rolling updating. ([#1197](https://github.com/openkruise/kruise/pull/1197), [veophi](https://github.com/veophi))

diff --git a/pkg/controller/imagepulljob/imagepulljob_controller.go b/pkg/controller/imagepulljob/imagepulljob_controller.go
@@ -242,7 +242,8 @@ 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
+			// fix issue https://github.com/openkruise/kruise/issues/1528
+			return reconcile.Result{RequeueAfter: time.Second * 5}, nil
 		}
 	}
 

diff --git a/pkg/features/kruise_features.go b/pkg/features/kruise_features.go
@@ -168,7 +168,6 @@ func compatibleEnv() {
 func SetDefaultFeatureGates() {
 	if !utilfeature.DefaultFeatureGate.Enabled(PodWebhook) {
 		_ = utilfeature.DefaultMutableFeatureGate.Set(fmt.Sprintf("%s=false", KruisePodReadinessGate))
-		_ = utilfeature.DefaultMutableFeatureGate.Set(fmt.Sprintf("%s=false", ResourcesDeletionProtection))
 		_ = utilfeature.DefaultMutableFeatureGate.Set(fmt.Sprintf("%s=false", PodUnavailableBudgetDeleteGate))
 		_ = utilfeature.DefaultMutableFeatureGate.Set(fmt.Sprintf("%s=false", PodUnavailableBudgetUpdateGate))
 		_ = utilfeature.DefaultMutableFeatureGate.Set(fmt.Sprintf("%s=false", WorkloadSpread))