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

Flush conntrack state for removed/changed UDP Services #22573

Merged
merged 2 commits into from
Apr 20, 2016

Conversation

freehan
Copy link
Contributor

@freehan freehan commented Mar 5, 2016

fixes: #19029

@googlebot
Copy link

Thanks for your pull request. It looks like this may be your first contribution to a Google open source project. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

📝 Please visit https://cla.developers.google.com/ to sign.

Once you've signed, please reply here (e.g. I signed it!) and we'll verify. Thanks.


  • If you've already signed a CLA, it's possible we don't have your GitHub username or you're using a different email address. Check your existing CLA data and verify that your email is set on your git commits.
  • If you signed the CLA as a corporation, please let us know the company's name.

@@ -18,7 +18,8 @@ IMAGE = debian-iptables
TAG = v1

build:
docker build -t gcr.io/google_containers/$(IMAGE):$(TAG) .
#docker build -t gcr.io/google_containers/$(IMAGE):$(TAG) .
Copy link
Contributor Author

Choose a reason for hiding this comment

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

i will revert this once review is done and image pushed

@k8s-github-robot k8s-github-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Mar 5, 2016
@k8s-bot
Copy link

k8s-bot commented Mar 5, 2016

GCE e2e build/test failed for commit 7224fdcd836d22ca91d8bac1cfabd4ae0a85520c.

Please reference the list of currently known flakes when examining this failure. If you request a re-test, you must reference the issue describing the flake.

@freehan freehan added cla: yes and removed cla: no labels Mar 5, 2016
@eparis
Copy link
Contributor

eparis commented Mar 9, 2016

Adding the v1.2 milestone. Starting later today cherrypick-candidate will be removed from any PR that doesn't set the milestone.

@freehan
Copy link
Contributor Author

freehan commented Mar 10, 2016

@googlebot I signed it!

@k8s-bot
Copy link

k8s-bot commented Mar 10, 2016

GCE e2e build/test passed for commit d1d997bdeeddef9fbece03cd65aac3a74f922e79.

@k8s-bot
Copy link

k8s-bot commented Mar 10, 2016

GCE e2e build/test passed for commit 0ac7ff35eccb8980f412227c0452f9cf5cc85fa5.

@k8s-bot
Copy link

k8s-bot commented Mar 10, 2016

GCE e2e build/test passed for commit 0ac7ff35eccb8980f412227c0452f9cf5cc85fa5.

@k8s-bot
Copy link

k8s-bot commented Mar 10, 2016

GCE e2e build/test passed for commit 615bd4ebc3cbf954243763d0a9f708549fbefda5.

@freehan
Copy link
Contributor Author

freehan commented Mar 11, 2016

Ping @thockin

@@ -491,12 +498,18 @@ func (proxier *Proxier) OnEndpointsUpdate(allEndpoints []api.Endpoints) {
// Remove endpoints missing from the update.
for name := range proxier.endpointsMap {
if !activeEndpoints[name] {
// record endpoints of unactive service to stale connections
Copy link
Contributor

Choose a reason for hiding this comment

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

do we handle the case : no endpoints deleted, but a service got deleted ?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Good Catch! Added logic to clean up stale service connections

@k8s-bot
Copy link

k8s-bot commented Mar 12, 2016

GCE e2e build/test failed for commit b6c3285d87a74b1dd83c81f3c37acc9166b3d666.

Please reference the list of currently known flakes when examining this failure. If you request a re-test, you must reference the issue describing the flake.

@k8s-bot
Copy link

k8s-bot commented Apr 19, 2016

GCE e2e build/test passed for commit ad8c677.

@k8s-github-robot
Copy link

@k8s-bot test this [submit-queue is verifying that this PR is safe to merge]

@k8s-bot
Copy link

k8s-bot commented Apr 20, 2016

GCE e2e build/test passed for commit ad8c677.

@k8s-github-robot
Copy link

Automatic merge from submit-queue

@k8s-github-robot k8s-github-robot merged commit 3b2aae8 into kubernetes:master Apr 20, 2016
@zmerlynn zmerlynn added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Apr 20, 2016
@zmerlynn
Copy link
Member

@freehan: Please create a cherrypick PR for this tomorrow if possible, if you want this included in 1.2.3.

@zmerlynn
Copy link
Member

I tried to create a cherrypick for this as well, and it's going to need some work:

+++ Conflicts detected:

UU build/common.sh
UU build/debian-iptables/Dockerfile
UU build/debian-iptables/Makefile
UU pkg/proxy/iptables/proxier.go

@freehan
Copy link
Contributor Author

freehan commented Apr 20, 2016

@zmerlynn Thanks for reminding!

zmerlynn added a commit that referenced this pull request Apr 21, 2016
…3-upstream-release-1.2

Automated cherry pick of #22573
@k8s-cherrypick-bot
Copy link

Commit found in the "release-1.2" branch appears to be this PR. Removing the "cherrypick-candidate" label. If this is an error find help to get your PR picked.

shyamjvs pushed a commit to shyamjvs/kubernetes that referenced this pull request Dec 1, 2016
…k-of-#22573-upstream-release-1.2

Automated cherry pick of kubernetes#22573
shouhong pushed a commit to shouhong/kubernetes that referenced this pull request Feb 14, 2017
…k-of-#22573-upstream-release-1.2

Automated cherry pick of kubernetes#22573
openshift-publish-robot pushed a commit to openshift/kubernetes that referenced this pull request Apr 17, 2019
…tration

Fix case when operator fight with CRD registration on quota.openshift.io

Origin-commit: 938b9768795281709c1f1e2ac6112e8573bd97ab
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. lgtm "Looks good to me", indicates that a PR is ready to be merged. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

iptables kube-proxy could handle UDP backend changes better