From d342fc0ad94eedb8275aaf9bf6c23f19de262097 Mon Sep 17 00:00:00 2001 From: Feilong Wang Date: Fri, 13 Mar 2020 12:02:32 +1300 Subject: [PATCH] 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 --- doc/source/user/index.rst | 2 +- magnum/drivers/k8s_coreos_v1/templates/kubecluster.yaml | 2 +- magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml | 2 +- magnum/drivers/k8s_fedora_coreos_v1/templates/kubecluster.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/source/user/index.rst b/doc/source/user/index.rst index 4924e5240e..5672508439 100644 --- a/doc/source/user/index.rst +++ b/doc/source/user/index.rst @@ -2528,7 +2528,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. diff --git a/magnum/drivers/k8s_coreos_v1/templates/kubecluster.yaml b/magnum/drivers/k8s_coreos_v1/templates/kubecluster.yaml index 2e98ee1af5..7a1f9dbfce 100644 --- a/magnum/drivers/k8s_coreos_v1/templates/kubecluster.yaml +++ b/magnum/drivers/k8s_coreos_v1/templates/kubecluster.yaml @@ -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 diff --git a/magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml b/magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml index 990f60ef51..5c8b283009 100644 --- a/magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml +++ b/magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml @@ -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 diff --git a/magnum/drivers/k8s_fedora_coreos_v1/templates/kubecluster.yaml b/magnum/drivers/k8s_fedora_coreos_v1/templates/kubecluster.yaml index 2aaa797b69..1b71d6fb96 100644 --- a/magnum/drivers/k8s_fedora_coreos_v1/templates/kubecluster.yaml +++ b/magnum/drivers/k8s_fedora_coreos_v1/templates/kubecluster.yaml @@ -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