github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 05:27:21 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #85827 from barney-s/fix-windows-fluentd-config-hostname

Browse Source 
Replace the hostname in the fluentd config file even if the file exists
This commit is contained in:
Kubernetes Prow Robot 2019-12-05 17:15:27 -08:00 committed by GitHub
commit a6f41a46a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cluster/gce/windows/k8s-node-setup.psm1
View File

@ -1604,16 +1604,12 @@ function Install-LoggingAgent {
function Configure-LoggingAgent { function Configure-LoggingAgent {
$fluentd_config_dir = "$STACKDRIVER_ROOT\LoggingAgent\config.d" $fluentd_config_dir = "$STACKDRIVER_ROOT\LoggingAgent\config.d"
$fluentd_config_file = "$fluentd_config_dir\k8s_containers.conf" $fluentd_config_file = "$fluentd_config_dir\k8s_containers.conf"
if (-not (ShouldWrite-File $fluentd_config_file)) {
Log-Output ("Skip: fluentd logging config $fluentd_config_file already " +
"exists")
return
}
# Create a configuration file for kubernetes containers. # Create a configuration file for kubernetes containers.
# The config.d directory should have already been created automatically, but # The config.d directory should have already been created automatically, but
# try creating again just in case. # try creating again just in case.
New-Item $fluentd_config_dir -ItemType 'directory' -Force | Out-Null New-Item $fluentd_config_dir -ItemType 'directory' -Force | Out-Null
$config = $FLUENTD_CONFIG.replace('NODE_NAME', (hostname)) $config = $FLUENTD_CONFIG.replace('NODE_NAME', (hostname))
$config | Out-File -FilePath $fluentd_config_file -Encoding ASCII $config | Out-File -FilePath $fluentd_config_file -Encoding ASCII
Log-Output "Wrote fluentd logging config to $fluentd_config_file" Log-Output "Wrote fluentd logging config to $fluentd_config_file"