Skip to content

Commit ad96fff

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into devproxy
2 parents 21f3d25 + 0d5973d commit ad96fff

File tree

99 files changed

+598
-300
lines changed

Some content is hidden

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

99 files changed

+598
-300
lines changed

.openpublishing.redirection.baremetal-infrastructure.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,11 @@
134134
"source_path_from_root": "/articles/baremetal-infrastructure/workloads/sap/baremetal-overview-architecture.md",
135135
"redirect_url": "/azure/baremetal-infrastructure/concepts-baremetal-infrastructure-overview",
136136
"redirect_document_id": false
137-
}
137+
},
138+
{
139+
"source_path": "articles/baremetal-infrastructure/workloads/nc2-on-azure/solution-design.md",
140+
"redirect_url": "/azure/baremetal-infrastructure/workloads/nc2-on-azure/architecture",
141+
"redirect_document_id": false
142+
}
138143
]
139144
}

articles/ai-services/openai/how-to/deployment-types.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ Azure OpenAI offers three types of deployments. These provide a varied level of
3333
| **Best suited for** | Applications that don’t require data residency. Recommended starting place for customers. | For customers with data residency requirements. Optimized for low to medium volume. | Real-time scoring for large consistent volume. Includes the highest commitments and limits.|
3434
| **How it works** | Traffic may be routed anywhere in the world | | |
3535
| **Getting started** | [Model deployment](./create-resource.md) | [Model deployment](./create-resource.md) | [Provisioned onboarding](./provisioned-throughput-onboarding.md) |
36-
| **Cost** | [Baseline](https://azure.microsoft.com/pricing/details/cognitive-services/openai-service/) | [Regional Pricing](https://azure.microsoft.com/pricing/details/cognitive-services/openai-service/) | May experience cost savings for consistent usage |
36+
| **Cost** | [Global deployment pricing](https://azure.microsoft.com/pricing/details/cognitive-services/openai-service/) | [Regional pricing](https://azure.microsoft.com/pricing/details/cognitive-services/openai-service/) | May experience cost savings for consistent usage |
3737
| **What you get** | Easy access to all new models with highest default pay-per-call limits.<br><br> Customers with high volume usage may see higher latency variability | Easy access with [SLA on availability](https://azure.microsoft.com/support/legal/sla/). Optimized for low to medium volume workloads with high burstiness. <br><br>Customers with high consistent volume may experience greater latency variability. | Regional access with very high & predictable throughput. Determine throughput per PTU using the provided [capacity calculator](./provisioned-throughput-onboarding.md#estimate-provisioned-throughput-and-cost) |
3838
| **What you don’t get** | ❌Data residency guarantees | ❌High volume w/consistent low latency | ❌Pay-per-call flexibility |
3939
| **Per-call Latency** | Optimized for real-time calling & low to medium volume usage. Customers with high volume usage may see higher latency variability. Threshold set per model | Optimized for real-time calling & low to medium volume usage. Customers with high volume usage may see higher latency variability. Threshold set per model | Optimized for real-time. |

articles/aks/TOC.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@
182182
href: concepts-sustainable-software-engineering.md
183183
- name: Preview API life cycle
184184
href: concepts-preview-api-life-cycle.md
185-
- name: Dapr
185+
- name: Dapr extension
186186
href: dapr-overview.md
187187
- name: GitOps
188188
href: ../azure-arc/kubernetes/conceptual-gitops-flux2.md?toc=/azure/aks/toc.json&bc=/azure/aks/breadcrumb/toc.json
@@ -879,7 +879,7 @@
879879
href: deploy-application-az-cli.md
880880
- name: Dapr
881881
items:
882-
- name: Create the Dapr extension
882+
- name: Install the Dapr extension
883883
href: dapr.md
884884
- name: Configure the Dapr extension
885885
href: dapr-settings.md

articles/aks/dapr-overview.md

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
---
2-
title: Dapr extension for Azure Kubernetes Service (AKS) overview
2+
title: Dapr extension for Azure Kubernetes Service (AKS) and Arc-enabled Kubernetes
33
description: Learn more about using Dapr on your Azure Kubernetes Service (AKS) cluster to develop applications.
44
ms.author: nickoman
55
ms.topic: overview
66
ms.date: 04/22/2024
77
---
88

9-
# Dapr
9+
# Dapr extension for Azure Kubernetes Service (AKS) and Arc-enabled Kubernetes
1010

1111
[Distributed Application Runtime (Dapr)][dapr-docs] offers APIs that help you write and implement simple, portable, resilient, and secured microservices. Dapr APIs run as a sidecar process in tandem with your applications and abstract away common complexities you may encounter when building distributed applications, such as:
1212
- Service discovery
@@ -19,7 +19,7 @@ Dapr is incrementally adoptable. You can use any of the API building blocks as n
1919

2020
## Capabilities and features
2121

22-
[Using the Dapr extension to provision Dapr on your AKS or Arc-enabled Kubernetes cluster](../azure-arc/kubernetes/conceptual-extensions.md) eliminates the overhead of:
22+
[Using the Dapr extension to provision Dapr on your AKS or Arc-enabled Kubernetes cluster][dapr-create-extension] eliminates the overhead of:
2323
- Downloading Dapr tooling
2424
- Manually installing and managing the Dapr runtime on your AKS cluster
2525

@@ -63,7 +63,7 @@ Microsoft provides best-effort support for [the latest version of Dapr and two p
6363
- 1.12.x
6464
- 1.11.x
6565

66-
You can run Azure CLI commands to retreive a list of available versions in [a cluster](/cli/azure/k8s-extension/extension-types#az-k8s-extension-extension-types-list-versions-by-cluster) or [a location](/cli/azure/k8s-extension/extension-types#az-k8s-extension-extension-types-list-versions-by-location).
66+
You can run Azure CLI commands to retrieve a list of available versions in [a cluster](/cli/azure/k8s-extension/extension-types#az-k8s-extension-extension-types-list-versions-by-cluster) or [a location](/cli/azure/k8s-extension/extension-types#az-k8s-extension-extension-types-list-versions-by-location).
6767

6868
To view a list of the stable Dapr versions available to your managed AKS cluster, run the following command:
6969

@@ -221,7 +221,9 @@ If you install Dapr through the AKS extension, our recommendation is to continue
221221

222222
## Next Steps
223223

224-
After learning about Dapr and some of the challenges it solves, try [Deploying an application with the Dapr cluster extension][dapr-quickstart].
224+
> [!div class="nextstepaction"]
225+
> [Walk through the Dapr extension quickstart to demo how it works][dapr-quickstart]
226+
225227

226228
<!-- Links Internal -->
227229
[csi-secrets-store]: ./csi-secrets-store-driver.md
@@ -231,6 +233,7 @@ After learning about Dapr and some of the challenges it solves, try [Deploying a
231233
[dapr-migration]: ./dapr-migration.md
232234
[aks-msi]: ./use-managed-identity.md
233235
[dapr-configuration-options]: ./dapr-settings.md
236+
[dapr-create-extension]: ./dapr.md
234237

235238
<!-- Links External -->
236239
[dapr-docs]: https://docs.dapr.io/
@@ -248,4 +251,4 @@ After learning about Dapr and some of the challenges it solves, try [Deploying a
248251
[dapr-subscriptions]: https://docs.dapr.io/developing-applications/building-blocks/pubsub/subscription-methods/#declarative-subscriptions
249252
[dapr-supported-version]: https://docs.dapr.io/operations/support/support-release-policy/
250253
[dapr-observability]: https://docs.dapr.io/operations/observability/
251-
[dapr-alpha-beta]: https://docs.dapr.io/operations/support/alpha-beta-apis/
254+
[dapr-alpha-beta]: https://docs.dapr.io/operations/support/alpha-beta-apis/

articles/aks/dapr-settings.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,9 @@ The Dapr extension requires the following outbound URLs on `https://:443` to fun
374374

375375
## Next Steps
376376

377-
Once you successfully provisioned Dapr in your AKS cluster, try deploying a [sample application][sample-application].
377+
- [Walk through the tutorial for deploying Dapr Workflow via the extension][dapr-workflow]
378+
- [Determine if you need to migrate from Dapr open source to the Dapr extension][dapr-migration].
379+
378380

379381
<!-- LINKS INTERNAL -->
380382
[deploy-cluster]: ./tutorial-kubernetes-deploy-cluster.md
@@ -389,7 +391,7 @@ Once you successfully provisioned Dapr in your AKS cluster, try deploying a [sam
389391
[dapr-migration]: ./dapr-migration.md
390392
[dapr-settings]: ./dapr-settings.md
391393
[aks-azurelinux]: ./cluster-configuration.md#azure-linux-container-host-for-aks
392-
394+
[dapr-workflow]: ./dapr-workflow.md
393395

394396
<!-- LINKS EXTERNAL -->
395397
[kubernetes-production]: https://docs.dapr.io/operations/hosting/kubernetes/kubernetes-production

articles/aks/dapr-workflow.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,8 @@ Notice that the workflow status is marked as completed.
185185

186186
## Next steps
187187

188-
[Learn how to add configuration settings to the Dapr extension on your AKS cluster][dapr-config].
188+
- [Configure the Dapr extension on your AKS cluster][dapr-config].
189+
- [Determine if you need to migrate from Dapr open source to the Dapr extension][dapr-migration].
189190

190191
<!-- Links Internal -->
191192
[deploy-cluster]: ./tutorial-kubernetes-deploy-cluster.md
@@ -194,6 +195,7 @@ Notice that the workflow status is marked as completed.
194195
[cluster]: ./tutorial-kubernetes-deploy-cluster.md
195196
[k8s-sp]: ./dapr.md#register-the-kubernetesconfiguration-resource-provider
196197
[dapr-config]: ./dapr-settings.md
198+
[dapr-migration]: ./dapr-migration.md
197199
[az-cloud-shell]: ./learn/quick-kubernetes-deploy-powershell.md#azure-cloud-shell
198200
[kubectl]: ./tutorial-kubernetes-deploy-cluster.md#connect-to-cluster-using-kubectl
199201

articles/aks/dapr.md

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
---
2-
title: Dapr extension for Azure Kubernetes Service (AKS) and Arc-enabled Kubernetes
2+
title: Install the Dapr extension for Azure Kubernetes Service (AKS) and Arc-enabled Kubernetes
33
description: Install and configure Dapr on your Azure Kubernetes Service (AKS) and Arc-enabled Kubernetes clusters using the Dapr cluster extension.
44
author: greenie-msft
55
ms.author: nigreenf
66
ms.service: azure-kubernetes-service
77
ms.topic: article
8-
ms.date: 06/06/2024
8+
ms.date: 07/16/2024
99
ms.subservice: aks-developer
1010
ms.custom: devx-track-azurecli, references_regions
1111
---
1212

13-
# Dapr extension for Azure Kubernetes Service (AKS) and Arc-enabled Kubernetes
13+
# Install the Dapr extension for Azure Kubernetes Service (AKS) and Arc-enabled Kubernetes
1414

1515
[Dapr](./dapr-overview.md) simplifies building resilient, stateless, and stateful applications that run on the cloud and edge and embrace the diversity of languages and developer frameworks. With Dapr's sidecar architecture, you can keep your code platform agnostic while tackling challenges around building microservices, like:
1616
- Calling other services reliably and securely
@@ -342,9 +342,8 @@ Or simply remove the Bicep template.
342342

343343
## Next Steps
344344

345-
- Learn more about [extra settings and preferences you can set on the Dapr extension][dapr-settings].
346-
- Once you have successfully provisioned Dapr in your AKS cluster, try deploying a [sample application][sample-application].
347-
- Try out [Dapr Workflow on your Dapr extension for AKS][dapr-workflow]
345+
> [!div class="nextstepaction"]
346+
> [Configure the Dapr extension for your unique scenario][dapr-settings]
348347
349348
<!-- LINKS INTERNAL -->
350349
[deploy-cluster]: ./tutorial-kubernetes-deploy-cluster.md

articles/aks/quickstart-dapr.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: Use the Dapr cluster extension for Azure Kubernetes Service (AKS) o
44
author: nickomang
55
ms.author: nickoman
66
ms.topic: quickstart
7-
ms.date: 12/27/2023
7+
ms.date: 07/16/2024
88
ms.custom: template-quickstart, mode-other, devx-track-js, devx-track-python
99
---
1010

@@ -232,16 +232,17 @@ Now that both the Node.js and Python applications are deployed, you watch messag
232232
## Next steps
233233
234234
> [!div class="nextstepaction"]
235-
> [Learn more about other cluster extensions][cluster-extensions].
235+
> [Learn how to create the Dapr extension][dapr-create-extension]
236236
237237
<!-- LINKS -->
238238
<!-- INTERNAL -->
239239
[azure-cli-install]: /cli/azure/install-azure-cli
240240
[azure-powershell-install]: /powershell/azure/install-az-ps
241241
[cluster-extensions]: ./cluster-extensions.md
242-
[dapr-overview]: ./dapr.md
242+
[dapr-overview]: ./dapr-overview.md
243243
[az-group-delete]: /cli/azure/group#az-group-delete
244244
[remove-azresourcegroup]: /powershell/module/az.resources/remove-azresourcegroup
245+
[dapr-create-extension]: ./dapr.md
245246
246247
<!-- EXTERNAL -->
247248
[hello-world-gh]: https://github.com/dapr/quickstarts/tree/master/tutorials/hello-kubernetes

articles/aks/start-stop-cluster.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@ To better optimize your costs during these periods, you can turn off, or stop, y
1515
> [!CAUTION]
1616
> Stopping your cluster deallocates the control plane and releases the capacity. In regions experiencing capacity constraints, customers may be unable to start a stopped cluster. We do not recommend stopping mission critical workloads for this reason.
1717
18+
> [!NOTE]
19+
> AKS start operations will restore all objects from ETCD with the exception of standalone pods with the same names and ages. meaning that a pod's age will continue to be calculated from its original creation time. This count will keep increasing over time, regardless of whether the cluster is in a stopped state.
20+
21+
1822
## Before you begin
1923

2024
This article assumes you have an existing AKS cluster. If you need an AKS cluster, you can create one using [Azure CLI][aks-quickstart-cli], [Azure PowerShell][aks-quickstart-powershell], or the [Azure portal][aks-quickstart-portal].

articles/app-service/quickstart-dotnetcore.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ author: cephalin
1313
ms.author: cephalin
1414
ms.custom: devx-track-csharp, mvc, devcenter, vs-azure, devdivchpfy22, devx-track-azurepowershell, devx-track-dotnet, ai-video-demo, devx-track-extended-azdevcli
1515
ai-usage: ai-assisted
16+
ms.collection: ce-skilling-ai-copilot
1617
---
1718

1819
<!-- NOTES:

0 commit comments

Comments
 (0)