Skip to content

Commit 8c9c03e

Browse files
TaojunshenTaojunshen
authored
Merge pull request #269230 from MicrosoftDocs/main
3/15/2024 PM Publish
2 parents 165291c + 54a654a commit 8c9c03e

File tree

57 files changed

+1088
-557
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+1088
-557
lines changed

‎articles/ai-services/openai/concepts/model-retirements.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ These models are currently available for use in Azure OpenAI Service.
5959
| ---- | ---- | ---- |
6060
| `gpt-35-turbo` | 0301 | No earlier than June 13, 2024 |
6161
| `gpt-35-turbo`<br>`gpt-35-turbo-16k` | 0613 | No earlier than July 13, 2024 |
62-
| `gpt-35-turbo` | 1106 | No earlier than Nov 17, 2025 |
62+
| `gpt-35-turbo` | 1106 | No earlier than Nov 17, 2024 |
6363
| `gpt-35-turbo` | 0125 | No earlier than Feb 22, 2025 |
6464
| `gpt-4`<br>`gpt-4-32k` | 0314 | No earlier than July 13, 2024 |
6565
| `gpt-4`<br>`gpt-4-32k` | 0613 | No earlier than Sep 30, 2024 |

‎articles/aks/cluster-configuration.md

Lines changed: 7 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -62,63 +62,25 @@ Additionally, not all VM images support Gen2 VMs. On AKS, Gen2 VMs use [AKS Ubun
6262

6363
Gen2 VMs are supported on Linux. Gen2 VMs on Windows are supported for WS2022 only.
6464

65-
### Generation 2 virtual machines on Windows (preview)
65+
### Generation 2 virtual machines on Windows
6666

67-
[!INCLUDE [preview features callout](includes/preview/preview-callout.md)]
67+
#### Limitations
6868

6969
* Generation 2 VMs are supported on Windows for WS2022 only.
7070
* Generation 2 VMs are default for Windows clusters greater than or equal to Kubernetes 1.25.
71-
* If your Kubernetes version is greater than 1.25, you only need to set the `vm_size` to get the generation 2 node pool. You can still use WS2019 generation 1 if you define that in the `os_sku`.
72-
* If your Kubernetes version is less than 1.25, you can set the `os_sku` to WS2022 and set the `vm_size` to generation 2 to get the generation 2 node pool.
73-
74-
#### Install the aks-preview Azure CLI extension
75-
76-
* Install or update the aks-preview Azure CLI extension using the [`az extension add`][az-extension-add] or the [`az extension update`][az-extension-update] command.
77-
78-
```azurecli
79-
# Install the aks-preview extension
80-
az extension add --name aks-preview
81-
82-
# Update to the latest version of the aks-preview extension
83-
az extension update --name aks-preview
84-
```
85-
86-
#### Register the AKSWindows2022Gen2Preview feature flag
87-
88-
1. Register the AKSWindows2022Gen2Preview feature flag using the [`az feature register`][az-feature-register] command.
89-
90-
```azurecli-interactive
91-
az feature register --namespace "Microsoft.ContainerService" --name "AKSWindows2022Gen2Preview"
92-
```
93-
94-
It takes a few minutes for the status to show *Registered*.
95-
96-
2. Verify the registration using the [`az feature show`][az-feature-show] command.
97-
98-
```azurecli-interactive
99-
az feature show --namespace "Microsoft.ContainerService" --name "AKSWindows2022Gen2Preview"
100-
```
101-
102-
3. When the status reflects *Registered*, refresh the registration of the `Microsoft.ContainerService` resource provider using the [`az provider register`][az-provider-register] command.
103-
104-
```azurecli-interactive
105-
az provider register --namespace "Microsoft.ContainerService"
106-
```
71+
* If you select a vm size which supports both Gen 1 and Gen 2, the default for windows node pools will be Gen 1. To specify Gen 2, use custom header `UseWindowsGen2VM=true`.
10772

10873
#### Add a Windows node pool with a generation 2 VM
10974

11075
* Add a node pool with generation 2 VMs on Windows using the [`az aks nodepool add`][az-aks-nodepool-add] command.
11176

11277
```azurecli
113-
# Sample command
114-
az aks nodepool add --resource-group myResourceGroup --cluster-name myAKSCluster --name gen2np
115-
--kubernetes-version 1.23.5 --node-vm-size Standard_D32_v4 --os-type Windows --os-sku Windows2022
116-
117-
# Default command
118-
az aks nodepool add --resource-group myResourceGroup --cluster-name myAKSCluster --name gen2np --os-type Windows --kubernetes-version 1.23.5
78+
az aks nodepool add --resource-group myResourceGroup --cluster-name myAKSCluster --name gen2np --node-vm-size Standard_D32_v4 --os-type Windows --aks-custom-headers UseWindowsGen2VM=true
11979
```
12080
121-
* Determine whether you're on generation 1 or generation 2 using the [`az aks nodepool show`][az-aks-nodepool-show] command, and check that the `nodeImageVersion` contains `gen2`.
81+
The above example will create a WS2022 node pool with a Gen 2 VM. If you're using a vm size which only supports Gen 2, you do not need to add the custom header. If you're using a kubernetes version where Windows Server 2022 is not default, you need to specify `--os-sku`.
82+
83+
* Check whether you're using generation 1 or generation 2 using the [`az aks nodepool show`][az-aks-nodepool-show] command, and check that the `nodeImageVersion` contains `gen2`.
12284
12385
```azurecli
12486
az aks nodepool show

‎articles/aks/custom-node-configuration.md

Lines changed: 3 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -14,47 +14,10 @@ Customizing your node configuration allows you to adjust operating system (OS) s
1414

1515
## Create an AKS cluster with a customized node configuration
1616

17-
[!INCLUDE [preview features callout](./includes/preview/preview-callout.md)]
18-
19-
### Prerequisites for Windows kubelet custom configuration (preview)
20-
21-
Before you begin, make sure you have an Azure account with an active subscription. If you don't have one, [create an account for free](https://azure.microsoft.com/free/?WT.mc_id=A261C142F). You also need to register the feature flag using the following steps:
22-
23-
24-
1. Install the aks-preview extension using the [`az extension add`][az-extension-add] command.
25-
26-
```azurecli
27-
az extension add --name aks-preview
28-
```
29-
30-
2. Update to the latest version of the extension using the [`az extension update`][az-extension-update] command.
31-
32-
```azurecli
33-
az extension update --name aks-preview
34-
```
35-
36-
3. Register the `WindowsCustomKubeletConfigPreview` feature flag using the [`az feature register`][az-feature-register] command.
37-
38-
```azurecli-interactive
39-
az feature register --namespace "Microsoft.ContainerService" --name "WindowsCustomKubeletConfigPreview"
40-
```
41-
42-
It takes a few minutes for the status to show *Registered*.
43-
44-
4. Verify the registration status using the [`az feature show`][az-feature-show] command.
45-
46-
```azurecli-interactive
47-
az feature show --namespace "Microsoft.ContainerService" --name "WindowsCustomKubeletConfigPreview"
48-
```
49-
50-
5. When the status reflects *Registered*, refresh the registration of the *Microsoft.ContainerService* resource provider using the [`az provider register`][az-provider-register] command.
51-
52-
```azurecli-interactive
53-
az provider register --namespace Microsoft.ContainerService
54-
```
55-
5617
### Create config files
5718

19+
OS and kubelet configuration changes require you to create a new configuration file with the parameters and your desired settings. If a value for a parameter is not specified, then the value will be set to the default.
20+
5821
#### Kubelet configuration
5922

6023
### [Linux node pools](#tab/linux-node-pools)
@@ -197,7 +160,7 @@ Kubelet custom configuration is supported for Linux and Windows node pools. Supp
197160
| `containerLogMaxFiles` | ≥ 2 | 5 | The maximum number of container log files that can be present for a container. |
198161
| `podMaxPids` | -1 to kernel PID limit | -1 (∞)| The maximum amount of process IDs that can be running in a Pod |
199162

200-
#### Windows Kubelet custom configuration (preview)
163+
#### Windows Kubelet custom configuration
201164

202165
| Parameter | Allowed values/interval | Default | Description |
203166
| --------- | ----------------------- | ------- | ----------- |

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

Lines changed: 69 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,79 @@
11
---
22
ms.service: azure-kubernetes-service
33
ms.topic: include
4-
ms.date: 02/21/2024
4+
ms.date: 03/15/2024
55
---
66

7-
> [!IMPORTANT]
8-
> 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.
7+
### azd auth workaround
98

10-
The workaround requires the Azure CLI for authentication. If you don't have it or aren't using GitHub Codespaces, install the [Azure CLI][install-azure-cli].
9+
This workaround requires you to have the [Azure CLI][install-azure-cli] installed.
10+
11+
1. Open a terminal window and log in with the Azure CLI using the [`az login`][az-login] command with the `--scope` parameter set to `https://graph.microsoft.com/.default`.
1112

12-
1. Inside a terminal, login with Azure CLI
1313
```azurecli-interactive
1414
az login --scope https://graph.microsoft.com/.default
1515
```
16-
1. Copy the "localhost" URL from the failed redirect
17-
1. In a new terminal window, type `curl` and paste your url
18-
1. If it works, code for a webpage saying "You have logged into Microsoft Azure!" appears
19-
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}`
59-
60-
[install-azure-cli]: /cli/azure/install-azure-cli
16+
17+
You should be redirected to an authentication page in a new tab to create a browser access token, as shown in the following example:
18+
19+
```output
20+
https://login.microsoftonline.com/organizations/oauth2/v2.0/authorize?clientid=<your_client_id>.
21+
```
22+
23+
2. Copy the localhost URL of the webpage you received after attempting to sign in with `azd auth login`.
24+
3. In a new terminal window, use the following `curl` request to log in. Make sure you replace the `<localhost>` placeholder with the localhost URL you copied in the previous step.
25+
26+
```console
27+
curl <localhost>
28+
```
29+
30+
A successful login outputs an HTML webpage, as shown in the following example:
31+
32+
```output
33+
<!DOCTYPE html>
34+
<html>
35+
<head>
36+
<meta charset="utf-8" />
37+
<meta http-equiv="refresh" content="60;url=https://docs.microsoft.com/cli/azure/">
38+
<title>Login successfully</title>
39+
<style>
40+
body {
41+
font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
42+
}
43+
44+
code {
45+
font-family: Consolas, 'Liberation Mono', Menlo, Courier, monospace;
46+
display: inline-block;
47+
background-color: rgb(242, 242, 242);
48+
padding: 12px 16px;
49+
margin: 8px 0px;
50+
}
51+
</style>
52+
</head>
53+
<body>
54+
<h3>You have logged into Microsoft Azure!</h3>
55+
<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>
56+
<h3>Announcements</h3>
57+
<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>
58+
<p>You may opt-in to use WAM by running the following commands:</p>
59+
<code>
60+
az config set core.allow_broker=true<br>
61+
az account clear<br>
62+
az login
63+
</code>
64+
</body>
65+
</html>
66+
```
67+
68+
4. Close the current terminal and open the original terminal. You should see a JSON list of your subscriptions.
69+
5. Copy the `id` field of the subscription you want to use.
70+
6. Set your subscription using the [`az account set`][az-account-set] command.
71+
72+
```azurecli-interactive
73+
az account set --subscription <subscription_id>
74+
```
75+
76+
<!-- LINKS - internal -->
77+
[install-azure-cli]: /cli/azure/install-azure-cli
78+
[az-login]: /cli/azure/#az-login
79+
[az-account-set]: /cli/azure/account#az-account-set

0 commit comments

Comments
 (0)