github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-06 18:54:06 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #40900 from janetkuo/deployment-e2e-pod-running

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 40345, 38183, 40236, 40861, 40900)

Remove checks for pods responding in deployment e2e tests

Fixes #39879

Remove it because it caused deployment e2e tests sometimes timed out waiting for pods responding, and pods responding isn't related to deployment controller and is not a prerequisite of deployment e2e tests.

@kargakis
This commit is contained in:
Kubernetes Submit Queue 2017-02-07 11:33:46 -08:00 committed by GitHub
commit d82e51edc5
2 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
test/e2e/deployment.go
View File

@ -279,7 +279,7 @@ func testRollingUpdateDeployment(f *framework.Framework) {
} }
rsName := "test-rolling-update-controller" rsName := "test-rolling-update-controller"
replicas := int32(3) replicas := int32(1)
rsRevision := "3546343826724305832" rsRevision := "3546343826724305832"
annotations := make(map[string]string) annotations := make(map[string]string)
annotations[deploymentutil.RevisionAnnotation] = rsRevision annotations[deploymentutil.RevisionAnnotation] = rsRevision
@ -289,7 +289,7 @@ func testRollingUpdateDeployment(f *framework.Framework) {
_, err := c.Extensions().ReplicaSets(ns).Create(rs) _, err := c.Extensions().ReplicaSets(ns).Create(rs)
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
// Verify that the required pods have come up. // Verify that the required pods have come up.
err = framework.VerifyPods(c, ns, "sample-pod", false, 3) err = framework.VerifyPodsRunning(c, ns, "sample-pod", false, replicas)
if err != nil { if err != nil {
framework.Logf("error in waiting for pods to come up: %s", err) framework.Logf("error in waiting for pods to come up: %s", err)
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
@ -372,7 +372,7 @@ func testDeploymentCleanUpPolicy(f *framework.Framework) {
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
// Verify that the required pods have come up. // Verify that the required pods have come up.
err = framework.VerifyPods(c, ns, "cleanup-pod", false, 1) err = framework.VerifyPodsRunning(c, ns, "cleanup-pod", false, 1)
if err != nil { if err != nil {
framework.Logf("error in waiting for pods to come up: %s", err) framework.Logf("error in waiting for pods to come up: %s", err)
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
@ -441,11 +441,11 @@ func testRolloverDeployment(f *framework.Framework) {
} }
rsName := "test-rollover-controller" rsName := "test-rollover-controller"
rsReplicas := int32(4) rsReplicas := int32(3)
_, err := c.Extensions().ReplicaSets(ns).Create(newRS(rsName, rsReplicas, rsPodLabels, nginxImageName, nginxImage)) _, err := c.Extensions().ReplicaSets(ns).Create(newRS(rsName, rsReplicas, rsPodLabels, nginxImageName, nginxImage))
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
// Verify that the required pods have come up. // Verify that the required pods have come up.
err = framework.VerifyPods(c, ns, podName, false, rsReplicas) err = framework.VerifyPodsRunning(c, ns, podName, false, rsReplicas)
if err != nil { if err != nil {
framework.Logf("error in waiting for pods to come up: %s", err) framework.Logf("error in waiting for pods to come up: %s", err)
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
@ -458,7 +458,7 @@ func testRolloverDeployment(f *framework.Framework) {
// Create a deployment to delete nginx pods and instead bring up redis-slave pods. // Create a deployment to delete nginx pods and instead bring up redis-slave pods.
// We use a nonexistent image here, so that we make sure it won't finish // We use a nonexistent image here, so that we make sure it won't finish
deploymentName, deploymentImageName := "test-rollover-deployment", "redis-slave" deploymentName, deploymentImageName := "test-rollover-deployment", "redis-slave"
deploymentReplicas := int32(4) deploymentReplicas := int32(3)
deploymentImage := "gcr.io/google_samples/gb-redisslave:nonexistent" deploymentImage := "gcr.io/google_samples/gb-redisslave:nonexistent"
deploymentStrategyType := extensions.RollingUpdateDeploymentStrategyType deploymentStrategyType := extensions.RollingUpdateDeploymentStrategyType
framework.Logf("Creating deployment %q", deploymentName) framework.Logf("Creating deployment %q", deploymentName)
@ -855,7 +855,7 @@ func testDeploymentLabelAdopted(f *framework.Framework) {
_, err := c.Extensions().ReplicaSets(ns).Create(newRS(rsName, replicas, podLabels, podName, image)) _, err := c.Extensions().ReplicaSets(ns).Create(newRS(rsName, replicas, podLabels, podName, image))
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
// Verify that the required pods have come up. // Verify that the required pods have come up.
err = framework.VerifyPods(c, ns, podName, false, 3) err = framework.VerifyPodsRunning(c, ns, podName, false, 3)
if err != nil { if err != nil {
framework.Logf("error in waiting for pods to come up: %s", err) framework.Logf("error in waiting for pods to come up: %s", err)
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
@ -969,7 +969,7 @@ func testScaledRolloutDeployment(f *framework.Framework) {
// Verify that the required pods have come up. // Verify that the required pods have come up.
By("Waiting for all required pods to come up") By("Waiting for all required pods to come up")
err = framework.VerifyPods(f.ClientSet, ns, nginxImageName, false, *(deployment.Spec.Replicas)) err = framework.VerifyPodsRunning(f.ClientSet, ns, nginxImageName, false, *(deployment.Spec.Replicas))
if err != nil { if err != nil {
framework.Logf("error in waiting for pods to come up: %s", err) framework.Logf("error in waiting for pods to come up: %s", err)
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())

10
test/e2e/framework/util.go
View File

@ -1700,6 +1700,14 @@ func podsRunning(c clientset.Interface, pods *v1.PodList) []error {
} }
func VerifyPods(c clientset.Interface, ns, name string, wantName bool, replicas int32) error { func VerifyPods(c clientset.Interface, ns, name string, wantName bool, replicas int32) error {
return podRunningMaybeResponding(c, ns, name, wantName, replicas, true)
}
func VerifyPodsRunning(c clientset.Interface, ns, name string, wantName bool, replicas int32) error {
return podRunningMaybeResponding(c, ns, name, wantName, replicas, false)
}
func podRunningMaybeResponding(c clientset.Interface, ns, name string, wantName bool, replicas int32, checkResponding bool) error {
pods, err := PodsCreated(c, ns, name, replicas) pods, err := PodsCreated(c, ns, name, replicas)
if err != nil { if err != nil {
return err return err
@ -1708,10 +1716,12 @@ func VerifyPods(c clientset.Interface, ns, name string, wantName bool, replicas
if len(e) > 0 { if len(e) > 0 {
return fmt.Errorf("failed to wait for pods running: %v", e) return fmt.Errorf("failed to wait for pods running: %v", e)
} }
if checkResponding {
err = PodsResponding(c, ns, name, wantName, pods) err = PodsResponding(c, ns, name, wantName, pods)
if err != nil { if err != nil {
return fmt.Errorf("failed to wait for pods responding: %v", err) return fmt.Errorf("failed to wait for pods responding: %v", err)
} }
}
return nil return nil
} }