Skip to content

Commit a46080d

Browse files
nathaniel-msftnathaniel-msft
committed
Add more details to resources and login include.
1 parent 4962a2b commit a46080d

File tree

2 files changed

+53
-44
lines changed

2 files changed

+53
-44
lines changed

‎articles/aks/includes/azd/azd-login-ts.md

Lines changed: 45 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ ms.topic: include
44
ms.date: 02/21/2024
55
---
66

7+
### AZD Login on GitHub Codespaces
8+
79
> [!IMPORTANT]
810
> Certain Azure security policies cause conflicts when used to sign in with `azd auth login`. As a workaround, you can perform a curl request to the localhost url you were redirected to after you logged in.
911
@@ -14,47 +16,51 @@ The workaround requires the Azure CLI for authentication. If you don't have it o
1416
az login --scope https://graph.microsoft.com/.default
1517
```
1618
1. Copy the "localhost" URL from the failed redirect
19+
1720
1. In a new terminal window, type `curl` and paste your url
21+
1822
1. If it works, code for a webpage saying "You have logged into Microsoft Azure!" appears
1923
20-
```html
21-
<!DOCTYPE html>
22-
<html>
23-
<head>
24-
<meta charset="utf-8" />
25-
<meta http-equiv="refresh" content="60;url=https://docs.microsoft.com/cli/azure/">
26-
<title>Login successfully</title>
27-
<style>
28-
body {
29-
font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
30-
}
31-
32-
code {
33-
font-family: Consolas, 'Liberation Mono', Menlo, Courier, monospace;
34-
display: inline-block;
35-
background-color: rgb(242, 242, 242);
36-
padding: 12px 16px;
37-
margin: 8px 0px;
38-
}
39-
</style>
40-
</head>
41-
<body>
42-
<h3>You have logged into Microsoft Azure!</h3>
43-
<p>You can close this window, or we will redirect you to the <a href="https://docs.microsoft.com/cli/azure/">Azure CLI documentation</a> in 1 minute.</p>
44-
<h3>Announcements</h3>
45-
<p>[Windows only] Azure CLI is collecting feedback on using the <a href="https://learn.microsoft.com/windows/uwp/security/web-account-manager">Web Account Manager</a> (WAM) broker for the login experience.</p>
46-
<p>You may opt-in to use WAM by running the following commands:</p>
47-
<code>
48-
az config set core.allow_broker=true<br>
49-
az account clear<br>
50-
az login
51-
</code>
52-
</body>
53-
</html>
54-
```
55-
56-
5. Close the new terminal and open the old terminal
57-
6. Copy and note down which subscription_id you want to use
58-
7. Paste in the subscription_ID to the command `az account set -n {sub}`
24+
```html
25+
<!DOCTYPE html>
26+
<html>
27+
<head>
28+
<meta charset="utf-8" />
29+
<meta http-equiv="refresh" content="60;url=https://docs.microsoft.com/cli/azure/">
30+
<title>Login successfully</title>
31+
<style>
32+
body {
33+
font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
34+
}
35+
36+
code {
37+
font-family: Consolas, 'Liberation Mono', Menlo, Courier, monospace;
38+
display: inline-block;
39+
background-color: rgb(242, 242, 242);
40+
padding: 12px 16px;
41+
margin: 8px 0px;
42+
}
43+
</style>
44+
</head>
45+
<body>
46+
<h3>You have logged into Microsoft Azure!</h3>
47+
<p>You can close this window, or we will redirect you to the <a href="https://docs.microsoft.com/cli/azure/">Azure CLI documentation</a> in 1 minute.</p>
48+
<h3>Announcements</h3>
49+
<p>[Windows only] Azure CLI is collecting feedback on using the <a href="https://learn.microsoft.com/windows/uwp/security/web-account-manager">Web Account Manager</a> (WAM) broker for the login experience.</p>
50+
<p>You may opt-in to use WAM by running the following commands:</p>
51+
<code>
52+
az config set core.allow_broker=true<br>
53+
az account clear<br>
54+
az login
55+
</code>
56+
</body>
57+
</html>
58+
```
59+
60+
1. Close the new terminal and open the old terminal. A JSON list of your subscriptions should appear.
61+
62+
1. Copy and note down the subscription_id you want to use. It will be listed as `id`.
63+
64+
1. Paste it in to the command `az account set -n {sub}`.
5965
6066
[install-azure-cli]: /cli/azure/install-azure-cli

‎articles/aks/learn/quick-kubernetes-deploy-azd.md

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -95,14 +95,17 @@ The Azure Development Template contains all the code needed to create the servic
9595
9696
- If you have multiple Azure subscriptions, select the appropriate subscription for billing using the [az account set](/cli/azure/account#az-account-set) command.
9797
98-
## Create resources for your cluster
98+
## Create and deploy resources for your cluster
9999
100100
AZD runs all the hooks inside of the `azd-hooks` folder to pre-register, provision, then deploy these services.
101101
102-
- **Store front**: Web application for customers to view products and place orders.
103-
- **Product service**: Shows product information.
104-
- **Order service**: Places orders.
105-
- **Rabbit MQ**: Message queue for an order queue.
102+
The AZD template creates a new resource group with an Azure Kubernetes cluster and Azure Keyault. The keyvault is used to store client secrets. Within the cluster, it runs your app's services in the pets namespace.
103+
104+
- **makeline-service**: Processes orders from the queue and completing them.
105+
- **order-service**: Place orders for products
106+
- **product-service**: Perform create, read, update, or delete operations on products.
107+
- **store-front**: Web app for customers to view products and place orders
108+
- **rabbit-mq**: Message queue for an order queue.
106109
107110
1. Create all your resources with the `azd up` command.
108111

0 commit comments

Comments
 (0)