openstack/openstack-helm-infra
Code Issues Proposed changes

Merge "[Calico] Logging fixes/updates"

Browse Source
This commit is contained in:
Zuul 2018-12-16 16:52:46 +00:00 committed by Gerrit Code Review
commit bc32affe0c
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
calico/templates/bin/_calico-settings.sh.tpl
View File

@ -24,9 +24,9 @@ kind: BGPConfiguration
metadata: metadata:
name: default name: default
spec: spec:
logSeverityScreen: Info
nodeToNodeMeshEnabled: {{ .Values.networking.settings.mesh }}
asNumber: {{ .Values.networking.bgp.asnumber }} asNumber: {{ .Values.networking.bgp.asnumber }}
logSeverityScreen: {{ .Values.conf.node.FELIX_LOGSEVERITYSCREEN }}
nodeToNodeMeshEnabled: {{ .Values.networking.settings.mesh }}
EOF EOF
# FelixConfiguration: ipipEnabled # FelixConfiguration: ipipEnabled
@ -37,7 +37,7 @@ metadata:
name: default name: default
spec: spec:
ipipEnabled: {{ .Values.networking.settings.ippool.ipip.enabled }} ipipEnabled: {{ .Values.networking.settings.ippool.ipip.enabled }}
logSeverityScreen: Info logSeverityScreen: {{ .Values.conf.node.FELIX_LOGSEVERITYSCREEN }}
EOF EOF
# ipPool - https://docs.projectcalico.org/v3.2/reference/calicoctl/resources/ippool # ipPool - https://docs.projectcalico.org/v3.2/reference/calicoctl/resources/ippool

7
calico/values.yaml
View File

@ -464,6 +464,9 @@ conf:
# Disable file logging so `kubectl logs` works. # 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. # Set Felix endpoint to host default action to ACCEPT.
# early/startup log level for calico-node on startup. Titlecase
# not lowercase.
CALICO_STARTUP_LOGLEVEL: "Info"
FELIX_DEFAULTENDPOINTTOHOSTACTION: "ACCEPT" FELIX_DEFAULTENDPOINTTOHOSTACTION: "ACCEPT"
# Configure the IP Pool from which Pod IPs will be chosen. # Configure the IP Pool from which Pod IPs will be chosen.
CALICO_IPV4POOL_CIDR: null CALICO_IPV4POOL_CIDR: null
@ -474,8 +477,8 @@ conf:
FELIX_IPV6SUPPORT: "false" FELIX_IPV6SUPPORT: "false"
# Set MTU for tunnel device used if ipip is enabled # Set MTU for tunnel device used if ipip is enabled
FELIX_IPINIPMTU: null FELIX_IPINIPMTU: null
# Set Felix logging to "info" # Set Felix logging, Titlecase not lowercase.
FELIX_LOGSEVERITYSCREEN: "info" FELIX_LOGSEVERITYSCREEN: "Info"
FELIX_HEALTHENABLED: "true" FELIX_HEALTHENABLED: "true"
# Set Felix experimental Prometheus metrics server # Set Felix experimental Prometheus metrics server
FELIX_PROMETHEUSMETRICSENABLED: "true" FELIX_PROMETHEUSMETRICSENABLED: "true"