C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add option to enable usage reports to calico servers (#6030)

Browse source
This commit is contained in:
Florian Ruynat 2020-04-27 09:03:30 +02:00 committed by GitHub
parent 52edd4c9bc
commit 1ee3ff738e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
roles/network_plugin/calico/defaults/main.yml
View file

@ -43,6 +43,9 @@ calico_upgrade_url: "https://github.com/projectcalico/calico-upgrade/releases/do
# Set the agent log level. Can be debug, warning, info or fatal # Set the agent log level. Can be debug, warning, info or fatal
calico_loglevel: info calico_loglevel: info
# Enable or disable usage report to 'usage.projectcalico.org'
calico_usage_reporting: false
# Should calico ignore kernel's RPF check setting, # Should calico ignore kernel's RPF check setting,
# see https://github.com/projectcalico/felix/blob/ab8799eaea66627e5db7717e62fca61fd9c08646/python/calico/felix/config.py#L198 # see https://github.com/projectcalico/felix/blob/ab8799eaea66627e5db7717e62fca61fd9c08646/python/calico/felix/config.py#L198
calico_node_ignorelooserpf: false calico_node_ignorelooserpf: false
@ -84,9 +87,7 @@ typha_replicas: 1
# Set max typha connections # Set max typha connections
typha_max_connections_lower_limit: 300 typha_max_connections_lower_limit: 300
# Generate certifcates for typha<->calico-node communication # Generate certifcates for typha<->calico-node communication
typha_secure: false typha_secure: false
calico_feature_control: {} calico_feature_control: {}

3
roles/network_plugin/calico/templates/calico-node.yml.j2
View file

@ -223,6 +223,9 @@ spec:
# Set Felix logging to "info" # Set Felix logging to "info"
- name: FELIX_LOGSEVERITYSCREEN - name: FELIX_LOGSEVERITYSCREEN
value: "{{ calico_loglevel }}" value: "{{ calico_loglevel }}"
# Enable or disable usage report
- name: FELIX_USAGEREPORTINGENABLED
value: "{{ calico_usage_reporting }}"
# Set MTU for tunnel device used if ipip is enabled # Set MTU for tunnel device used if ipip is enabled
{% if calico_mtu is defined %} {% if calico_mtu is defined %}
- name: FELIX_IPINIPMTU - name: FELIX_IPINIPMTU