github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-22 19:31:44 +00:00
Code Issues Projects Releases Wiki Activity

Enable per-zone logexporter pods creation

Browse Source
This commit is contained in:
Antoni Zawodny 2020-09-23 17:05:57 +02:00
parent d19aec8bf1
commit e453a1feb7
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cluster/log-dump/log-dump.sh
View File

@ -503,6 +503,9 @@ function dump_nodes_with_logexporter() {
local -r cloud_provider="${KUBERNETES_PROVIDER}" local -r cloud_provider="${KUBERNETES_PROVIDER}"
local -r enable_hollow_node_logs="${ENABLE_HOLLOW_NODE_LOGS:-false}" local -r enable_hollow_node_logs="${ENABLE_HOLLOW_NODE_LOGS:-false}"
local -r logexport_sleep_seconds="$(( 90 + NUM_NODES / 3 ))" local -r logexport_sleep_seconds="$(( 90 + NUM_NODES / 3 ))"
if [[ -z "${ZONE_NODE_SELECTOR_DISABLED:-}" ]]; then
local -r node_selector="${ZONE_NODE_SELECTOR_LABEL:-topology.kubernetes.io/zone}: ${ZONE}"
fi
# Fill in the parameters in the logexporter daemonset template. # Fill in the parameters in the logexporter daemonset template.
local -r tmp="${KUBE_TEMP}/logexporter" local -r tmp="${KUBE_TEMP}/logexporter"
@ -510,6 +513,7 @@ function dump_nodes_with_logexporter() {
mkdir -p "${tmp}" mkdir -p "${tmp}"
cp "${KUBE_ROOT}/cluster/log-dump/logexporter-daemonset.yaml" "${manifest_yaml}" cp "${KUBE_ROOT}/cluster/log-dump/logexporter-daemonset.yaml" "${manifest_yaml}"
sed -i'' -e "s@{{.NodeSelector}}@${node_selector:-}@g" "${manifest_yaml}"
sed -i'' -e "s@{{.LogexporterNamespace}}@${logexporter_namespace}@g" "${manifest_yaml}" sed -i'' -e "s@{{.LogexporterNamespace}}@${logexporter_namespace}@g" "${manifest_yaml}"
sed -i'' -e "s@{{.ServiceAccountCredentials}}@${service_account_credentials}@g" "${manifest_yaml}" sed -i'' -e "s@{{.ServiceAccountCredentials}}@${service_account_credentials}@g" "${manifest_yaml}"
sed -i'' -e "s@{{.CloudProvider}}@${cloud_provider}@g" "${manifest_yaml}" sed -i'' -e "s@{{.CloudProvider}}@${cloud_provider}@g" "${manifest_yaml}"

2
cluster/log-dump/logexporter-daemonset.yaml
View File

@ -67,6 +67,8 @@ spec:
requests: requests:
cpu: 10m cpu: 10m
memory: 10Mi memory: 10Mi
nodeSelector:
{{.NodeSelector}}
volumes: volumes:
- name: service - name: service
secret: secret: