Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v1.9 backports 2022-04-26 #19583

Merged
merged 4 commits into from
Apr 27, 2022

Conversation

joestringer
Copy link
Member

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

$ for pr in 19458 19489 19563; do contrib/backporting/set-labels.py $pr done 1.9; done

pchaigno and others added 4 commits April 26, 2022 16:47
[ upstream commit cfec27a ]

[ Backporter's notes: Complete conflict, so I rewrote the patch ]

This commit increases the VM boot timeout while decreasing the overall
timeout :mindblown:

We currently run the vagrant-ci-start.sh script with a 15m timeout and
retry twice if it fails. That takes up to 45m in total if all attempts
fail, as in frequently happening in CI right now. In particular, if the
script simply fails because it's taking on average more than 15m then
it is likely to fail all three times.

This commit instead increases the timeout from 15m to 25m and removes
the retries. The goal is obviously to succeed on the first try :p

Ideally, we would investigate why it is now taking longer to start the
VM. But this issue has been happening for a long time. And because of
the retries, we probably didn't even notice the increase at the
beginning: if it takes on average 15min, it might fail half the time and
the test might still succeed most of the time. That is, the retries
participate to hide the increase.

Signed-off-by: Paul Chaignon <paul@cilium.io>
Signed-off-by: Joe Stringer <joe@cilium.io>
[ upstream commit 6c34c93 ]

Improve error logs thrown by port
validation logic so that user can
take necessary actions.

Signed-off-by: Aditi Ghag <aditi@cilium.io>
Signed-off-by: Joe Stringer <joe@cilium.io>
[ upstream commit 79d53af ]

Local redirect policy requires Kube-proxy replacement, and
the feature flag to be enabled. Rename the section that
outlines these steps so that users are less likely to miss
them.

Suggested-by: Raymond de Jong <raymond.dejong@isovalent.com>
Signed-off-by: Aditi Ghag <aditi@cilium.io>
Signed-off-by: Joe Stringer <joe@cilium.io>
[ upstream commit b3b0502 ]

Due to some CORS policy, the requests being performed from
docs.cilium.io to readthedocs.org were being denied. This was causing
the warning banner to never show up in the documentation. To avoid this
problem a page redirect was configured in readthedocs settings to
redirect docs.cilium.io/version to readthedocs.org/api/v2/version which
will hopefully fix the issue and the API endpoint was set to
docs.cilium.io.

Signed-off-by: André Martins <andre@cilium.io>
Signed-off-by: Joe Stringer <joe@cilium.io>
@joestringer joestringer requested a review from a team as a code owner April 26, 2022 23:51
@joestringer joestringer added backport/1.9 kind/backports This PR provides functionality previously merged into master. labels Apr 26, 2022
@joestringer
Copy link
Member Author

/test-backport-1.9

Copy link
Member

@pchaigno pchaigno left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My changes (are they still my changes though 😸) look good. Thanks!

@joestringer joestringer merged commit 95c491b into cilium:v1.9 Apr 27, 2022
@joestringer joestringer deleted the pr/v1.9-backport-2022-04-26 branch April 27, 2022 18:18
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.

None yet

4 participants