fix(scheduler): fix overwrite fedobject annotations bug

kubewharf · Jul 22, 2023 · 1b353c1 · 1b353c1
1 parent 6eb28ee
commit 1b353c1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/pkg/controllers/scheduler/scheduler.go b/pkg/controllers/scheduler/scheduler.go
@@ -594,7 +594,7 @@ func (s *Scheduler) persistSchedulingResult(
 		return worker.StatusError
 	}
 
-	logger.V(1).Info("Updated federated object")
+	logger.V(1).Info("Scheduling success")
 	s.eventRecorder.Eventf(
 		fedObject,
 		corev1.EventTypeNormal,

diff --git a/pkg/controllers/scheduler/schedulingtriggers.go b/pkg/controllers/scheduler/schedulingtriggers.go
@@ -156,13 +156,13 @@ var knownSchedulingAnnotations = sets.New(
 )
 
 func getSchedulingAnnotations(fedObject fedcorev1a1.GenericFederatedObject) []keyValue[string, string] {
-	annotations := fedObject.GetAnnotations() // this is a deep copy
-	for k := range annotations {
-		if !knownSchedulingAnnotations.Has(k) {
-			delete(annotations, k)
+	result := map[string]string{}
+	for k, v := range fedObject.GetAnnotations() {
+		if knownSchedulingAnnotations.Has(k) {
+			result[k] = v
 		}
 	}
-	return sortMap(annotations)
+	return sortMap(result)
 }
 
 func getReplicaCount(