openstack
/
magnum
Code Issues Proposed changes

Merge "Update default calico_ipv4pool"

This commit is contained in:
Zuul 2020-03-17 22:57:39 +00:00 committed by Gerrit Code Review
parent b146c28820 d342fc0ad9
commit 69f5892a4f
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

@ -2579,7 +2579,7 @@ optional labels can be added:
_`calico_ipv4pool`
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`
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:
type: string
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:
type: string

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

@ -566,7 +566,7 @@ parameters:
calico_ipv4pool:
type: string
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:
type: string

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

@ -566,7 +566,7 @@ parameters:
calico_ipv4pool:
type: string
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:
type: string