Merge "[Calico] Using booleans where expected in values (not strings)"

This commit is contained in:
Zuul 2019-04-05 06:35:04 +00:00 committed by Gerrit Code Review
commit 63b61b86eb

View File

@ -195,9 +195,9 @@ networking:
# that ipPool
ippool:
ipip:
enabled: "true"
nat_outgoing: "true"
disabled: "false"
enabled: true
nat_outgoing: true
disabled: false
bgp:
# our asnumber for bgp peering
@ -471,7 +471,7 @@ conf:
# Since we're running in the host namespace and might not have KubeDNS
# access, configure the container's /etc/hosts to resolve
# kubernetes.default to the correct service clusterIP.
CONFIGURE_ETC_HOSTS: "true"
CONFIGURE_ETC_HOSTS: true
node:
# for specific details see
@ -492,7 +492,7 @@ conf:
# Location of the client certificate for etcd.
ETCD_CERT_FILE: ""
# Disable file logging so `kubectl logs` works.
CALICO_DISABLE_FILE_LOGGING: "true"
CALICO_DISABLE_FILE_LOGGING: true
# Set Felix endpoint to host default action to ACCEPT.
# early/startup log level for calico-node on startup.
CALICO_STARTUP_LOGLEVEL: "Info"
@ -508,16 +508,16 @@ conf:
# different hosts to communicate with each otehr).
CALICO_IPV4POOL_IPIP: "Always"
# Disable IPv6 on Kubernetes.
FELIX_IPV6SUPPORT: "false"
FELIX_IPV6SUPPORT: false
# Set MTU for tunnel device used if ipip is enabled, it's
# recommended you leave this as null and an appropriate value will
# be set based on tunneling mode and the networking.mtu value
FELIX_IPINIPMTU: null
# Set Felix logging; also (ab)used for bgp configuration
FELIX_LOGSEVERITYSCREEN: "Info"
FELIX_HEALTHENABLED: "true"
FELIX_HEALTHENABLED: true
# Set Felix experimental Prometheus metrics server
FELIX_PROMETHEUSMETRICSENABLED: "true"
FELIX_PROMETHEUSMETRICSENABLED: true
FELIX_PROMETHEUSMETRICSPORT: "9091"
# Auto-detect the BGP IP address.
IP: ""