openstack
/
magnum
Code Issues Proposed changes

Update default calico_ipv4pool 

The current default Calico IPv4 CIDR 192.168.0.0/16  is too common and 
it has bring us some IP conflicts troubles on production. This patch is
proposing to replace it with a rare CIDR range.

Task: 39052
Story: 2007426

Change-Id: I13aa0c58bf168bc069edf1d5c0187f89011fffdb
This commit is contained in:
Feilong Wang 2020-03-13 12:02:32 +13:00
parent f0f3bfb16d
commit d342fc0ad9
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/source/user/index.rst
View File

@ -2528,7 +2528,7 @@ optional labels can be added:
_`calico_ipv4pool` _`calico_ipv4pool`
IPv4 network in CIDR format which is the IP pool, from which Pod IPs will IPv4 network in CIDR format which is the IP pool, from which Pod IPs will
be chosen. If not specified, the default is 192.168.0.0/16. be chosen. If not specified, the default is 10.100.0.0/16.
_`calico_ipv4pool_ipip` _`calico_ipv4pool_ipip`
IPIP Mode to use for the IPv4 POOL created at start up. IPIP Mode to use for the IPv4 POOL created at start up.

2
magnum/drivers/k8s_coreos_v1/templates/kubecluster.yaml
View File

@ -467,7 +467,7 @@ parameters:
calico_ipv4pool: calico_ipv4pool:
type: string type: string
description: Configure the IP pool from which Pod IPs will be chosen description: Configure the IP pool from which Pod IPs will be chosen
default: "192.168.0.0/16" default: "10.100.0.0/16"
pods_network_cidr: pods_network_cidr:
type: string type: string

2
magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml
View File

@ -566,7 +566,7 @@ parameters:
calico_ipv4pool: calico_ipv4pool:
type: string type: string
description: Configure the IP pool from which Pod IPs will be chosen description: Configure the IP pool from which Pod IPs will be chosen
default: "192.168.0.0/16" default: "10.100.0.0/16"
calico_ipv4pool_ipip: calico_ipv4pool_ipip:
type: string type: string

2
magnum/drivers/k8s_fedora_coreos_v1/templates/kubecluster.yaml
View File

@ -566,7 +566,7 @@ parameters:
calico_ipv4pool: calico_ipv4pool:
type: string type: string
description: Configure the IP pool from which Pod IPs will be chosen description: Configure the IP pool from which Pod IPs will be chosen
default: "192.168.0.0/16" default: "10.100.0.0/16"
calico_ipv4pool_ipip: calico_ipv4pool_ipip:
type: string type: string