Generate work permanent id in webhook

Signed-off-by: whitewindmills <jayfantasyhjh@gmail.com>
karmada-io · May 10, 2024 · 4df0bf1 · 4df0bf1
1 parent 4ccffcc
commit 4df0bf1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/pkg/util/helper/work.go b/pkg/util/helper/work.go
@@ -72,9 +72,6 @@ func CreateOrUpdateWork(client client.Client, workMeta metav1.ObjectMeta, resour
 			runtimeObject.Spec = work.Spec
 			runtimeObject.Labels = util.DedupeAndMergeLabels(runtimeObject.Labels, work.Labels)
 			runtimeObject.Annotations = util.DedupeAndMergeAnnotations(runtimeObject.Annotations, work.Annotations)
-			if util.GetLabelValue(runtimeObject.Labels, workv1alpha2.WorkPermanentIDLabel) == "" {
-				runtimeObject.Labels = util.DedupeAndMergeLabels(runtimeObject.Labels, map[string]string{workv1alpha2.WorkPermanentIDLabel: uuid.New().String()})
-			}
 			return nil
 		})
 		return err

diff --git a/pkg/webhook/work/mutating.go b/pkg/webhook/work/mutating.go
@@ -51,6 +51,10 @@ func (a *MutatingAdmission) Handle(_ context.Context, req admission.Request) adm
 	}
 	klog.V(2).Infof("Mutating the work(%s/%s) for request: %s", work.Namespace, work.Name, req.Operation)
 
+	if util.GetLabelValue(work.Labels, workv1alpha2.WorkPermanentIDLabel) == "" {
+		util.MergeLabel(work, workv1alpha2.WorkPermanentIDLabel, uuid.New().String())
+	}
+
 	var manifests []workv1alpha1.Manifest
 
 	for _, manifest := range work.Spec.Workload.Manifests {
@@ -86,10 +90,6 @@ func (a *MutatingAdmission) Handle(_ context.Context, req admission.Request) adm
 		return admission.Errored(http.StatusInternalServerError, err)
 	}
 
-	if util.GetLabelValue(work.Labels, workv1alpha2.WorkPermanentIDLabel) == "" {
-		util.MergeLabel(work, workv1alpha2.WorkPermanentIDLabel, uuid.New().String())
-	}
-
 	return admission.PatchResponseFromRaw(req.Object.Raw, marshaledBytes)
 }