Skip to content

Conversation

vadorovsky
Copy link
Member

@vadorovsky vadorovsky commented Mar 6, 2020

NOTE: commit 2449dfb was not needed, there is no such test in 1.6

Not backported as these depend on other changes not backported to v1.6:

Once this PR is merged, you can update the PR labels via:

$ for pr in 10481; do contrib/backporting/set-labels.py $pr done 1.6; done

This change is Reviewable

brb added 2 commits March 6, 2020 17:02
[ upstream commit eee8032 ]

They were removed in 7b6d34d ("CI: Switch CI FQDN tests to use
internet domains").

Signed-off-by: Martynas Pumputis <m@lambda.lt>
Signed-off-by: Michal Rostecki <mrostecki@opensuse.org>
[ upstream commit 6abebd0 ]

Previously, WaitforPods() could prematurely return when kub.GetPods()
returned no pods (e.g. WaitforPods() had been immediately called after
sending a create pods request).

To avoid this, we should wait (by returning false) when the pod list
is empty instead of setting the minRequired.

This makes the function to fail when a user intentionally set
minRequired to 0 in WaitforNPodsRunning(), but I don't see any sane use
case where setting minRequired to 0 would make sense.

Signed-off-by: Martynas Pumputis <m@lambda.lt>
Signed-off-by: Michal Rostecki <mrostecki@opensuse.org>
@vadorovsky vadorovsky requested a review from a team as a code owner March 6, 2020 16:21
@maintainer-s-little-helper maintainer-s-little-helper bot added backport/1.6 kind/backports This PR provides functionality previously merged into master. labels Mar 6, 2020
@vadorovsky
Copy link
Member Author

never-tell-me-the-odds

@joestringer joestringer merged commit 215b0a4 into v1.6 Mar 6, 2020
@joestringer joestringer deleted the pr/v1.6-backport-2020-03-06 branch March 6, 2020 20:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/backports This PR provides functionality previously merged into master.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants