CI: fix kubectl.CiliumPolicyAction() by casting "cilium policy wait" duration to integer #11358
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Helper kubectl.CiliumPolicyAction() runs a call to the CLI command:
cilium policy wait <desiredRevision> <duration>
For the duration, ShortCommandTimeout.Seconds() is used. But this
resolves to a float (10.000000) that fails to be interpreted by the CLI
parser!
Let's cast it to an integer instead, to make sure that
kubectl.CiliumPolicyAction() correctly waits until the desired policy
has been deployed. We also need to reverse the condition on the check
for the "cilium policy wait" success: The wait failed if the return code
is non-zero.
Fixes: 2a583b1 ("CI: Wait for cilium to regenerate when updating k8s network policies")
Fixes: #11325 (hopefully)
Signed-off-by: Quentin Monnet <quentin@isovalent.com>
qmonnet
added
pending-review
kind/bug/CI
|
test-me-please |
tklauser
added
the
ci/flake
nebril
approved these changes
May 6, 2020
|
retest-ginkgo |
|
restart-ginkgo |
maintainer-s-little-helper
bot
added
the
ready-to-merge
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In the e2e framework, helper
kubectl.CiliumPolicyAction()runs a call to the CLI command:For the
duration,ShortCommandTimeout.Seconds()is used. But this resolves to the string representation of a float ("10.000000") that fails to be interpreted by the CLI parser!Let's cast the float to an integer instead, to make sure that
kubectl.CiliumPolicyAction()correctly waits until the desired policy has been deployed. We also need to reverse the condition on the check for thecilium policy waitsuccess: The wait failed if the return code is non-zero.This should (hopefully) fix the flake reported in #11325.