set calico_datastore default value in role kubespray-default (#5259)

pull/5241/head
Sergey 2019-10-17 15:58:38 +03:00 committed by Kubernetes Prow Robot
parent 3118437e10
commit 81d57fe658
3 changed files with 5 additions and 4 deletions

View File

@ -8,6 +8,3 @@ calico_policy_controller_memory_requests: 64M
# SSL # SSL
calico_cert_dir: "/etc/calico/certs" calico_cert_dir: "/etc/calico/certs"
canal_cert_dir: "/etc/canal/certs" canal_cert_dir: "/etc/canal/certs"
# Datastore type
calico_datastore: "etcd"

View File

@ -144,6 +144,9 @@ peer_with_calico_rr: "{{ 'calico-rr' in groups and groups['calico-rr']|length >
# Set to false to disable calico-upgrade # Set to false to disable calico-upgrade
calico_upgrade_enabled: true 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. # Kubernetes internal network for services, unused block of space.
kube_service_addresses: 10.233.0.0/18 kube_service_addresses: 10.233.0.0/18

View File

@ -67,7 +67,8 @@ kube_etcd_cert_file: node-{{ inventory_hostname }}.pem
kube_etcd_key_file: node-{{ inventory_hostname }}-key.pem kube_etcd_key_file: node-{{ inventory_hostname }}-key.pem
# Choose data store type for calico: "etcd" or "kdd" (kubernetes datastore) # 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) # Use typha (only with kdd)
typha_enabled: false typha_enabled: false
# Number of typha replicas # Number of typha replicas