From b14612e3467da0d349ca2f4ce06421883cbf41da Mon Sep 17 00:00:00 2001
From: Barni S <barni@google.com>
Date: Fri, 8 Nov 2019 17:28:12 -0500
Subject: [PATCH] Move stackdriver startup block after HNS stabilizes.
 Stackdriver is not functional if metadata-server doesnt respond. At this
 stage of the init script, metadata server is available

---
 cluster/gce/windows/configure.ps1 | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/cluster/gce/windows/configure.ps1 b/cluster/gce/windows/configure.ps1
index 64ab8d914ab..434dace1e87 100644
--- a/cluster/gce/windows/configure.ps1
+++ b/cluster/gce/windows/configure.ps1
@@ -131,13 +131,6 @@ try {
   Create-Directories
   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
   Configure-Dockerd
   DownloadAndInstall-KubernetesBinaries
@@ -151,6 +144,12 @@ try {
   Configure-GcePdTools
   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
   Log-Output 'Waiting 15 seconds for node to join cluster.'
   Start-Sleep 15