github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #87871 from msau42/fix-hostexec

Browse Source 
Use NodeSelector instead of NodeName in hostexec Pod
This commit is contained in:
Kubernetes Prow Robot 2020-02-10 20:44:01 -08:00 committed by GitHub
commit dc8208dddc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
test/e2e/framework/pod/node_selection.go
View File

@ -79,3 +79,11 @@ func SetAffinity(nodeSelection *NodeSelection, nodeName string) {
func SetAntiAffinity(nodeSelection *NodeSelection, nodeName string) { func SetAntiAffinity(nodeSelection *NodeSelection, nodeName string) {
setNodeAffinityRequirement(nodeSelection, v1.NodeSelectorOpNotIn, nodeName) setNodeAffinityRequirement(nodeSelection, v1.NodeSelectorOpNotIn, nodeName)
} }
// SetNodeAffinity modifies the given pod object with
// NodeAffinity to the given node name.
func SetNodeAffinity(pod *v1.Pod, nodeName string) {
nodeSelection := &NodeSelection{}
SetAffinity(nodeSelection, nodeName)
pod.Spec.Affinity = nodeSelection.Affinity
}

7
test/e2e/storage/utils/host_exec.go
View File

@ -73,9 +73,14 @@ func (h *hostExecutor) launchNodeExecPod(node string) *v1.Pod {
f := h.Framework f := h.Framework
cs := f.ClientSet cs := f.ClientSet
ns := f.Namespace ns := f.Namespace
hostExecPod := e2epod.NewExecPodSpec(ns.Name, "", true) hostExecPod := e2epod.NewExecPodSpec(ns.Name, "", true)
hostExecPod.GenerateName = fmt.Sprintf("hostexec-%s-", node) hostExecPod.GenerateName = fmt.Sprintf("hostexec-%s-", node)
hostExecPod.Spec.NodeName = node // Use NodeAffinity instead of NodeName so that pods will not
// be immediately Failed by kubelet if it's out of space. Instead
// Pods will be pending in the scheduler until there is space freed
// up.
e2epod.SetNodeAffinity(hostExecPod, node)
hostExecPod.Spec.Volumes = []v1.Volume{ hostExecPod.Spec.Volumes = []v1.Volume{
{ {
// Required to enter into host mount namespace via nsenter. // Required to enter into host mount namespace via nsenter.