-
Notifications
You must be signed in to change notification settings - Fork 802
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #633 from squeed/remove-flannel
plugins: remove flannel
- Loading branch information
Showing
11 changed files
with
75 additions
and
1,304 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
87 changes: 42 additions & 45 deletions
87
plugins/main/windows/win-bridge/sample-v1.conf
100755 → 100644
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,45 +1,42 @@ | ||
| { | ||
| "name":"cbr0", | ||
| "type":"flannel", | ||
| "delegate":{ | ||
| "type":"win-bridge", | ||
| "dns":{ | ||
| "nameservers":[ | ||
| "11.0.0.10" | ||
| ], | ||
| "search":[ | ||
| "svc.cluster.local" | ||
| ] | ||
| }, | ||
| "policies":[ | ||
| { | ||
| "name":"EndpointPolicy", | ||
| "value":{ | ||
| "Type":"OutBoundNAT", | ||
| "ExceptionList":[ | ||
| "192.168.0.0/16", | ||
| "11.0.0.0/8", | ||
| "10.137.196.0/23" | ||
| ] | ||
| } | ||
| }, | ||
| { | ||
| "name":"EndpointPolicy", | ||
| "value":{ | ||
| "Type":"ROUTE", | ||
| "DestinationPrefix":"11.0.0.0/8", | ||
| "NeedEncap":true | ||
| } | ||
| }, | ||
| { | ||
| "name":"EndpointPolicy", | ||
| "value":{ | ||
| "Type":"ROUTE", | ||
| "DestinationPrefix":"10.137.198.27/32", | ||
| "NeedEncap":true | ||
| } | ||
| } | ||
| ], | ||
| "loopbackDSR": true | ||
| } | ||
| } | ||
| { | ||
| "name": "cbr0", | ||
| "type": "win-bridge", | ||
| "dns": { | ||
| "nameservers": [ | ||
| "11.0.0.10" | ||
| ], | ||
| "search": [ | ||
| "svc.cluster.local" | ||
| ] | ||
| }, | ||
| "policies": [ | ||
| { | ||
| "name": "EndpointPolicy", | ||
| "value": { | ||
| "Type": "OutBoundNAT", | ||
| "ExceptionList": [ | ||
| "192.168.0.0/16", | ||
| "11.0.0.0/8", | ||
| "10.137.196.0/23" | ||
| ] | ||
| } | ||
| }, | ||
| { | ||
| "name": "EndpointPolicy", | ||
| "value": { | ||
| "Type": "ROUTE", | ||
| "DestinationPrefix": "11.0.0.0/8", | ||
| "NeedEncap": true | ||
| } | ||
| }, | ||
| { | ||
| "name": "EndpointPolicy", | ||
| "value": { | ||
| "Type": "ROUTE", | ||
| "DestinationPrefix": "10.137.198.27/32", | ||
| "NeedEncap": true | ||
| } | ||
| } | ||
| ], | ||
| "loopbackDSR": true | ||
| } |
69 changes: 33 additions & 36 deletions
69
plugins/main/windows/win-overlay/sample.conf
100755 → 100644
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,36 +1,33 @@ | ||
| { | ||
| "cniVersion":"0.2.0", | ||
| "name":"vxlan0", | ||
| "type":"flannel", | ||
| "delegate":{ | ||
| "type":"win-overlay", | ||
| "dns":{ | ||
| "nameservers":[ | ||
| "11.0.0.10" | ||
| ], | ||
| "search":[ | ||
| "svc.cluster.local" | ||
| ] | ||
| }, | ||
| "policies":[ | ||
| { | ||
| "name":"EndpointPolicy", | ||
| "value":{ | ||
| "Type":"OutBoundNAT", | ||
| "ExceptionList":[ | ||
| "192.168.0.0/16", | ||
| "11.0.0.0/8" | ||
| ] | ||
| } | ||
| }, | ||
| { | ||
| "name":"EndpointPolicy", | ||
| "value":{ | ||
| "Type":"ROUTE", | ||
| "DestinationPrefix":"11.0.0.0/8", | ||
| "NeedEncap":true | ||
| } | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| { | ||
| "cniVersion": "0.2.0", | ||
| "name": "vxlan0", | ||
| "type": "win-overlay", | ||
| "dns": { | ||
| "nameservers": [ | ||
| "11.0.0.10" | ||
| ], | ||
| "search": [ | ||
| "svc.cluster.local" | ||
| ] | ||
| }, | ||
| "policies": [ | ||
| { | ||
| "name": "EndpointPolicy", | ||
| "value": { | ||
| "Type": "OutBoundNAT", | ||
| "ExceptionList": [ | ||
| "192.168.0.0/16", | ||
| "11.0.0.0/8" | ||
| ] | ||
| } | ||
| }, | ||
| { | ||
| "name": "EndpointPolicy", | ||
| "value": { | ||
| "Type": "ROUTE", | ||
| "DestinationPrefix": "11.0.0.0/8", | ||
| "NeedEncap": true | ||
| } | ||
| } | ||
| ] | ||
| } |
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.