github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #74660 from HotelsDotCom/feature/fix-expansion-tests 

Fix pod creation for node e2e tests
pull/564/head
Kubernetes Prow Robot 2019-02-27 09:18:57 -08:00 committed by GitHub
parent b2e9b2a842 833720669c
commit af1e06eb74
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
test/e2e/common/expansion.go
View File

@ -376,14 +376,12 @@ var _ = framework.KubeDescribe("Variable Expansion", func() {
}
By("creating the pod with failed condition")
pod, err := f.ClientSet.CoreV1().Pods(f.Namespace.Name).Create(pod)
Expect(err).ToNot(HaveOccurred(), "while creating pod")
err = framework.WaitTimeoutForPodRunningInNamespace(f.ClientSet, pod.Name, pod.Namespace, framework.PodStartShortTimeout)
Expect(err).To(HaveOccurred(), "while waiting for pod to be running")
var podClient *framework.PodClient
podClient = f.PodClient()
pod = podClient.Create(pod)
err := framework.WaitTimeoutForPodRunningInNamespace(f.ClientSet, pod.Name, pod.Namespace, framework.PodStartShortTimeout)
Expect(err).To(HaveOccurred(), "while waiting for pod to be running")
By("updating the pod")
podClient.Update(podName, func(pod *v1.Pod) {
@ -470,10 +468,12 @@ var _ = framework.KubeDescribe("Variable Expansion", func() {
}
By("creating the pod")
pod, err := f.ClientSet.CoreV1().Pods(f.Namespace.Name).Create(pod)
var podClient *framework.PodClient
podClient = f.PodClient()
pod = podClient.Create(pod)
By("waiting for pod running")
err = framework.WaitTimeoutForPodRunningInNamespace(f.ClientSet, pod.Name, pod.Namespace, framework.PodStartShortTimeout)
err := framework.WaitTimeoutForPodRunningInNamespace(f.ClientSet, pod.Name, pod.Namespace, framework.PodStartShortTimeout)
Expect(err).NotTo(HaveOccurred(), "while waiting for pod to be running")
By("creating a file in subpath")
@ -491,9 +491,6 @@ var _ = framework.KubeDescribe("Variable Expansion", func() {
}
By("updating the annotation value")
var podClient *framework.PodClient
podClient = f.PodClient()
podClient.Update(podName, func(pod *v1.Pod) {
pod.ObjectMeta.Annotations["mysubpath"] = "mynewpath"
})
@ -609,17 +606,15 @@ var _ = framework.KubeDescribe("Variable Expansion", func() {
// Start pod
By(fmt.Sprintf("Creating pod %s", pod.Name))
pod, err := f.ClientSet.CoreV1().Pods(f.Namespace.Name).Create(pod)
Expect(err).ToNot(HaveOccurred(), "while creating pod")
var podClient *framework.PodClient
podClient = f.PodClient()
pod = podClient.Create(pod)
defer func() {
framework.DeletePodWithWait(f, f.ClientSet, pod)
}()
err = framework.WaitForPodRunningInNamespace(f.ClientSet, pod)
err := framework.WaitForPodRunningInNamespace(f.ClientSet, pod)
Expect(err).ToNot(HaveOccurred(), "while waiting for pod to be running")
var podClient *framework.PodClient
podClient = f.PodClient()
By("updating the pod")
podClient.Update(podName, func(pod *v1.Pod) {
pod.ObjectMeta.Annotations = map[string]string{"mysubpath": "newsubpath"}
@ -645,14 +640,15 @@ var _ = framework.KubeDescribe("Variable Expansion", func() {
func testPodFailSubpath(f *framework.Framework, pod *v1.Pod) {
pod, err := f.ClientSet.CoreV1().Pods(f.Namespace.Name).Create(pod)
Expect(err).ToNot(HaveOccurred(), "while creating pod")
var podClient *framework.PodClient
podClient = f.PodClient()
pod = podClient.Create(pod)
defer func() {
framework.DeletePodWithWait(f, f.ClientSet, pod)
}()
err = framework.WaitTimeoutForPodRunningInNamespace(f.ClientSet, pod.Name, pod.Namespace, framework.PodStartShortTimeout)
err := framework.WaitTimeoutForPodRunningInNamespace(f.ClientSet, pod.Name, pod.Namespace, framework.PodStartShortTimeout)
Expect(err).To(HaveOccurred(), "while waiting for pod to be running")
}