From 81d57fe6580dbae0bd7d8d867dbc0852ab14c11a Mon Sep 17 00:00:00 2001 From: Sergey Date: Thu, 17 Oct 2019 15:58:38 +0300 Subject: [PATCH] set calico_datastore default value in role kubespray-default (#5259) --- .../kubernetes-apps/policy_controller/calico/defaults/main.yml | 3 --- roles/kubespray-defaults/defaults/main.yaml | 3 +++ roles/network_plugin/calico/defaults/main.yml | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/roles/kubernetes-apps/policy_controller/calico/defaults/main.yml b/roles/kubernetes-apps/policy_controller/calico/defaults/main.yml index a872b5be3..93d12c901 100644 --- a/roles/kubernetes-apps/policy_controller/calico/defaults/main.yml +++ b/roles/kubernetes-apps/policy_controller/calico/defaults/main.yml @@ -8,6 +8,3 @@ calico_policy_controller_memory_requests: 64M # SSL calico_cert_dir: "/etc/calico/certs" canal_cert_dir: "/etc/canal/certs" - -# Datastore type -calico_datastore: "etcd" diff --git a/roles/kubespray-defaults/defaults/main.yaml b/roles/kubespray-defaults/defaults/main.yaml index d68196f79..27d2ed7e7 100644 --- a/roles/kubespray-defaults/defaults/main.yaml +++ b/roles/kubespray-defaults/defaults/main.yaml @@ -144,6 +144,9 @@ peer_with_calico_rr: "{{ 'calico-rr' in groups and groups['calico-rr']|length > # Set to false to disable calico-upgrade calico_upgrade_enabled: true +# Choose data store type for calico: "etcd" or "kdd" (kubernetes datastore) +calico_datastore: "etcd" + # Kubernetes internal network for services, unused block of space. kube_service_addresses: 10.233.0.0/18 diff --git a/roles/network_plugin/calico/defaults/main.yml b/roles/network_plugin/calico/defaults/main.yml index d7108a4ad..43f1c1e16 100644 --- a/roles/network_plugin/calico/defaults/main.yml +++ b/roles/network_plugin/calico/defaults/main.yml @@ -67,7 +67,8 @@ kube_etcd_cert_file: node-{{ inventory_hostname }}.pem kube_etcd_key_file: node-{{ inventory_hostname }}-key.pem # Choose data store type for calico: "etcd" or "kdd" (kubernetes datastore) -calico_datastore: "etcd" +# The default value calico_datastore: "etcd" is set in role kubespray-default + # Use typha (only with kdd) typha_enabled: false # Number of typha replicas