From 64e8d207b14a7bb9fae5a173b14c6b1fb199161a Mon Sep 17 00:00:00 2001 From: Dalton Hubble Date: Tue, 12 Sep 2017 09:16:58 -0700 Subject: [PATCH] Change bare-metal and GCE networking default to calico * Switch networking default from flannel to calico --- bare-metal/container-linux/kubernetes/variables.tf | 2 +- docs/bare-metal.md | 2 +- docs/google-cloud.md | 2 +- google-cloud/container-linux/kubernetes/variables.tf | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bare-metal/container-linux/kubernetes/variables.tf b/bare-metal/container-linux/kubernetes/variables.tf index 63f8034f..26d05c3b 100644 --- a/bare-metal/container-linux/kubernetes/variables.tf +++ b/bare-metal/container-linux/kubernetes/variables.tf @@ -65,7 +65,7 @@ variable "asset_dir" { variable "networking" { description = "Choice of networking provider (flannel or calico)" type = "string" - default = "flannel" + default = "calico" } variable "network_mtu" { diff --git a/docs/bare-metal.md b/docs/bare-metal.md index 58df96b9..e1d5c75d 100644 --- a/docs/bare-metal.md +++ b/docs/bare-metal.md @@ -357,7 +357,7 @@ Learn about [version pinning](concepts.md#versioning), maintenance, and [addons] | install_disk | Disk device where Container Linux should be installed | "/dev/sda" | "/dev/sdb" | | container_linux_oem | Specify alternative OEM image ids for the disk install | "" | "vmware_raw", "xen" | | experimental_self_hosted_etcd | Self-host etcd as pods on Kubernetes (not recommended) | false | true | -| networking | Choice of networking provider | "flannel" | "flannel" or "calico" | +| networking | Choice of networking provider | "calico" | "calico" or "flannel" | | network_mtu | CNI interface MTU (calico-only) | 1480 | - | | pod_cidr | CIDR range to assign to Kubernetes pods | "10.2.0.0/16" | "10.22.0.0/16" | | service_cidr | CIDR range to assgin to Kubernetes services | "10.3.0.0/16" | "10.3.0.0/24" | diff --git a/docs/google-cloud.md b/docs/google-cloud.md index fa088585..adcda03b 100644 --- a/docs/google-cloud.md +++ b/docs/google-cloud.md @@ -230,7 +230,7 @@ resource "google_dns_managed_zone" "zone-for-clusters" { | controller_count | Number of controllers (i.e. masters) | 1 | 1 | | worker_count | Number of workers | 1 | 3 | | worker_preemptible | If enabled, Compute Engine will terminate controllers randomly within 24 hours | false | true | -| networking | Choice of networking provider | "flannel" | "flannel" or "calico" | +| networking | Choice of networking provider | "calico" | "calico" or "flannel" | | pod_cidr | CIDR range to assign to Kubernetes pods | "10.2.0.0/16" | "10.22.0.0/16" | | service_cidr | CIDR range to assgin to Kubernetes services | "10.3.0.0/16" | "10.3.0.0/24" | diff --git a/google-cloud/container-linux/kubernetes/variables.tf b/google-cloud/container-linux/kubernetes/variables.tf index d36ea66e..54ed9dc5 100644 --- a/google-cloud/container-linux/kubernetes/variables.tf +++ b/google-cloud/container-linux/kubernetes/variables.tf @@ -68,7 +68,7 @@ variable "asset_dir" { variable "networking" { description = "Choice of networking provider (flannel or calico)" type = "string" - default = "flannel" + default = "calico" } variable "pod_cidr" {