From 887f2418d226b3be655798abdd20cf67845d8b96 Mon Sep 17 00:00:00 2001 From: "liheng.zms" Date: Mon, 18 Mar 2024 16:59:29 +0800 Subject: [PATCH 1/3] PodWebhook=false will not disable ResourcesDeletionProtection Signed-off-by: liheng.zms --- pkg/features/kruise_features.go | 1 - 1 file changed, 1 deletion(-) diff --git a/pkg/features/kruise_features.go b/pkg/features/kruise_features.go index 0d5112f870..b56aced185 100644 --- a/pkg/features/kruise_features.go +++ b/pkg/features/kruise_features.go @@ -162,7 +162,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)) From 675f563de42175fb7287650a0326e5c7c6bb3d5a Mon Sep 17 00:00:00 2001 From: "liheng.zms" Date: Mon, 18 Mar 2024 17:43:23 +0800 Subject: [PATCH 2/3] changelog feature no longer work for resources under namespace kube-system Signed-off-by: liheng.zms --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c9190862d3..584a547977 100644 --- 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, ResourcesDeletionProtection, 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)) From b2998f1e607ed4578169c678ad652815e08cb551 Mon Sep 17 00:00:00 2001 From: "liheng.zms" Date: Tue, 19 Mar 2024 11:26:45 +0800 Subject: [PATCH 3/3] change imagepulljob reconcile RequeueAfter=5s Signed-off-by: liheng.zms --- CHANGELOG.md | 2 +- pkg/controller/imagepulljob/imagepulljob_controller.go | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 584a547977..8f95a7ed14 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,7 +12,7 @@ However it's still possible to use OpenKruise with Kubernetes versions 1.16 and 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, ResourcesDeletionProtection, ContainerLaunchPriority and PersistentPodState. ([#92](https://github.com/openkruise/charts/pull/92), [@hantmac](https://github.com/hantmac)) +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 index e491a76677..97395353b3 100644 --- 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 } }