remove no need code, reduce memory allocation

fighterhit · Apr 22, 2021 · fc5998b · fc5998b
1 parent 56f76e8
commit fc5998b
Showing 1 changed file with 4 additions and 8 deletions.
diff --git a/pkg/webhook/hook.go b/pkg/webhook/hook.go
@@ -268,15 +268,11 @@ func addDefaultPodTolerations(tolerations []corev1.Toleration, notReady, unSched
 
 // injectNodeSelector reserve  ignoreLabels in nodeSelector, others would be removed
 func injectNodeSelector(nodeSelector map[string]string, ignoreLabels []string) map[string]string {
-	nodeSelectorBackup := make(map[string]string)
 	finalNodeSelector := make(map[string]string)
 	labelMap := make(map[string]string)
 	for _, v := range ignoreLabels {
 		labelMap[v] = v
 	}
-	for k, v := range nodeSelector {
-		nodeSelectorBackup[k] = v
-	}
 	for k, v := range nodeSelector {
 		// not found in label, delete
 		if labelMap[k] != "" {
@@ -289,10 +285,6 @@ func injectNodeSelector(nodeSelector map[string]string, ignoreLabels []string) m
 }
 
 func injectAffinity(affinity *corev1.Affinity, ignoreLabels []string) *corev1.Affinity {
-	labelMap := make(map[string]string)
-	for _, v := range ignoreLabels {
-		labelMap[v] = v
-	}
 	if affinity.NodeAffinity == nil {
 		return nil
 	}
@@ -303,6 +295,10 @@ func injectAffinity(affinity *corev1.Affinity, ignoreLabels []string) *corev1.Af
 	if required == nil {
 		return nil
 	}
+	labelMap := make(map[string]string)
+	for _, v := range ignoreLabels {
+		labelMap[v] = v
+	}
 	requiredCopy := affinity.NodeAffinity.RequiredDuringSchedulingIgnoredDuringExecution.DeepCopy()
 	var nodeSelectorTerm []corev1.NodeSelectorTerm
 	for termIdx, term := range requiredCopy.NodeSelectorTerms {