Skip to content

Commit e2251f9

Browse files
committed
Better Resource Naming and AKS AppRouting IngressClassName in all ingress
1 parent e53fe4b commit e2251f9

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

deploy/aks/easyauth/cluster-issuer.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ spec:
1111
solvers:
1212
- http01:
1313
ingress:
14-
class: nginx
14+
ingressClassName: webapprouting.kubernetes.azure.com
1515
podTemplate:
1616
spec:
1717
nodeSelector:

deploy/aks/easyauth/easyauth-proxy/templates/ingress.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ metadata:
1010
{{- toYaml . | nindent 4 }}
1111
{{- end }}
1212
spec:
13+
ingressClassName: webapprouting.kubernetes.azure.com
1314
tls:
1415
- hosts:
1516
- {{ .Values.appHostName }}

deploy/aks/scripts/easyauth.ps1

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Write-Host "Enabling EasyAuth for the AKS Cluster"
2323

2424
$location = $env:AZURE_LOCATION
2525

26-
$adAppName = "$env:AZURE_ENV_NAME-easy-auth-proxy"
26+
$adAppName = "$env:AZURE_ENV_NAME"
2727
2828

2929
$appHostName="$adAppName.$location.cloudapp.azure.com"
@@ -127,7 +127,7 @@ $clientId = $appId
127127

128128
# ---------------------
129129
# Deploy Easy Auth Proxy
130-
helm install --set azureAd.tenantId=$azureTenantId --set azureAd.clientId=$clientId --set secret.name=easyauth-proxy-$adAppName-secret --set secret.azureclientsecret=$clientSecret --set appHostName=$appHostName --set tlsSecretName=$tlsSecretName easyauth-proxy-$adAppName ./easyauth/easyauth-proxy
130+
helm install --set azureAd.tenantId=$azureTenantId --set azureAd.clientId=$clientId --set secret.name=easyauth-proxy-$adAppName-secret --set secret.azureclientsecret=$clientSecret --set appHostName=$appHostName --set tlsSecretName=$tlsSecretName easyauth-proxy ./easyauth/easyauth-proxy
131131

132132
# ---------------------
133133
# Apply proxy ingress rules
@@ -182,11 +182,9 @@ azd env set "AZURE_AD_APP_NAME" $adAppName
182182
azd env set "AZURE_AD_APP_ID" $appId
183183

184184
$easyAuthConfig = @"
185-
${Get-Date -Format "yyyy-MM-dd HH:mm:ss"}
186-
## EasyAuth Configuration
187185
EasyAuth for AKS has been configured successfully.
188186
189-
The application is now available at [${homePage}](${homePage})
187+
The application is now available at:${homePage}
190188
191189
Configuration AD details:
192190
- Azure AD Application: $adAppName
@@ -206,6 +204,9 @@ Configuration AKS details:
206204

207205
Write-Host $easyAuthConfig
208206

207+
Start-Process "${homePage}"
208+
209+
209210
# Add annotation to ALL ingress
210211
# kubectl annotate ingress azure-open-ai/cm-acme-http-solver-s9fkg
211212
# with class webapprouting.kubernetes.azure.com

0 commit comments

Comments
 (0)