Merge pull request #527 from OctopusDeploy/bug/k8sazureauth

Default to AzureCloud if Azure environment hasn't been set
OctopusDeploy · Mar 11, 2020 · 13f720e · 13f720e
2 parents bc97840 + c7cae67
commit 13f720e
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/source/Calamari/Kubernetes/Scripts/KubectlPowershellContext.ps1 b/source/Calamari/Kubernetes/Scripts/KubectlPowershellContext.ps1
@@ -35,6 +35,9 @@ $OctopusAzureADTenantId = $OctopusParameters["Octopus.Action.Azure.TenantId"]
 $OctopusAzureADClientId = $OctopusParameters["Octopus.Action.Azure.ClientId"]
 $OctopusAzureADPassword = $OctopusParameters["Octopus.Action.Azure.Password"]
 $OctopusAzureEnvironment = $OctopusParameters["Octopus.Action.Azure.Environment"]
+if ($null -eq $OctopusAzureEnvironment) {
+	$OctopusAzureEnvironment = "AzureCloud"
+}
 $OctopusDisableAzureCLI = $OctopusParameters["OctopusDisableAzureCLI"]
 
 function EnsureDirectoryExists([string] $path)