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.6 backports 2020-03-04 #10443

Merged
merged 3 commits into from
Mar 4, 2020
Merged

v1.6 backports 2020-03-04 #10443

merged 3 commits into from
Mar 4, 2020

Conversation

jrajahalme
Copy link
Member

@jrajahalme jrajahalme commented Mar 4, 2020

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 9483 10416 10434; do contrib/backporting/set-labels.py $pr done 1.6; done

This change is Reviewable

raybejjani and others added 3 commits March 4, 2020 00:42
[ upstream commit 37d11f6 ]

We attempted to avoid locking the main cache while updating expired
entries from endpoints. This left a small window where an entry is
removed from the global cache outright but hasn't been re-populated by
endpoints. This would only manifest when a DNS lookup existed in
multiple endpoints but one had evicted the entry.
The new code holds the global cache's lock while clearing and updating
from all endpoint caches, avoiding the race.

Signed-off-by: Ray Bejjani <ray@isovalent.com>
Signed-off-by: Jarno Rajahalme <jarno@covalent.io>
[ upstream commit 8a76414 ]

The broken link was caused by using the 'latest' URL domain and path as
root. \ |SCM_WEB|\/examples/kubernetes/1.10/cilium-pre-flight-with-rm-svc-v2.yaml
Therefore the URL picked up the most recent tags, and post 1.5.12 the
path `/examples/kubernetes/1.X` were removed, so all newly built URLs were broken.

This change makes the URL static to the release path of `1.5.12`. If
there are other options to keep the URL tagged within the `1.5.x` minor
versions; I'm interested in learning about it, but this is a quick fix.

Fixes: #10391

Signed-off-by: Joshua Roppo <joshroppo@gmail.com>
Signed-off-by: Jarno Rajahalme <jarno@covalent.io>
[ upstream commit f1a8fc1 ]

Signed-off-by: Jarno Rajahalme <jarno@covalent.io>
@jrajahalme jrajahalme added kind/backports This PR provides functionality previously merged into master. backport/1.6 release-note/misc This PR makes changes that have no direct user impact. labels Mar 4, 2020
@jrajahalme jrajahalme requested a review from a team as a code owner March 4, 2020 01:20
@jrajahalme
Copy link
Member Author

never-tell-me-the-odds

@joestringer
Copy link
Member

I investigated the failure and am convinced it is not a regression but a flake as described in #10446:
https://jenkins.cilium.io/job/Cilium-PR-Ginkgo-Tests-Validated/17678/

Ignoring failure to override merge.

@joestringer joestringer merged commit 5f741b9 into v1.6 Mar 4, 2020
@joestringer joestringer deleted the pr/v1.6-backport-2020-03-04 branch March 4, 2020 05:28
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. release-note/misc This PR makes changes that have no direct user impact.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants