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 #85084 from barney-s/win-stackdriver-startup-fix

Browse Source 
Reorder stackdriver setup in windows startup script
This commit is contained in:
Kubernetes Prow Robot 2019-11-13 09:27:27 -08:00 committed by GitHub
commit 814ebe7678
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cluster/gce/windows/configure.ps1
View File

@ -131,13 +131,6 @@ try {
Create-Directories Create-Directories
Download-HelperScripts Download-HelperScripts
# Even if Stackdriver is already installed, the function will still [re]start the service.
if (IsLoggingEnabled $kube_env) {
Install-LoggingAgent
Configure-LoggingAgent
Restart-LoggingAgent
}
Create-DockerRegistryKey Create-DockerRegistryKey
Configure-Dockerd Configure-Dockerd
DownloadAndInstall-KubernetesBinaries DownloadAndInstall-KubernetesBinaries
@ -151,6 +144,12 @@ try {
Configure-GcePdTools Configure-GcePdTools
Configure-Kubelet Configure-Kubelet
# Even if Stackdriver is already installed, the function will still [re]start the service.
if (IsLoggingEnabled $kube_env) {
Install-LoggingAgent
Configure-LoggingAgent
Restart-LoggingAgent
}
Start-WorkerServices Start-WorkerServices
Log-Output 'Waiting 15 seconds for node to join cluster.' Log-Output 'Waiting 15 seconds for node to join cluster.'
Start-Sleep 15 Start-Sleep 15