Merge pull request #261368 from MicrosoftDocs/main

12/15/2023 AM Publish

Author: Taojunshen

.openpublishing.redirection.json

@@ -23678,6 +23678,11 @@
             "source_path_from_root": "/articles/aks/ai-toolchain-operator.md",
             "redirect_url": "https://azure.microsoft.com/updates/preview-ai-toolchain-operator-addon-for-aks/",
             "redirect_document_id": false  
+        },
+        {
+            "source_path_from_root": "/articles/reliability/disaster-recovery-guidance-overview.md",
+            "redirect_url": "/azure/reliability/reliability-guidance-overview",
+            "redirect_document_id": false  
         }
 
     ]

articles/ai-services/openai/concepts/models.md

@@ -115,7 +115,7 @@ See [model versions](../concepts/model-versions.md) to learn about how Azure Ope
 
 ### GPT-3.5 models
 
-GPT-3.5 Turbo is used with the Chat Completion API. GPT-3.5 Turbo (0301) can also be used with the Completions API.  GPT3.5 Turbo (0613) only supports the Chat Completions API.
+GPT-3.5 Turbo is used with the Chat Completion API. GPT-3.5 Turbo version 0301 can also be used with the Completions API.  GPT-3.5 Turbo versions 0613 and 1106 only support the Chat Completions API.
 
 GPT-3.5 Turbo version 0301 is the first version of the model released.  Version 0613 is the second version of the model and adds function calling support.
 

articles/aks/TOC.yml

@@ -349,6 +349,8 @@
           href: reduce-latency-ppg.md
         - name: Cluster Autoscaler
           href: cluster-autoscaler.md
+        - name: Node autoprovision
+          href: node-autoprovision.md
         - name: Availability Zones
           href: availability-zones.md
     - name: Cluster management

articles/aks/manage-ssh-node-access.md

@@ -3,12 +3,12 @@ title: Manage SSH access on Azure Kubernetes Service cluster nodes
 titleSuffix: Azure Kubernetes Service
 description: Learn how to configure SSH on Azure Kubernetes Service (AKS) cluster nodes.
 ms.topic: article
-ms.date: 12/05/2023
+ms.date: 12/15/2023
 ---
 
 # Manage SSH for secure access to Azure Kubernetes Service (AKS) nodes
 
-This article describes how to update the SSH key (preview) on your AKS clusters or node pools.
+This article describes how to configure the SSH key (preview) on your AKS clusters or node pools, during initial deployment or at a later time.
 
 [!INCLUDE [preview features callout](./includes/preview/preview-callout.md)]
 
@@ -17,6 +17,49 @@ This article describes how to update the SSH key (preview) on your AKS clusters
 * You need the Azure CLI version 2.46.0 or later installed and configured. If you need to install or upgrade, see [Install Azure CLI][install-azure-cli].
 * This feature supports Linux, Mariner, and CBLMariner node pools on existing clusters.
 
+## Install the `aks-preview` Azure CLI extension
+
+[!INCLUDE [preview features callout](includes/preview/preview-callout.md)]
+
+1. Install the aks-preview extension using the [`az extension add`][az-extension-add] command.
+
+    ```azurecli
+    az extension add --name aks-preview
+    ```
+
+2. Update to the latest version of the extension using the [`az extension update`][az-extension-update] command.
+
+    ```azurecli
+    az extension update --name aks-preview
+    ```
+
+## Create an AKS cluster with SSH key (preview)
+
+Use the [az aks create][az-aks-create] command to deploy an AKS cluster with an SSH public key. You can either specify the key or a key file using the `--ssh-key-value` argument.
+
+|SSH parameter |Description |Default value |
+|-----|-----|-----|
+|--generate-ssh-key |If you don't have your own SSH key, specify `--generate-ssh-key`. The Azure CLI first looks for the key in the `~/.ssh/` directory. If the key exists, it's used. If the key doesn't exist, the Azure CLI automatically generates a set of SSH keys and saves them in the specified or default directory.||
+|--ssh-key-vaule |Public key path or key contents to install on node VMs for SSH access. For example, `ssh-rsa AAAAB...snip...UcyupgH azureuser@linuxvm`.|`~.ssh\id_rsa.pub` |
+|--no-ssh-key | If you don't require an SSH key, specify this argument. However, AKS automatically generates a set of SSH keys because the Azure Virtual Machine resource dependency doesn’t support an empty SSH key file. As a result, the keys aren't returned and can't be used to SSH into the node VMs. ||
+
+>[!NOTE]
+>If no parameters are specified, the Azure CLI defaults to referencing the SSH keys stored in the `~/.ssh/` directory. If the keys aren't found in the directory, the command returns a `key not found` error message.
+
+The following are examples of this command:
+
+* To create a cluster and use the default generated SSH keys:
+
+    ```azurecli
+    az aks create --name myAKSCluster --resource-group MyResourceGroup --generate-ssh-key
+    ```
+
+* To specify an SSH public key file, specify it with the `--ssh-key-value` argument:
+
+    ```azurecli
+    az aks create --name myAKSCluster --resource-group MyResourceGroup --ssh-key-value ~/.ssh/id_rsa.pub
+    ```
+
 ## Update SSH public key (preview) on an existing AKS cluster
 
 Use the [az aks update][az-aks-update] command to update the SSH public key on your cluster. This operation updates the key on all node pools. You can either specify the key or a key file using the `--ssh-key-value` argument.
@@ -30,7 +73,7 @@ Use the [az aks update][az-aks-update] command to update the SSH public key on y
 
 The following are examples of this command:
 
-* To specify the new SSH public key value, include the `--ssh-key-value` argument:
+* To specify a new SSH public key value, include the `--ssh-key-value` argument:
 
     ```azurecli
     az aks update --name myAKSCluster --resource-group MyResourceGroup --ssh-key-value 'ssh-rsa AAAAB3Nza-xxx'
@@ -54,6 +97,7 @@ To help troubleshoot any issues with SSH connectivity to your clusters nodes, yo
 <!-- LINKS - internal -->
 [install-azure-cli]: /cli/azure/install-azure-cli
 [az-aks-update]: /cli/azure/aks#az-aks-update
+[az-aks-create]: /cli/azure/aks#az-aks-create
 [view-kubelet-logs]: kubelet-logs.md
 [view-master-logs]: monitor-aks-reference.md#resource-logs
 [node-image-upgrade]: node-image-upgrade.md