PR comments

pkg/apis/provisioning/v1alpha5/requirements.go

@@ -40,14 +40,13 @@ type Requirements struct {
 // Hash implements the hash function
 func (r Requirements) Hash() (uint64, error) {
 	// We explicitly hash both the list and set version of the requirements.
-	key := struct {
+	return hashstructure.Hash(struct {
 		Requirements     []v1.NodeSelectorRequirement
 		RequirementsSets map[string]sets.Set
 	}{
 		r.Requirements,
 		r.requirements,
-	}
-	return hashstructure.Hash(key, hashstructure.FormatV2, &hashstructure.HashOptions{SlicesAsSets: true})
+	}, hashstructure.FormatV2, &hashstructure.HashOptions{SlicesAsSets: true})
 }
 
 // NewRequirements constructs requirements from NodeSelectorRequirements

pkg/controllers/provisioning/scheduling/node.go

@@ -44,7 +44,7 @@ type Node struct {
 func NewNode(constraints *v1alpha5.Constraints, daemons []*v1.Pod, instanceTypeOptions []cloudprovider.InstanceType, pods ...*v1.Pod) *Node {
 	n := &Node{
 		Labels:               constraints.Labels,
-		Taints:               constraints.Taints.DeepCopy(),
+		Taints:               constraints.Taints,
 		Requirements:         *constraints.Requirements.DeepCopy(),
 		Provider:             constraints.Provider,
 		KubeletConfiguration: constraints.KubeletConfiguration,
@@ -161,18 +161,18 @@ func (n Node) hasCompatibleResources(resourceList v1.ResourceList, it cloudprovi
 
 func (n *Node) recalculateDaemonResources() {
 	n.daemonResources = nil
-	for _, ds := range n.daemons {
-		podRequirements := v1alpha5.NewPodRequirements(ds)
-		// we specifically do not check if the DaemonSet pod will fit on the node here, we want large DS pods to cause
+	for _, daemon := range n.daemons {
+		podRequirements := v1alpha5.NewPodRequirements(daemon)
+		// we intentionally do not check if the DaemonSet pod will fit on the node here, we want large DS pods to cause
 		// us to choose larger instance types
 		if err := n.Requirements.Compatible(podRequirements); err != nil {
 			continue
 		}
-		if err := n.Taints.Tolerates(ds); err != nil {
+		if err := n.Taints.Tolerates(daemon); err != nil {
 			continue
 		}
 
-		daemonsetResources := resources.RequestsForPods(ds)
+		daemonsetResources := resources.RequestsForPods(daemon)
 		daemonsetResources[v1.ResourcePods] = resource.MustParse("1")
 		n.daemonResources = resources.Merge(n.daemonResources, daemonsetResources)
 	}