Merge pull request #1365 from AtzeDeVries/master

Give more control over IPIP, but with same default behaviour
This commit is contained in:
Brad Beam
2017-07-12 10:17:17 -05:00
committed by GitHub
3 changed files with 4 additions and 4 deletions

View File

@@ -71,6 +71,7 @@ kube_users:
# Can also be set to 'cloud', which lets the cloud provider setup appropriate routing
kube_network_plugin: calico
# Enable kubernetes network policies
enable_network_policy: false