Skip to content

K
k3s
Commit 4db40cbd authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #40971 from kargakis/lack-of-progress-fix

Automatic merge from submit-queue (batch tested with PRs 40971, 41027, 40709, 40903, 39369) test: bump deployment condition timeout @fejta @spxtr ptal Fixes https://github.com/kubernetes/kubernetes/issues/39785
parents 821e1712 e8f1d9ba
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
test/e2e/framework/util.go
View file @ 4db40cbd
...@@ -3447,7 +3447,7 @@ func WaitForObservedDeployment(c clientset.Interface, ns, deploymentName string, ...@@ -3447,7 +3447,7 @@ func WaitForObservedDeployment(c clientset.Interface, ns, deploymentName string,
func WaitForDeploymentWithCondition(c clientset.Interface, ns, deploymentName, reason string, condType extensions.DeploymentConditionType) error { func WaitForDeploymentWithCondition(c clientset.Interface, ns, deploymentName, reason string, condType extensions.DeploymentConditionType) error {
var conditions []extensions.DeploymentCondition var conditions []extensions.DeploymentCondition
pollErr := wait.PollImmediate(time.Second, 1*time.Minute, func() (bool, error) { pollErr := wait.PollImmediate(time.Second, 5*time.Minute, func() (bool, error) {
deployment, err := c.Extensions().Deployments(ns).Get(deploymentName, metav1.GetOptions{}) deployment, err := c.Extensions().Deployments(ns).Get(deploymentName, metav1.GetOptions{})
if err != nil { if err != nil {
return false, err return false, err
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment