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

Merge pull request #92123 from YangLu1031/improveStackdriverInstallation

Browse Source 
Stabilize StackdriverLogging installation
This commit is contained in:
Kubernetes Prow Robot 2020-06-16 04:04:05 -07:00 committed by GitHub
commit 0a1e58913c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 37 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1540,6 +1540,38 @@ function Restart-LoggingAgent {
Start-Service StackdriverLogging
}
# Check whether the logging agent is installed by whether it's registered as service
function IsLoggingAgentInstalled {
$stackdriver_status = (Get-Service StackdriverLogging -ErrorAction Ignore).Status
return -not [string]::IsNullOrEmpty($stackdriver_status)
}
# Clean up the logging agent's registry key and root folder if they exist from a prior installation.
# Try to uninstall it first, if it failed, remove the registry key at least,
# as the registry key will block the silent installation later on.
function Cleanup-LoggingAgent {
# For 64 bits app, the registry path is 'HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall'
# for 32 bits app, it's 'HKLM:\SOFTWARE\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall'
# StackdriverLogging is installed as 32 bits app
$x32_app_reg = 'HKLM:\SOFTWARE\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall'
$uninstall_string = (Get-ChildItem $x32_app_reg | Get-ItemProperty | Where-Object {$_.DisplayName -match "Stackdriver"}).UninstallString
if (-not [string]::IsNullOrEmpty($uninstall_string)) {
try {
Start-Process -FilePath "$uninstall_string" -ArgumentList "/S" -Wait
} catch {
Log-Output "Exception happens during uninstall logging agent, so remove the registry key at least"
Remove-Item -Path "$x32_app_reg\GoogleStackdriverLoggingAgent\"
}
}
# If we chose reboot after uninstallation, the root folder would be clean.
# But since we couldn't reboot, so some files & folders would be left there,
# which could block the re-installation later on, so clean it up
if(Test-Path $STACKDRIVER_ROOT){
Remove-Item -Force -Recurse $STACKDRIVER_ROOT
}
}
# Installs the Stackdriver logging agent according to
# https://cloud.google.com/logging/docs/agent/installation.
# TODO(yujuhong): Update to a newer Stackdriver agent once it is released to
@ -1556,17 +1588,18 @@ function Install-LoggingAgent {
("$STACKDRIVER_ROOT\LoggingAgent\Main\pos\winevtlog.pos\worker0\" +
"storage.json")
if (Test-Path $STACKDRIVER_ROOT) {
if (IsLoggingAgentInstalled) {
# Note: we should reinstall the Stackdriver agent if $REDO_STEPS is true
# here, but we don't know how to run the installer without it prompting
# when Stackdriver is already installed. We dumped the strings in the
# installer binary and searched for flags to do this but found nothing. Oh
# well.
Log-Output ("Skip: $STACKDRIVER_ROOT is already present, assuming that " +
"Stackdriver logging agent is already installed")
Restart-LoggingAgent
Log-Output ("Skip: Stackdriver logging agent is already installed")
return
}
# After a crash, the StackdriverLogging service could be missing, but its files will still be present
Cleanup-LoggingAgent
$url = ("https://storage.googleapis.com/gke-release/winnode/stackdriver/" +
"StackdriverLogging-${STACKDRIVER_VERSION}.exe")