Browse Source

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

pull/5241/head
Sergey 5 years ago
committed by Kubernetes Prow Robot
parent
commit
81d57fe658
3 changed files with 5 additions and 4 deletions
  1. 3
      roles/kubernetes-apps/policy_controller/calico/defaults/main.yml
  2. 3
      roles/kubespray-defaults/defaults/main.yaml
  3. 3
      roles/network_plugin/calico/defaults/main.yml

3
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"

3
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

3
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

Loading…
Cancel
Save