mirror of https://github.com/k3s-io/k3s
Merge pull request #33509 from ivan4th/fix-daemon-set-namespace-handling-for-predicates
Automatic merge from submit-queue Fix DaemonSet namespace handling for predicates In order to determine whether a node should run its daemon pod, DaemonController creates a dummy pod based on DaemonSet's template and then uses scheduler predicates (currently GeneralPredicates) to test whether such pod can be run by the node. The problem was that DaemonController was not setting Namespace for the dummy pod. This was not affecting currently used GeneralPredicates but this problem could bite later when some namespace-dependent predicates are added to GeneralPredicates or directly to DaemonController's node checks (e.g. pod affinity). Stumbled upon it while working on e2e test for #31136pull/6/head
commit
f429d8f082
|
@ -650,6 +650,7 @@ func (dsc *DaemonSetsController) nodeShouldRunDaemonPod(node *api.Node, ds *exte
|
|||
}
|
||||
|
||||
newPod := &api.Pod{Spec: ds.Spec.Template.Spec, ObjectMeta: ds.Spec.Template.ObjectMeta}
|
||||
newPod.Namespace = ds.Namespace
|
||||
newPod.Spec.NodeName = node.Name
|
||||
|
||||
pods := []*api.Pod{}
|
||||
|
|
Loading…
Reference in New Issue