From 44fc53e8db420e47693848b083b3014fe234e7e4 Mon Sep 17 00:00:00 2001 From: Dalton Hubble Date: Mon, 23 Dec 2024 09:55:40 -0800 Subject: [PATCH] Change the default Pod CIDR to 10.20.0.0/14 * Change the default Pod CIDR from 10.2.0.0/16 to 10.20.0.0/14 (10.20.0.0 - 10.23.255.255) to support 1024 nodes by default * Most CNI providers divide the Pod CIDR so that each node has a /24 to allocate to local pods (256). The previous `10.2.0.0/16` default only fits 256 /24's so 256 nodes were supported without customizing the pod_cidr --- addons/cilium/variables.tf | 2 +- addons/flannel/variables.tf | 2 +- aws/fedora-coreos/kubernetes/variables.tf | 2 +- aws/flatcar-linux/kubernetes/variables.tf | 2 +- azure/fedora-coreos/kubernetes/variables.tf | 2 +- azure/flatcar-linux/kubernetes/variables.tf | 2 +- bare-metal/fedora-coreos/kubernetes/variables.tf | 2 +- bare-metal/flatcar-linux/kubernetes/variables.tf | 2 +- digital-ocean/fedora-coreos/kubernetes/variables.tf | 2 +- digital-ocean/flatcar-linux/kubernetes/variables.tf | 2 +- docs/fedora-coreos/aws.md | 2 +- docs/fedora-coreos/azure.md | 2 +- docs/fedora-coreos/bare-metal.md | 2 +- docs/fedora-coreos/digitalocean.md | 2 +- docs/fedora-coreos/google-cloud.md | 2 +- docs/flatcar-linux/aws.md | 2 +- docs/flatcar-linux/azure.md | 2 +- docs/flatcar-linux/bare-metal.md | 2 +- docs/flatcar-linux/digitalocean.md | 2 +- docs/flatcar-linux/google-cloud.md | 2 +- google-cloud/fedora-coreos/kubernetes/variables.tf | 2 +- google-cloud/flatcar-linux/kubernetes/variables.tf | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/addons/cilium/variables.tf b/addons/cilium/variables.tf index 6d269fd2..ffd01345 100644 --- a/addons/cilium/variables.tf +++ b/addons/cilium/variables.tf @@ -1,7 +1,7 @@ variable "pod_cidr" { type = string description = "CIDR IP range to assign Kubernetes pods" - default = "10.2.0.0/16" + default = "10.20.0.0/14" } variable "daemonset_tolerations" { diff --git a/addons/flannel/variables.tf b/addons/flannel/variables.tf index 7a6ad2fc..887e3d88 100644 --- a/addons/flannel/variables.tf +++ b/addons/flannel/variables.tf @@ -1,7 +1,7 @@ variable "pod_cidr" { type = string description = "CIDR IP range to assign Kubernetes pods" - default = "10.2.0.0/16" + default = "10.20.0.0/14" } variable "daemonset_tolerations" { diff --git a/aws/fedora-coreos/kubernetes/variables.tf b/aws/fedora-coreos/kubernetes/variables.tf index f54506b5..d205bf8c 100644 --- a/aws/fedora-coreos/kubernetes/variables.tf +++ b/aws/fedora-coreos/kubernetes/variables.tf @@ -152,7 +152,7 @@ variable "host_cidr" { variable "pod_cidr" { type = string description = "CIDR IPv4 range to assign Kubernetes pods" - default = "10.2.0.0/16" + default = "10.20.0.0/14" } variable "service_cidr" { diff --git a/aws/flatcar-linux/kubernetes/variables.tf b/aws/flatcar-linux/kubernetes/variables.tf index 9c267385..9dce6843 100644 --- a/aws/flatcar-linux/kubernetes/variables.tf +++ b/aws/flatcar-linux/kubernetes/variables.tf @@ -152,7 +152,7 @@ variable "host_cidr" { variable "pod_cidr" { type = string description = "CIDR IPv4 range to assign Kubernetes pods" - default = "10.2.0.0/16" + default = "10.20.0.0/14" } variable "service_cidr" { diff --git a/azure/fedora-coreos/kubernetes/variables.tf b/azure/fedora-coreos/kubernetes/variables.tf index decf59b8..52ff4a07 100644 --- a/azure/fedora-coreos/kubernetes/variables.tf +++ b/azure/fedora-coreos/kubernetes/variables.tf @@ -132,7 +132,7 @@ variable "network_cidr" { variable "pod_cidr" { type = string description = "CIDR IPv4 range to assign Kubernetes pods" - default = "10.2.0.0/16" + default = "10.20.0.0/14" } variable "service_cidr" { diff --git a/azure/flatcar-linux/kubernetes/variables.tf b/azure/flatcar-linux/kubernetes/variables.tf index dd8d6b30..6fde9c8d 100644 --- a/azure/flatcar-linux/kubernetes/variables.tf +++ b/azure/flatcar-linux/kubernetes/variables.tf @@ -138,7 +138,7 @@ variable "network_cidr" { variable "pod_cidr" { type = string description = "CIDR IPv4 range to assign Kubernetes pods" - default = "10.2.0.0/16" + default = "10.20.0.0/14" } variable "service_cidr" { diff --git a/bare-metal/fedora-coreos/kubernetes/variables.tf b/bare-metal/fedora-coreos/kubernetes/variables.tf index 335e8ca4..2e2ef362 100644 --- a/bare-metal/fedora-coreos/kubernetes/variables.tf +++ b/bare-metal/fedora-coreos/kubernetes/variables.tf @@ -107,7 +107,7 @@ variable "network_ip_autodetection_method" { variable "pod_cidr" { type = string description = "CIDR IPv4 range to assign Kubernetes pods" - default = "10.2.0.0/16" + default = "10.20.0.0/14" } variable "service_cidr" { diff --git a/bare-metal/flatcar-linux/kubernetes/variables.tf b/bare-metal/flatcar-linux/kubernetes/variables.tf index 7e7a6f55..4fafcb05 100644 --- a/bare-metal/flatcar-linux/kubernetes/variables.tf +++ b/bare-metal/flatcar-linux/kubernetes/variables.tf @@ -106,7 +106,7 @@ variable "network_ip_autodetection_method" { variable "pod_cidr" { type = string description = "CIDR IPv4 range to assign Kubernetes pods" - default = "10.2.0.0/16" + default = "10.20.0.0/14" } variable "service_cidr" { diff --git a/digital-ocean/fedora-coreos/kubernetes/variables.tf b/digital-ocean/fedora-coreos/kubernetes/variables.tf index 32ee2ece..56a1db92 100644 --- a/digital-ocean/fedora-coreos/kubernetes/variables.tf +++ b/digital-ocean/fedora-coreos/kubernetes/variables.tf @@ -74,7 +74,7 @@ variable "networking" { variable "pod_cidr" { type = string description = "CIDR IPv4 range to assign Kubernetes pods" - default = "10.2.0.0/16" + default = "10.20.0.0/14" } variable "service_cidr" { diff --git a/digital-ocean/flatcar-linux/kubernetes/variables.tf b/digital-ocean/flatcar-linux/kubernetes/variables.tf index 81051519..23b1f0c1 100644 --- a/digital-ocean/flatcar-linux/kubernetes/variables.tf +++ b/digital-ocean/flatcar-linux/kubernetes/variables.tf @@ -74,7 +74,7 @@ variable "networking" { variable "pod_cidr" { type = string description = "CIDR IPv4 range to assign Kubernetes pods" - default = "10.2.0.0/16" + default = "10.20.0.0/14" } variable "service_cidr" { diff --git a/docs/fedora-coreos/aws.md b/docs/fedora-coreos/aws.md index c2847118..8c5c15b8 100644 --- a/docs/fedora-coreos/aws.md +++ b/docs/fedora-coreos/aws.md @@ -227,7 +227,7 @@ Reference the DNS zone id with `aws_route53_zone.zone-for-clusters.zone_id`. | networking | Choice of networking provider | "cilium" | "calico" or "cilium" or "flannel" | | network_mtu | CNI interface MTU (calico only) | 1480 | 8981 | | host_cidr | CIDR IPv4 range to assign to EC2 instances | "10.0.0.0/16" | "10.1.0.0/16" | -| pod_cidr | CIDR IPv4 range to assign to Kubernetes pods | "10.2.0.0/16" | "10.22.0.0/16" | +| pod_cidr | CIDR IPv4 range to assign to Kubernetes pods | "10.20.0.0/14" | "10.22.0.0/16" | | service_cidr | CIDR IPv4 range to assign to Kubernetes services | "10.3.0.0/16" | "10.3.0.0/24" | | worker_node_labels | List of initial worker node labels | [] | ["worker-pool=default"] | diff --git a/docs/fedora-coreos/azure.md b/docs/fedora-coreos/azure.md index 737d9011..7d1f6ccd 100644 --- a/docs/fedora-coreos/azure.md +++ b/docs/fedora-coreos/azure.md @@ -254,7 +254,7 @@ Reference the DNS zone with `azurerm_dns_zone.clusters.name` and its resource gr | worker_snippets | Worker Butane snippets | [] | [example](/advanced/customization/#usage) | | networking | Choice of networking provider | "cilium" | "calico" or "cilium" or "flannel" | | network_cidr | Virtual network CIDR ranges | { ipv4 = ["10.0.0.0/16"], ipv6 = [ULA, ...] } | { ipv4 = ["10.0.0.0/20"] } | -| pod_cidr | CIDR IPv4 range to assign to Kubernetes pods | "10.2.0.0/16" | "10.22.0.0/16" | +| pod_cidr | CIDR IPv4 range to assign to Kubernetes pods | "10.20.0.0/14" | "10.22.0.0/16" | | service_cidr | CIDR IPv4 range to assign to Kubernetes services | "10.3.0.0/16" | "10.3.0.0/24" | | worker_node_labels | List of initial worker node labels | [] | ["worker-pool=default"] | diff --git a/docs/fedora-coreos/bare-metal.md b/docs/fedora-coreos/bare-metal.md index 8fd207d6..fc4c1c6a 100644 --- a/docs/fedora-coreos/bare-metal.md +++ b/docs/fedora-coreos/bare-metal.md @@ -369,7 +369,7 @@ Check the [variables.tf](https://github.com/poseidon/typhoon/blob/master/bare-me | network_mtu | CNI interface MTU (calico-only) | 1480 | - | | snippets | Map from machine names to lists of Butane snippets | {} | [examples](/advanced/customization/) | | network_ip_autodetection_method | Method to detect host IPv4 address (calico-only) | "first-found" | "can-reach=10.0.0.1" | -| pod_cidr | CIDR IPv4 range to assign to Kubernetes pods | "10.2.0.0/16" | "10.22.0.0/16" | +| pod_cidr | CIDR IPv4 range to assign to Kubernetes pods | "10.20.0.0/14" | "10.22.0.0/16" | | service_cidr | CIDR IPv4 range to assign to Kubernetes services | "10.3.0.0/16" | "10.3.0.0/24" | | kernel_args | Additional kernel args to provide at PXE boot | [] | ["kvm-intel.nested=1"] | | worker_node_labels | Map from worker name to list of initial node labels | {} | {"node2" = ["role=special"]} | diff --git a/docs/fedora-coreos/digitalocean.md b/docs/fedora-coreos/digitalocean.md index 2dee5499..f3563029 100644 --- a/docs/fedora-coreos/digitalocean.md +++ b/docs/fedora-coreos/digitalocean.md @@ -242,7 +242,7 @@ Digital Ocean requires the SSH public key be uploaded to your account, so you ma | controller_snippets | Controller Butane snippets | [] | [example](/advanced/customization/) | | worker_snippets | Worker Butane snippets | [] | [example](/advanced/customization/) | | networking | Choice of networking provider | "cilium" | "calico" or "cilium" or "flannel" | -| pod_cidr | CIDR IPv4 range to assign to Kubernetes pods | "10.2.0.0/16" | "10.22.0.0/16" | +| pod_cidr | CIDR IPv4 range to assign to Kubernetes pods | "10.20.0.0/14" | "10.22.0.0/16" | | service_cidr | CIDR IPv4 range to assign to Kubernetes services | "10.3.0.0/16" | "10.3.0.0/24" | Check the list of valid [droplet types](https://developers.digitalocean.com/documentation/changelog/api-v2/new-size-slugs-for-droplet-plan-changes/) or use `doctl compute size list`. diff --git a/docs/fedora-coreos/google-cloud.md b/docs/fedora-coreos/google-cloud.md index c3d06bf7..d5e57ba6 100644 --- a/docs/fedora-coreos/google-cloud.md +++ b/docs/fedora-coreos/google-cloud.md @@ -225,7 +225,7 @@ resource "google_dns_managed_zone" "zone-for-clusters" { | controller_snippets | Controller Butane snippets | [] | [examples](/advanced/customization/) | | worker_snippets | Worker Butane snippets | [] | [examples](/advanced/customization/) | | networking | Choice of networking provider | "cilium" | "calico" or "cilium" or "flannel" | -| pod_cidr | CIDR IPv4 range to assign to Kubernetes pods | "10.2.0.0/16" | "10.22.0.0/16" | +| pod_cidr | CIDR IPv4 range to assign to Kubernetes pods | "10.20.0.0/14" | "10.22.0.0/16" | | service_cidr | CIDR IPv4 range to assign to Kubernetes services | "10.3.0.0/16" | "10.3.0.0/24" | | worker_node_labels | List of initial worker node labels | [] | ["worker-pool=default"] | diff --git a/docs/flatcar-linux/aws.md b/docs/flatcar-linux/aws.md index 8407d3dd..e4822796 100644 --- a/docs/flatcar-linux/aws.md +++ b/docs/flatcar-linux/aws.md @@ -225,7 +225,7 @@ Reference the DNS zone id with `aws_route53_zone.zone-for-clusters.zone_id`. | networking | Choice of networking provider | "cilium" | "calico" or "cilium" or "flannel" | | network_mtu | CNI interface MTU (calico only) | 1480 | 8981 | | host_cidr | CIDR IPv4 range to assign to EC2 instances | "10.0.0.0/16" | "10.1.0.0/16" | -| pod_cidr | CIDR IPv4 range to assign to Kubernetes pods | "10.2.0.0/16" | "10.22.0.0/16" | +| pod_cidr | CIDR IPv4 range to assign to Kubernetes pods | "10.20.0.0/14" | "10.22.0.0/16" | | service_cidr | CIDR IPv4 range to assign to Kubernetes services | "10.3.0.0/16" | "10.3.0.0/24" | | worker_node_labels | List of initial worker node labels | [] | ["worker-pool=default"] | diff --git a/docs/flatcar-linux/azure.md b/docs/flatcar-linux/azure.md index 72f534e1..662f50ff 100644 --- a/docs/flatcar-linux/azure.md +++ b/docs/flatcar-linux/azure.md @@ -242,7 +242,7 @@ Reference the DNS zone with `azurerm_dns_zone.clusters.name` and its resource gr | worker_snippets | Worker Container Linux Config snippets | [] | [example](/advanced/customization/#usage) | | networking | Choice of networking provider | "cilium" | "calico" or "cilium" or "flannel" | | network_cidr | Virtual network CIDR ranges | { ipv4 = ["10.0.0.0/16"], ipv6 = [ULA, ...] } | { ipv4 = ["10.0.0.0/20"] } | -| pod_cidr | CIDR IPv4 range to assign to Kubernetes pods | "10.2.0.0/16" | "10.22.0.0/16" | +| pod_cidr | CIDR IPv4 range to assign to Kubernetes pods | "10.20.0.0/14" | "10.22.0.0/16" | | service_cidr | CIDR IPv4 range to assign to Kubernetes services | "10.3.0.0/16" | "10.3.0.0/24" | | worker_node_labels | List of initial worker node labels | [] | ["worker-pool=default"] | diff --git a/docs/flatcar-linux/bare-metal.md b/docs/flatcar-linux/bare-metal.md index a3674e9a..5d8cf7a4 100644 --- a/docs/flatcar-linux/bare-metal.md +++ b/docs/flatcar-linux/bare-metal.md @@ -380,7 +380,7 @@ Check the [variables.tf](https://github.com/poseidon/typhoon/blob/master/bare-me | network_mtu | CNI interface MTU (calico-only) | 1480 | - | | snippets | Map from machine names to lists of Container Linux Config snippets | {} | [examples](/advanced/customization/) | | network_ip_autodetection_method | Method to detect host IPv4 address (calico-only) | "first-found" | "can-reach=10.0.0.1" | -| pod_cidr | CIDR IPv4 range to assign to Kubernetes pods | "10.2.0.0/16" | "10.22.0.0/16" | +| pod_cidr | CIDR IPv4 range to assign to Kubernetes pods | "10.20.0.0/14" | "10.22.0.0/16" | | service_cidr | CIDR IPv4 range to assign to Kubernetes services | "10.3.0.0/16" | "10.3.0.0/24" | | kernel_args | Additional kernel args to provide at PXE boot | [] | ["kvm-intel.nested=1"] | | worker_node_labels | Map from worker name to list of initial node labels | {} | {"node2" = ["role=special"]} | diff --git a/docs/flatcar-linux/digitalocean.md b/docs/flatcar-linux/digitalocean.md index 08b59810..3430e774 100644 --- a/docs/flatcar-linux/digitalocean.md +++ b/docs/flatcar-linux/digitalocean.md @@ -242,7 +242,7 @@ Digital Ocean requires the SSH public key be uploaded to your account, so you ma | controller_snippets | Controller Container Linux Config snippets | [] | [example](/advanced/customization/) | | worker_snippets | Worker Container Linux Config snippets | [] | [example](/advanced/customization/) | | networking | Choice of networking provider | "cilium" | "calico" or "cilium" or "flannel" | -| pod_cidr | CIDR IPv4 range to assign to Kubernetes pods | "10.2.0.0/16" | "10.22.0.0/16" | +| pod_cidr | CIDR IPv4 range to assign to Kubernetes pods | "10.20.0.0/14" | "10.22.0.0/16" | | service_cidr | CIDR IPv4 range to assign to Kubernetes services | "10.3.0.0/16" | "10.3.0.0/24" | Check the list of valid [droplet types](https://developers.digitalocean.com/documentation/changelog/api-v2/new-size-slugs-for-droplet-plan-changes/) or use `doctl compute size list`. diff --git a/docs/flatcar-linux/google-cloud.md b/docs/flatcar-linux/google-cloud.md index 01267107..18f2f839 100644 --- a/docs/flatcar-linux/google-cloud.md +++ b/docs/flatcar-linux/google-cloud.md @@ -223,7 +223,7 @@ resource "google_dns_managed_zone" "zone-for-clusters" { | controller_snippets | Controller Container Linux Config snippets | [] | [example](/advanced/customization/) | | worker_snippets | Worker Container Linux Config snippets | [] | [example](/advanced/customization/) | | networking | Choice of networking provider | "cilium" | "calico" or "cilium" or "flannel" | -| pod_cidr | CIDR IPv4 range to assign to Kubernetes pods | "10.2.0.0/16" | "10.22.0.0/16" | +| pod_cidr | CIDR IPv4 range to assign to Kubernetes pods | "10.20.0.0/14" | "10.22.0.0/16" | | service_cidr | CIDR IPv4 range to assign to Kubernetes services | "10.3.0.0/16" | "10.3.0.0/24" | | worker_node_labels | List of initial worker node labels | [] | ["worker-pool=default"] | diff --git a/google-cloud/fedora-coreos/kubernetes/variables.tf b/google-cloud/fedora-coreos/kubernetes/variables.tf index 84d63179..00f11f2d 100644 --- a/google-cloud/fedora-coreos/kubernetes/variables.tf +++ b/google-cloud/fedora-coreos/kubernetes/variables.tf @@ -123,7 +123,7 @@ variable "networking" { variable "pod_cidr" { type = string description = "CIDR IPv4 range to assign Kubernetes pods" - default = "10.2.0.0/16" + default = "10.20.0.0/14" } variable "service_cidr" { diff --git a/google-cloud/flatcar-linux/kubernetes/variables.tf b/google-cloud/flatcar-linux/kubernetes/variables.tf index fd2f77b8..a63bf51d 100644 --- a/google-cloud/flatcar-linux/kubernetes/variables.tf +++ b/google-cloud/flatcar-linux/kubernetes/variables.tf @@ -123,7 +123,7 @@ variable "networking" { variable "pod_cidr" { type = string description = "CIDR IPv4 range to assign Kubernetes pods" - default = "10.2.0.0/16" + default = "10.20.0.0/14" } variable "service_cidr" {