From f24749594b3a1ea7f014775fd0b3ed8e8d96d653 Mon Sep 17 00:00:00 2001 From: Angela Li Date: Tue, 3 Sep 2019 12:52:24 -0700 Subject: [PATCH] Adding ENABLE_STACKDRIVER_WINDOWS --- cluster/gce/windows/configure.ps1 | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/cluster/gce/windows/configure.ps1 b/cluster/gce/windows/configure.ps1 index 7f16448bf00..aedf681441a 100644 --- a/cluster/gce/windows/configure.ps1 +++ b/cluster/gce/windows/configure.ps1 @@ -84,14 +84,19 @@ function FetchAndImport-ModuleFromMetadata { Import-Module -Force C:\$Filename } -# Returns true if the ENABLE_NODE_LOGGING field in kube_env is true. +# Returns true if the ENABLE_STACKDRIVER_WINDOWS or ENABLE_NODE_LOGGING field in kube_env is true. # $KubeEnv is a hash table containing the kube-env metadata keys+values. +# ENABLE_NODE_LOGGING is used for legacy Stackdriver Logging, and will be deprecated (always set to False) +# soon. ENABLE_STACKDRIVER_WINDOWS is added to indicate whether logging is enabled for windows nodes. function IsLoggingEnabled { param ( [parameter(Mandatory=$true)] [hashtable]$KubeEnv ) - if ($KubeEnv.Contains('ENABLE_NODE_LOGGING') -and ` + if ($KubeEnv.Contains('ENABLE_STACKDRIVER_WINDOWS') -and ` + ($KubeEnv['ENABLE_STACKDRIVER_WINDOWS'] -eq 'true')) { + return $true + } elseif ($KubeEnv.Contains('ENABLE_NODE_LOGGING') -and ` ($KubeEnv['ENABLE_NODE_LOGGING'] -eq 'true')) { return $true }