Merge pull request kubernetes#95617 from barney-s/fluentbit_win_fix

k8s-ci-robot · web-flow · commit d42d15847eaf · 2020-10-16T02:33:25.000-07:00
Fix windows node startup failures for fluentbit installation
diff --git a/cluster/gce/windows/k8s-node-setup.psm1 b/cluster/gce/windows/k8s-node-setup.psm1
@@ -1627,16 +1627,17 @@ function DownloadAndInstall-LoggingAgents {
       Log-Output 'Extracting Logging agent'
       Expand-Archive td.zip
       mv .\td\td-agent-bit-${LOGGINGAGENT_VERSION}-win64\ $LOGGINGAGENT_ROOT
+      cd C:\
       Remove-Item -Force -Recurse $install_dir
   }
 
   # Download Logging exporter if needed
   if (ShouldWrite-File $LOGGINGEXPORTER_ROOT\flb-exporter.exe) {
+      $url = ("https://storage.googleapis.com/gke-release/winnode/fluentbit-exporter/${LOGGINGEXPORTER_VERSION}/flb-exporter-${LOGGINGEXPORTER_VERSION}.exe")
       Log-Output 'Downloading logging exporter'
       New-Item $LOGGINGEXPORTER_ROOT -ItemType 'directory' -Force | Out-Null
       MustDownload-File `
-          -OutFile $LOGGINGEXPORTER_ROOT\flb-exporter.exe `
-          -URLs 'https://storage.googleapis.com/gke-release/winnode/fluentbit-exporter/${LOGGINGEXPORTER_VERSION}/flb-exporter-${LOGGINGEXPORTER_VERSION}.exe'
+          -OutFile $LOGGINGEXPORTER_ROOT\flb-exporter.exe -URLs $url
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1627,16 +1627,17 @@ function DownloadAndInstall-LoggingAgents {`
`1627`	`1627`	`Log-Output 'Extracting Logging agent'`
`1628`	`1628`	`Expand-Archive td.zip`
`1629`	`1629`	`mv .\td\td-agent-bit-${LOGGINGAGENT_VERSION}-win64\ $LOGGINGAGENT_ROOT`
	`1630`	`+ cd C:\`
`1630`	`1631`	`Remove-Item -Force -Recurse $install_dir`
`1631`	`1632`	`}`
`1632`	`1633`
`1633`	`1634`	`# Download Logging exporter if needed`
`1634`	`1635`	`if (ShouldWrite-File $LOGGINGEXPORTER_ROOT\flb-exporter.exe) {`
	`1636`	`+ $url = ("https://storage.googleapis.com/gke-release/winnode/fluentbit-exporter/${LOGGINGEXPORTER_VERSION}/flb-exporter-${LOGGINGEXPORTER_VERSION}.exe")`
`1635`	`1637`	`Log-Output 'Downloading logging exporter'`
`1636`	`1638`	`New-Item $LOGGINGEXPORTER_ROOT -ItemType 'directory' -Force \| Out-Null`
`1637`	`1639`	MustDownload-File `
`1638`		- -OutFile $LOGGINGEXPORTER_ROOT\flb-exporter.exe `
`1639`		`- -URLs 'https://storage.googleapis.com/gke-release/winnode/fluentbit-exporter/${LOGGINGEXPORTER_VERSION}/flb-exporter-${LOGGINGEXPORTER_VERSION}.exe'`
	`1640`	`+ -OutFile $LOGGINGEXPORTER_ROOT\flb-exporter.exe -URLs $url`
`1640`	`1641`	`}`
`1641`	`1642`	`}`
`1642`	`1643`