updated deploy scripts to support other ingress than http application…

… routing
microsoft · Oct 6, 2020 · b087d1d · b087d1d
1 parent 35931a7
commit b087d1d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Deploy/powershell/Deploy-Images-Aks.ps1 b/Deploy/powershell/Deploy-Images-Aks.ps1
@@ -89,7 +89,7 @@ Write-Host " --------------------------------------------------------"
 
 $acrLogin=$(az acr show -n $acrName -o json| ConvertFrom-Json).loginServer
 
-if ($tlsEnv -ne "custom") {
+if ($tlsEnv -ne "custom" -and [String]::IsNullOrEmpty($tlsHost)) {
     $aksHost=$(az aks show -n $aksName -g $resourceGroup --query addonProfiles.httpapplicationrouting.config.HTTPApplicationRoutingZoneName -o json | ConvertFrom-Json)
 
     if (-not $aksHost) {

diff --git a/Deploy/powershell/Generate-Config.ps1 b/Deploy/powershell/Generate-Config.ps1
@@ -100,7 +100,7 @@ $tokens.seckey="nEpLzQJGNSCNL5H6DIQCtTdNxf5VgAGcBbtXLms1YDD01KJBAs0WVawaEjn97uwB
 $tokens.ingressrewritepath=""
 $tokens.ingressrewritetarget=""
 
-if($ingressClass -ne "addon-http-application-routing") {
+if($ingressClass -eq "nginx") {
     $tokens.ingressrewritepath="(/|$)(.*)" 
     $tokens.ingressrewritetarget="`$2"
 }