Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Jump to bottom

Fix: Accept existing XMRF policies and update them intead of raising errors #1338

Merged
merged 1 commit into from
Aug 22, 2020
Merged

Fix: Accept existing XMRF policies and update them intead of raising errors #1338

merged 1 commit into from
Aug 22, 2020

Conversation

txomon
Copy link
Contributor

@txomon txomon commented Aug 18, 2020 •
edited
Loading

Description

Fixes #966 and k3s-io/k3s#1613

Todos

  • Tests
  • Documentation
  • Release note

Release Note

* Fix certain situations in which flannel would error on rules set by a previous instance of itself

@txomon txomon mentioned this pull request Aug 19, 2020
Closed
@brandond
Copy link

brandond commented Aug 19, 2020 •
edited
Loading

Good stuff, I hope the PR is accepted! Two suggestions:

  • When linking issues across repos, you have to provide the full URL.
  • It looks like gofmt has some suggestions on your code. You'll probably want to get that cleaned up so that CI passes.

@txomon txomon force-pushed the fix-ipsec-policy-exists branch from e71430c to d9b84c1 Compare August 20, 2020 06:20
@txomon
Copy link
Contributor Author

txomon commented Aug 20, 2020

@brandond thank you very much! I completely forgot to run go fmt. I have updated the MR following your suggestions.

@txomon txomon mentioned this pull request Aug 20, 2020
Closed
3 tasks
@txomon
Copy link
Contributor Author

txomon commented Aug 20, 2020

Ok, after having a more in depth look, this solves pod-to-pod communication, however services are still left unattended

rajatchopra
rajatchopra approved these changes Aug 20, 2020
View reviewed changes
Copy link
Contributor

@rajatchopra rajatchopra left a comment

Choose a reason for hiding this comment

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

/lgtm

@txomon txomon force-pushed the fix-ipsec-policy-exists branch from d9b84c1 to e7682f1 Compare August 21, 2020 08:29
@rajatchopra rajatchopra merged commit 95f3aa0 into flannel-io:master Aug 22, 2020
@txomon txomon deleted the fix-ipsec-policy-exists branch August 31, 2020 10:19
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers

@rajatchopra rajatchopra rajatchopra approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

ipsec backend not working
3 participants
@txomon @brandond @rajatchopra