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.7 backports 2020-05-12 #11488

Merged
merged 2 commits into from
May 13, 2020
Merged

v1.7 backports 2020-05-12 #11488

merged 2 commits into from
May 13, 2020

Conversation

qmonnet
Copy link
Member

@qmonnet qmonnet commented May 12, 2020

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

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

@qmonnet qmonnet requested a review from a team as a code owner May 12, 2020 10:18
@qmonnet qmonnet added backport/1.7 kind/backports This PR provides functionality previously merged into master. labels May 12, 2020
@qmonnet qmonnet marked this pull request as draft May 12, 2020 10:22
@qmonnet qmonnet force-pushed the pr/v1.7-backport-2020-05-12 branch from ba667a3 to 7513cb2 Compare May 12, 2020 10:27
@gandro
Copy link
Member

gandro commented May 12, 2020

never-tell-me-the-odds

@qmonnet qmonnet marked this pull request as ready for review May 12, 2020 10:31
@qmonnet qmonnet marked this pull request as draft May 12, 2020 15:07
soumynathan and others added 2 commits May 12, 2020 16:17
[ upstream commit 5f246ba ]

This PR fixes the NOTES.txt file to reflect the correct
action at the upper level, when preflight alone is installed.

Also adds the NOTES.txt file that was missing for hubble-ui
and handles the hubble-ui and hubble-cli text in the upper
level NOTES.txt file.

Fixes: #11245
Signed-off-by: Swaminathan Vasudevan <svasudevan@suse.com>
Signed-off-by: Quentin Monnet <quentin@isovalent.com>
[ upstream commit 69849ee ]

Previously, DeleteEndpoints() invocation might have sent DeleteService
event (handled by pkg/k8s/watcher), if a service didn't have any endpoint
left. This led to a double removal of the service in pkg/service, as
kube-apiserver sends a dedicated Service object removal update, which
is handled by DeleteService() which sends DeleteService event.

This triggered "service not found" warning msg.

To fix this, send UpdateService event instead of DeleteService from
deleteEndpoints(), which would trigger only update in svc backends.
The removal of a service is handled by a separate event anyways.

Signed-off-by: Martynas Pumputis <m@lambda.lt>
Signed-off-by: Quentin Monnet <quentin@isovalent.com>
@qmonnet qmonnet force-pushed the pr/v1.7-backport-2020-05-12 branch from 7513cb2 to 6548f68 Compare May 12, 2020 15:19
@qmonnet
Copy link
Member Author

qmonnet commented May 12, 2020

never-tell-me-the-odds

@qmonnet qmonnet marked this pull request as ready for review May 12, 2020 15:22
@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
@joestringer joestringer merged commit 6d57433 into v1.7 May 13, 2020
@joestringer joestringer deleted the pr/v1.7-backport-2020-05-12 branch May 13, 2020 00:14
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. ready-to-merge This PR has passed all tests and received consensus from code owners to merge.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants