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 #5153 from whitewindmills/pp-finalizers 

Transplant propagation policy finalizer to karmada-webhook
This commit is contained in:
karmada-bot 2024-07-08 14:55:02 +08:00 committed by GitHub
parent 26aae559db 91f72f998c
commit 5e54964f09
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 4 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkg/detector/detector.go
View File

@ -980,16 +980,6 @@ func (d *ResourceDetector) ReconcilePropagationPolicy(key util.QueueKey) error {
return nil
}
// TODO(whitewindmills): In order to adapt to the upgrade scenario, we temporarily add finalizer here.
// Transplant it to karmada-webhook in the next release. More info: https://github.com/karmada-io/karmada/pull/4836#discussion_r1568186728.
if controllerutil.AddFinalizer(propagationObject, util.PropagationPolicyControllerFinalizer) {
if err = d.Client.Update(context.TODO(), propagationObject); err != nil {
klog.Errorf("Failed to add finalizer for PropagationPolicy(%s), err: %v", ckey.NamespaceKey(), err)
return err
}
return nil
}
klog.Infof("PropagationPolicy(%s) has been added or updated.", ckey.NamespaceKey())
return d.HandlePropagationPolicyCreationOrUpdate(propagationObject)
}
@ -1092,16 +1082,6 @@ func (d *ResourceDetector) ReconcileClusterPropagationPolicy(key util.QueueKey)
return nil
}
// TODO(whitewindmills): In order to adapt to the upgrade scenario, we temporarily add finalizer here.
// Transplant it to karmada-webhook in the next release. More info: https://github.com/karmada-io/karmada/pull/4836#discussion_r1568186728.
if controllerutil.AddFinalizer(propagationObject, util.ClusterPropagationPolicyControllerFinalizer) {
if err = d.Client.Update(context.TODO(), propagationObject); err != nil {
klog.Errorf("Failed to add finalizer for ClusterPropagationPolicy(%s), err: %v", ckey.NamespaceKey(), err)
return err
}
return nil
}
klog.Infof("ClusterPropagationPolicy(%s) has been added or updated.", ckey.NamespaceKey())
return d.HandleClusterPropagationPolicyCreationOrUpdate(propagationObject)
}

2
pkg/webhook/clusterpropagationpolicy/mutating.go
View File

@ -24,6 +24,7 @@ import (
"github.com/google/uuid"
admissionv1 "k8s.io/api/admission/v1"
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
policyv1alpha1 "github.com/karmada-io/karmada/pkg/apis/policy/v1alpha1"
@ -85,6 +86,7 @@ func (a *MutatingAdmission) Handle(_ context.Context, req admission.Request) adm
if req.Operation == admissionv1.Create {
util.MergeLabel(policy, policyv1alpha1.ClusterPropagationPolicyPermanentIDLabel, uuid.New().String())
controllerutil.AddFinalizer(policy, util.ClusterPropagationPolicyControllerFinalizer)
}
marshaledBytes, err := json.Marshal(policy)

2
pkg/webhook/propagationpolicy/mutating.go
View File

@ -25,6 +25,7 @@ import (
"github.com/google/uuid"
admissionv1 "k8s.io/api/admission/v1"
"k8s.io/klog/v2"
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
policyv1alpha1 "github.com/karmada-io/karmada/pkg/apis/policy/v1alpha1"
@ -97,6 +98,7 @@ func (a *MutatingAdmission) Handle(_ context.Context, req admission.Request) adm
if req.Operation == admissionv1.Create {
util.MergeLabel(policy, policyv1alpha1.PropagationPolicyPermanentIDLabel, uuid.New().String())
controllerutil.AddFinalizer(policy, util.PropagationPolicyControllerFinalizer)
}
marshaledBytes, err := json.Marshal(policy)