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

vxlan: add windows support #922

Closed
wants to merge 2 commits into from
Closed

vxlan: add windows support #922

wants to merge 2 commits into from

Conversation

rakelkar
Copy link
Contributor

Description

VXLAN support for windows (3b from #832) #833
Needs Integration Tests!!

Todos

  • Tests
  • Documentation

@dmitryzykov dmitryzykov mentioned this pull request Jan 20, 2018
Closed
tomdee
tomdee suggested changes Jan 25, 2018
View reviewed changes
backend/vxlan/vxlan_network_windows_test.go Outdated
@@ -0,0 +1,94 @@
// +build windows

// Copyright 2015 CNI authors
Copy link
Contributor

Choose a reason for hiding this comment

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

Wrong authors (and year) 😄

Copy link
Contributor

Choose a reason for hiding this comment

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

Resolved.

@anikundesu
Copy link

@rakelkar
The reason why Travis CI build failed is lack of "EoF" at the last of backend/vxlan/vxlan_network_windows.go and backend/vxlan/vxlan_network_windows_test.go as linux-based text files.
To fix the failure, these two files should be opened on the linux-based system, add one line at the last of the file, and delete the last line. I used vi to do it and successfully executed "make test" on a linux-based system.

Takashi Kanai
Microsoft MVP of Cloud and Datacenter Management

@rakelkar
Copy link
Contributor Author

rakelkar commented Mar 7, 2018

@anikundesu nice find! Could open a PR into the source branch with your fix?

@anikundesu
Copy link

@rakelkar The fix I pointed out has already been commited by @madhanrm at dd0cd9e

alekssaul
alekssaul reviewed Mar 10, 2018
View reviewed changes
backend/vxlan/vxlan_windows.go Outdated
// check if the network exists and has the expected settings?
networkName := cfg.name
createNetwork := true
addressPrefix := config.Network
Copy link

@alekssaul alekssaul Mar 10, 2018 •
edited
Loading

Choose a reason for hiding this comment

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

is this not supposed to be

	addressPrefix := l.Subnet
	networkGatewayAddress := l.Subnet.IP + 1

lease should have the address and gateway information instead of the subnet.config If I understand correctly. Based on my testing config.Network gets the whole clusterCIDR (/8), where as l.Subnet gets the actual network (/24) that's assigned from etcd

Copy link
Contributor

Choose a reason for hiding this comment

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

@alekssaul Yes, you are correct

@pablodav pablodav mentioned this pull request Aug 28, 2018
Closed
2 tasks
thxCode added a commit to thxCode/coreos-flannel that referenced this pull request Sep 3, 2018
@thxCode
Add windows vxlan
df307ac 
    - patch for flannel-io#922
thxCode added a commit to thxCode/coreos-flannel that referenced this pull request Sep 3, 2018
@thxCode
Add windows vxlan
0c331b6 
    - patch for flannel-io#922
thxCode added a commit to thxCode/coreos-flannel that referenced this pull request Sep 3, 2018
@thxCode
Add windows vxlan
7e61ab4 
    - patch for flannel-io#922
thxCode added a commit to thxCode/coreos-flannel that referenced this pull request Sep 3, 2018
@thxCode
Add windows vxlan
1a704c2 
    - patch for flannel-io#922
thxCode added a commit to thxCode/coreos-flannel that referenced this pull request Sep 3, 2018
@thxCode
Add windows vxlan
6db68d8 
    - patch for flannel-io#922
thxCode added a commit to thxCode/coreos-flannel that referenced this pull request Sep 10, 2018
@thxCode
Add windows vxlan
7e68948 
    - patch for flannel-io#922
thxCode added a commit to thxCode/coreos-flannel that referenced this pull request Sep 11, 2018
@thxCode
Add windows vxlan
c8d9843 
    - patch for flannel-io#922
thxCode added a commit to thxCode/coreos-flannel that referenced this pull request Sep 12, 2018
@thxCode
Add windows vxlan
5542784 
    - patch for flannel-io#922
thxCode added a commit to thxCode/coreos-flannel that referenced this pull request Sep 12, 2018
@thxCode
Add windows vxlan
670477d 
    - patch for flannel-io#922
thxCode added a commit to thxCode/coreos-flannel that referenced this pull request Sep 12, 2018
@thxCode
Add windows vxlan
bcfe0e7 
    - patch for flannel-io#922
thxCode added a commit to thxCode/coreos-flannel that referenced this pull request Sep 12, 2018
@thxCode
Add windows vxlan
341b387 
    - patch for flannel-io#922
thxCode added a commit to thxCode/coreos-flannel that referenced this pull request Sep 12, 2018
@thxCode
Add windows vxlan
5e9a4fa 
    - patch for flannel-io#922
@ksubrmnn
Copy link
Contributor

@ksubrmnn

thxCode added a commit to thxCode/coreos-flannel that referenced this pull request Sep 17, 2018
@thxCode
Add windows vxlan
15c5485 
    - patch for flannel-io#922
rakelkar and others added 2 commits September 17, 2018 16:30
@rakelkar @madhanrm
vxlan: add windows support
48a9fb0 
vxlan: fix registerNetwork function signature
@madhanrm
Fix GoFmt
6befc8f 
Update License

Fix Node AddressPrefix to use from Subnet instead of Network
thxCode added a commit to thxCode/coreos-flannel that referenced this pull request Sep 18, 2018
@thxCode
Add windows vxlan
01c136f 
    - patch for flannel-io#922
thxCode added a commit to thxCode/coreos-flannel that referenced this pull request Sep 24, 2018
@thxCode
Add windows vxlan
861886c 
    - patch for flannel-io#922
thxCode added a commit to thxCode/coreos-flannel that referenced this pull request Sep 24, 2018
@thxCode
Add windows vxlan
65fb2a5 
    - patch for flannel-io#922
thxCode added a commit to thxCode/coreos-flannel that referenced this pull request Sep 24, 2018
@thxCode
Add windows vxlan
9e59083 
    - patch for flannel-io#922
thxCode added a commit to thxCode/coreos-flannel that referenced this pull request Sep 24, 2018
@thxCode
Add windows vxlan
5009a50 
    - patch for flannel-io#922
thxCode added a commit to thxCode/coreos-flannel that referenced this pull request Sep 24, 2018
@thxCode
Add windows vxlan
0332d28 
    - patch for flannel-io#922
@thxCode thxCode mentioned this pull request Sep 24, 2018
Merged
1 task
thxCode added a commit to thxCode/coreos-flannel that referenced this pull request Sep 24, 2018
@thxCode
Windows "host-gw" and "vxlan" support
1cfb30c 
    - Add Windows host-gw
        (*) patch for flannel-io#921
    - Add windows vxlan
        (*) patch for flannel-io#922
thxCode added a commit to thxCode/coreos-flannel that referenced this pull request Sep 24, 2018
@thxCode
Windows "host-gw" and "vxlan" support
5fb56d3 
    - Add Windows host-gw
        (*) patch for flannel-io#921
    - Add windows vxlan
        (*) patch for flannel-io#922
thxCode added a commit to thxCode/coreos-flannel that referenced this pull request Sep 24, 2018
@thxCode
Windows "host-gw" and "vxlan" support
2eee498 
    - Add Windows host-gw
        (*) patch for flannel-io#921
    - Add windows vxlan
        (*) patch for flannel-io#922
@tomdee
Copy link
Contributor

tomdee commented Oct 5, 2018

@rakelkar What is the status of this PR? Is it ready for review and merging?

@madhanrm
Copy link
Contributor

madhanrm commented Oct 5, 2018

@tomdee Integration test is pending. Can we follow that up in a separate PR & get this one reviewed and merged?

@ksubrmnn can follow up to fix the review comments.

@madhanrm
Copy link
Contributor

@tomdee, there also seems to be another PR : #1042 which is doing similar to this PR. Can we get this PR merged & then work on top if it. The binaries out of this PR has been tested for over an year now

ksubrmnn pushed a commit to ksubrmnn/flannel that referenced this pull request Oct 29, 2018
@thxCode @ksubrmnn
Windows "host-gw" and "vxlan" support
e2bb4c9 
    - Add Windows host-gw
        (*) patch for flannel-io#921
    - Add windows vxlan
        (*) patch for flannel-io#922
thxCode added a commit to thxCode/coreos-flannel that referenced this pull request Oct 31, 2018
@thxCode
Windows "host-gw" and "vxlan" support
8b9407c 
    - Add Windows host-gw
        (*) patch for flannel-io#921
    - Add windows vxlan
        (*) patch for flannel-io#922
thxCode added a commit to thxCode/coreos-flannel that referenced this pull request Oct 31, 2018
@thxCode
Windows "host-gw" and "vxlan" support
6a0758b 
    - Add Windows host-gw
        (*) patch for flannel-io#921
    - Add windows vxlan
        (*) patch for flannel-io#922
@dineshgovindasamy
Copy link

Lets abandon this PR. We are taking PR#1042 which is merged PR.

Rakesh, can u abandon this PR?

@dineshgovindasamy
Copy link

tagging @rakelkar

@rajatchopra
Copy link
Contributor

Closing this PR in favour of #1042. Please re-open if needed.

@rajatchopra rajatchopra closed this Nov 2, 2018
thxCode added a commit to thxCode/coreos-flannel that referenced this pull request Nov 6, 2018
@thxCode @madhanrm
Windows "host-gw" and "vxlan" support
e6fc2a2 
    - Add Windows host-gw
        (*) patch for flannel-io#921
    - Add windows vxlan
        (*) patch for flannel-io#922

Co-authored-by: rakelkar <[email protected]>
Co-authored-by: madhanrm <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@madhanrm madhanrm madhanrm left review comments

@alekssaul alekssaul alekssaul left review comments

@tomdee tomdee tomdee requested changes

Assignees
No one assigned
Labels
platform/windows
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@rakelkar @anikundesu @ksubrmnn @tomdee @madhanrm @dineshgovindasamy @rajatchopra @alekssaul