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.

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

v1.7 backports 2020-05-11 #11459

Merged
merged 2 commits into from
May 12, 2020
Merged

v1.7 backports 2020-05-11 #11459

merged 2 commits into from
May 12, 2020

Conversation

aanm
Copy link
Member

@aanm aanm commented May 11, 2020

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

$ for pr in 11240 11282; do contrib/backporting/set-labels.py $pr done 1.7; done

@maintainer-s-little-helper maintainer-s-little-helper bot added backport/1.7 kind/backports This PR provides functionality previously merged into master. labels May 11, 2020
aanm added 2 commits May 11, 2020 11:55
@aanm
pkg/k8s: add missing support for multi-stack
954ea3e 
[ upstream commit 308b946 ]

As multi-stack also means that pods can contain 2 or more IP addresses
we should also populate the local podIPs also with the ones provided by
kubernetes.

Fixes: 47a87f8 ("pkg/k8s: add support for multi-stack")
Signed-off-by: André Martins <andre@cilium.io>
@aanm
k8s/watchers: do not consider pods with empty podIPs
52e9ac8 
[ upstream commit 988e504 ]

Fixes: 308b946 ("pkg/k8s: add missing support for multi-stack")
Signed-off-by: André Martins <andre@cilium.io>
@aanm
Copy link
Member Author

aanm commented May 11, 2020

never-tell-me-the-odds

@aanm
Copy link
Member Author

aanm commented May 11, 2020

test-upstream-k8s

@aanm aanm marked this pull request as ready for review May 11, 2020 20:17
@aanm aanm requested a review from a team as a code owner May 11, 2020 20:17
@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 May 12, 2020
@gandro gandro merged commit b2ee287 into v1.7 May 12, 2020
@gandro gandro deleted the pr/backport-1.7-aanm branch May 12, 2020 10:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gandro gandro gandro 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.

None yet
2 participants
@aanm @gandro