mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-22 03:11:40 +00:00
Merge pull request #113597 from ionutbalutoiu/tests/lifecycle-hooks
tests: Spawn poststart / prestop pods on the same node as the https pod
This commit is contained in:
commit
8eddcac00a
@ -184,7 +184,7 @@ var _ = SIGDescribe("Container Lifecycle Hook", func() {
|
|||||||
/*
|
/*
|
||||||
Release : v1.23
|
Release : v1.23
|
||||||
Testname: Pod Lifecycle, poststart https hook
|
Testname: Pod Lifecycle, poststart https hook
|
||||||
Description: When a post-start handler is specified in the container lifecycle using a 'HttpGet' action, then the handler MUST be invoked before the container is terminated. A server pod is created that will serve https requests, create a second pod with a container lifecycle specifying a post-start that invokes the server pod to validate that the post-start is executed.
|
Description: When a post-start handler is specified in the container lifecycle using a 'HttpGet' action, then the handler MUST be invoked before the container is terminated. A server pod is created that will serve https requests, create a second pod on the same node with a container lifecycle specifying a post-start that invokes the server pod to validate that the post-start is executed.
|
||||||
*/
|
*/
|
||||||
ginkgo.It("should execute poststart https hook properly [MinimumKubeletVersion:1.23] [NodeConformance]", func() {
|
ginkgo.It("should execute poststart https hook properly [MinimumKubeletVersion:1.23] [NodeConformance]", func() {
|
||||||
lifecycle := &v1.Lifecycle{
|
lifecycle := &v1.Lifecycle{
|
||||||
@ -198,6 +198,10 @@ var _ = SIGDescribe("Container Lifecycle Hook", func() {
|
|||||||
},
|
},
|
||||||
}
|
}
|
||||||
podWithHook := getPodWithHook("pod-with-poststart-https-hook", imageutils.GetPauseImageName(), lifecycle)
|
podWithHook := getPodWithHook("pod-with-poststart-https-hook", imageutils.GetPauseImageName(), lifecycle)
|
||||||
|
// make sure we spawn the test pod on the same node as the webserver.
|
||||||
|
nodeSelection := e2epod.NodeSelection{}
|
||||||
|
e2epod.SetAffinity(&nodeSelection, targetNode)
|
||||||
|
e2epod.SetNodeSelection(&podWithHook.Spec, nodeSelection)
|
||||||
testPodWithHook(podWithHook)
|
testPodWithHook(podWithHook)
|
||||||
})
|
})
|
||||||
/*
|
/*
|
||||||
@ -225,7 +229,7 @@ var _ = SIGDescribe("Container Lifecycle Hook", func() {
|
|||||||
/*
|
/*
|
||||||
Release : v1.23
|
Release : v1.23
|
||||||
Testname: Pod Lifecycle, prestop https hook
|
Testname: Pod Lifecycle, prestop https hook
|
||||||
Description: When a pre-stop handler is specified in the container lifecycle using a 'HttpGet' action, then the handler MUST be invoked before the container is terminated. A server pod is created that will serve https requests, create a second pod with a container lifecycle specifying a pre-stop that invokes the server pod to validate that the pre-stop is executed.
|
Description: When a pre-stop handler is specified in the container lifecycle using a 'HttpGet' action, then the handler MUST be invoked before the container is terminated. A server pod is created that will serve https requests, create a second pod on the same node with a container lifecycle specifying a pre-stop that invokes the server pod to validate that the pre-stop is executed.
|
||||||
*/
|
*/
|
||||||
ginkgo.It("should execute prestop https hook properly [MinimumKubeletVersion:1.23] [NodeConformance]", func() {
|
ginkgo.It("should execute prestop https hook properly [MinimumKubeletVersion:1.23] [NodeConformance]", func() {
|
||||||
lifecycle := &v1.Lifecycle{
|
lifecycle := &v1.Lifecycle{
|
||||||
@ -239,6 +243,10 @@ var _ = SIGDescribe("Container Lifecycle Hook", func() {
|
|||||||
},
|
},
|
||||||
}
|
}
|
||||||
podWithHook := getPodWithHook("pod-with-prestop-https-hook", imageutils.GetPauseImageName(), lifecycle)
|
podWithHook := getPodWithHook("pod-with-prestop-https-hook", imageutils.GetPauseImageName(), lifecycle)
|
||||||
|
// make sure we spawn the test pod on the same node as the webserver.
|
||||||
|
nodeSelection := e2epod.NodeSelection{}
|
||||||
|
e2epod.SetAffinity(&nodeSelection, targetNode)
|
||||||
|
e2epod.SetNodeSelection(&podWithHook.Spec, nodeSelection)
|
||||||
testPodWithHook(podWithHook)
|
testPodWithHook(podWithHook)
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
Loading…
Reference in New Issue
Block a user