karmada-io
/
karmada
mirror of https://github.com/karmada-io/karmada.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5879 from XiShanYongYe-Chang/taint-manager-purgemode 

Update taint-manager to config eviction task with purgeMode
This commit is contained in:
karmada-bot 2024-11-25 19:59:01 +08:00 committed by GitHub
parent 9267eae1de 25867c45ba
commit 72cfef5151
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkg/controllers/cluster/taint_manager.go
View File

@ -32,6 +32,7 @@ import (
"sigs.k8s.io/controller-runtime/pkg/reconcile" "sigs.k8s.io/controller-runtime/pkg/reconcile"
clusterv1alpha1 "github.com/karmada-io/karmada/pkg/apis/cluster/v1alpha1" clusterv1alpha1 "github.com/karmada-io/karmada/pkg/apis/cluster/v1alpha1"
policyv1alpha1 "github.com/karmada-io/karmada/pkg/apis/policy/v1alpha1"
workv1alpha2 "github.com/karmada-io/karmada/pkg/apis/work/v1alpha2" workv1alpha2 "github.com/karmada-io/karmada/pkg/apis/work/v1alpha2"
"github.com/karmada-io/karmada/pkg/features" "github.com/karmada-io/karmada/pkg/features"
"github.com/karmada-io/karmada/pkg/util" "github.com/karmada-io/karmada/pkg/util"
@ -172,9 +173,15 @@ func (tc *NoExecuteTaintManager) syncBindingEviction(key util.QueueKey) error {
if needEviction || tolerationTime == 0 { if needEviction || tolerationTime == 0 {
// update final result to evict the target cluster // update final result to evict the target cluster
if features.FeatureGate.Enabled(features.GracefulEviction) { if features.FeatureGate.Enabled(features.GracefulEviction) {
binding.Spec.GracefulEvictCluster(cluster, workv1alpha2.NewTaskOptions(workv1alpha2.WithProducer(workv1alpha2.EvictionProducerTaintManager), workv1alpha2.WithReason(workv1alpha2.EvictionReasonTaintUntolerated))) binding.Spec.GracefulEvictCluster(cluster, workv1alpha2.NewTaskOptions(
workv1alpha2.WithPurgeMode(policyv1alpha1.Graciously),
workv1alpha2.WithProducer(workv1alpha2.EvictionProducerTaintManager),
workv1alpha2.WithReason(workv1alpha2.EvictionReasonTaintUntolerated)))
} else { } else {
binding.Spec.RemoveCluster(cluster) binding.Spec.GracefulEvictCluster(cluster, workv1alpha2.NewTaskOptions(
workv1alpha2.WithPurgeMode(policyv1alpha1.Immediately),
workv1alpha2.WithProducer(workv1alpha2.EvictionProducerTaintManager),
workv1alpha2.WithReason(workv1alpha2.EvictionReasonTaintUntolerated)))
} }
if err = tc.Update(context.TODO(), binding); err != nil { if err = tc.Update(context.TODO(), binding); err != nil {
helper.EmitClusterEvictionEventForResourceBinding(binding, cluster, tc.EventRecorder, err) helper.EmitClusterEvictionEventForResourceBinding(binding, cluster, tc.EventRecorder, err)
@ -228,9 +235,15 @@ func (tc *NoExecuteTaintManager) syncClusterBindingEviction(key util.QueueKey) e
if needEviction || tolerationTime == 0 { if needEviction || tolerationTime == 0 {
// update final result to evict the target cluster // update final result to evict the target cluster
if features.FeatureGate.Enabled(features.GracefulEviction) { if features.FeatureGate.Enabled(features.GracefulEviction) {
binding.Spec.GracefulEvictCluster(cluster, workv1alpha2.NewTaskOptions(workv1alpha2.WithProducer(workv1alpha2.EvictionProducerTaintManager), workv1alpha2.WithReason(workv1alpha2.EvictionReasonTaintUntolerated))) binding.Spec.GracefulEvictCluster(cluster, workv1alpha2.NewTaskOptions(
workv1alpha2.WithPurgeMode(policyv1alpha1.Graciously),
workv1alpha2.WithProducer(workv1alpha2.EvictionProducerTaintManager),
workv1alpha2.WithReason(workv1alpha2.EvictionReasonTaintUntolerated)))
} else { } else {
binding.Spec.RemoveCluster(cluster) binding.Spec.GracefulEvictCluster(cluster, workv1alpha2.NewTaskOptions(
workv1alpha2.WithPurgeMode(policyv1alpha1.Immediately),
workv1alpha2.WithProducer(workv1alpha2.EvictionProducerTaintManager),
workv1alpha2.WithReason(workv1alpha2.EvictionReasonTaintUntolerated)))
} }
if err = tc.Update(context.TODO(), binding); err != nil { if err = tc.Update(context.TODO(), binding); err != nil {
helper.EmitClusterEvictionEventForClusterResourceBinding(binding, cluster, tc.EventRecorder, err) helper.EmitClusterEvictionEventForClusterResourceBinding(binding, cluster, tc.EventRecorder, err)

3
pkg/controllers/cluster/taint_manager_test.go
View File

@ -29,6 +29,7 @@ import (
"sigs.k8s.io/controller-runtime/pkg/reconcile" "sigs.k8s.io/controller-runtime/pkg/reconcile"
clusterv1alpha1 "github.com/karmada-io/karmada/pkg/apis/cluster/v1alpha1" clusterv1alpha1 "github.com/karmada-io/karmada/pkg/apis/cluster/v1alpha1"
policyv1alpha1 "github.com/karmada-io/karmada/pkg/apis/policy/v1alpha1"
workv1alpha2 "github.com/karmada-io/karmada/pkg/apis/work/v1alpha2" workv1alpha2 "github.com/karmada-io/karmada/pkg/apis/work/v1alpha2"
"github.com/karmada-io/karmada/pkg/util" "github.com/karmada-io/karmada/pkg/util"
"github.com/karmada-io/karmada/pkg/util/fedinformer/keys" "github.com/karmada-io/karmada/pkg/util/fedinformer/keys"
@ -237,6 +238,7 @@ func TestNoExecuteTaintManager_syncBindingEviction(t *testing.T) {
GracefulEvictionTasks: []workv1alpha2.GracefulEvictionTask{ GracefulEvictionTasks: []workv1alpha2.GracefulEvictionTask{
{ {
FromCluster: "test-cluster", FromCluster: "test-cluster",
PurgeMode: policyv1alpha1.Graciously,
Replicas: &replica, Replicas: &replica,
Reason: workv1alpha2.EvictionReasonTaintUntolerated, Reason: workv1alpha2.EvictionReasonTaintUntolerated,
Producer: workv1alpha2.EvictionProducerTaintManager, Producer: workv1alpha2.EvictionProducerTaintManager,
@ -403,6 +405,7 @@ func TestNoExecuteTaintManager_syncClusterBindingEviction(t *testing.T) {
GracefulEvictionTasks: []workv1alpha2.GracefulEvictionTask{ GracefulEvictionTasks: []workv1alpha2.GracefulEvictionTask{
{ {
FromCluster: "test-cluster", FromCluster: "test-cluster",
PurgeMode: policyv1alpha1.Graciously,
Replicas: &replica, Replicas: &replica,
Reason: workv1alpha2.EvictionReasonTaintUntolerated, Reason: workv1alpha2.EvictionReasonTaintUntolerated,
Producer: workv1alpha2.EvictionProducerTaintManager, Producer: workv1alpha2.EvictionProducerTaintManager,