Skip to content

v1.6 backports 2020-08-14 #12888

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 1 commit into from
Sep 9, 2020
Merged

v1.6 backports 2020-08-14 #12888

merged 1 commit into from
Sep 9, 2020

Conversation

tklauser
Copy link
Member

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

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

@tklauser tklauser requested a review from a team as a code owner August 14, 2020 10:38
@tklauser tklauser added backport/1.6 kind/backports This PR provides functionality previously merged into master. labels Aug 14, 2020
@tklauser
Copy link
Member Author

test-me-please

@tklauser
Copy link
Member Author

test-backport-1.6

kaworu
kaworu approved these changes Aug 14, 2020
View reviewed changes
Copy link
Member

@kaworu kaworu left a comment

Choose a reason for hiding this comment

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

merge conflict was trivial

@tklauser
Copy link
Member Author

Failed master tests are due to #12888 (comment), my muscle memory tricked me into using test-me-please instead of test-backport-1.6 trigger phrase 🙈

@tklauser
Copy link
Member Author

test-backport-1.6

2 similar comments
@tklauser
Copy link
Member Author

test-backport-1.6

@tklauser
Copy link
Member Author

test-backport-1.6

@joestringer
Copy link
Member

Just to update the PR here, we're looking at a cert issue with the VM which would require building new dev VM images for v1.6 to resolve. That will require further investigation to unblock subsequent v1.6 releases.

@nebril
Copy link
Member

nebril commented Sep 7, 2020

test-backport-1.6

@nebril
Copy link
Member

nebril commented Sep 7, 2020

restart-ginkgo

@nebril
Copy link
Member

nebril commented Sep 7, 2020

Seems like this change introduced a regression in K8sHealthTest checks cilium-health status between nodes, #13111 passed CI.

@jrajahalme @tklauser
Istio: Update to release 1.5.9
43ead6c 
[ upstream commit 8dca1c8 ]

Signed-off-by: Jarno Rajahalme <jarno@covalent.io>
Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
@tklauser tklauser force-pushed the pr/v1.6-backport-2020-08-14 branch from ccd0744 to 43ead6c Compare September 8, 2020 09:28
@tklauser
Copy link
Member Author

tklauser commented Sep 8, 2020

test-backport-1.6

@tklauser
Copy link
Member Author

tklauser commented Sep 8, 2020

Rebased on top of latest v1.6 to get 2035ba3. Not sure why the Istio bump would cause K8sHealthTest checks cilium-health status between nodes to fail though. Maybe @jrajahalme has an idea?

@tklauser
Copy link
Member Author

tklauser commented Sep 8, 2020 •
edited
Loading

test-backport-1.6

EDIT: failure is now a different one https://jenkins.cilium.io/job/Cilium-PR-Ginkgo-Tests-Validated/19915/ Suite-runtime.RuntimeKVStoreTest Consul KVStore

@pchaigno
Copy link
Member

pchaigno commented Sep 8, 2020

test-backport-1.6

EDIT: failure is now a different one https://jenkins.cilium.io/job/Cilium-PR-Ginkgo-Tests-Validated/19915/ Suite-runtime.RuntimeKVStoreTest Consul KVStore

That's known flake #11895. We could backport #12478 if we really want to fix it in 1.6.

@maintainer-s-little-helper maintainer-s-little-helper bot added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Sep 8, 2020
@aditighag aditighag merged commit d7c4aa5 into v1.6 Sep 9, 2020
@aditighag aditighag deleted the pr/v1.6-backport-2020-08-14 branch September 9, 2020 01:11
@joestringer joestringer mentioned this pull request Sep 30, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kaworu kaworu kaworu approved these changes

Assignees
No one assigned
Labels
kind/backports This PR provides functionality previously merged into master. ready-to-merge This PR has passed all tests and received consensus from code owners to merge.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@tklauser @joestringer @nebril @pchaigno @kaworu @aditighag @jrajahalme