Skip to content

Commit 44aaa8c

Browse files
authored
Merge pull request #276567 from MicrosoftDocs/main
Merge main to live, 4 AM
2 parents b8c2545 + 5a68f34 commit 44aaa8c

File tree

73 files changed

+1092
-973
lines changed

Some content is hidden

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

73 files changed

+1092
-973
lines changed

.openpublishing.redirection.container-registry.json

Lines changed: 41 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,32 +2,42 @@
22
"redirections": [
33
{
44
"source_path_from_root": "/articles/container-registry/tutorial-enable-registry-cache-auth.md",
5-
"redirect_url": "/azure/container-registry/tutorial-enable-artifact-cache-auth",
5+
"redirect_url": "/azure/container-registry/container-registry-artifact-cache",
66
"redirect_document_id": false
77
},
88
{
99
"source_path_from_root": "/articles/container-registry/tutorial-enable-registry-cache-auth-cli.md",
10-
"redirect_url": "/azure/container-registry/tutorial-enable-artifact-cache-auth-cli",
10+
"redirect_url": "/azure/container-registry/container-registry-artifact-cache",
1111
"redirect_document_id": false
1212
},
1313
{
1414
"source_path_from_root": "/articles/container-registry/tutorial-enable-registry-cache.md",
15-
"redirect_url": "/azure/container-registry/tutorial-enable-artifact-cache",
15+
"redirect_url": "/azure/container-registry/container-registry-artifact-cache",
1616
"redirect_document_id": false
1717
},
1818
{
1919
"source_path_from_root": "/articles/container-registry/tutorial-enable-registry-cache-cli.md",
20-
"redirect_url": "/azure/container-registry/tutorial-enable-artifact-cache-cli",
20+
"redirect_url": "/azure/container-registry/container-registry-artifact-cache",
21+
"redirect_document_id": false
22+
},
23+
{
24+
"source_path_from_root": "/articles/container-registry/tutorial-artifact-cache.md",
25+
"redirect_url": "/azure/container-registry/container-registry-artifact-cache",
2126
"redirect_document_id": false
2227
},
2328
{
2429
"source_path_from_root": "/articles/container-registry/tutorial-registry-cache.md",
25-
"redirect_url": "/azure/container-registry/tutorial-artifact-cache",
30+
"redirect_url": "/azure/container-registry/container-registry-artifact-cache",
2631
"redirect_document_id": false
2732
},
2833
{
2934
"source_path_from_root": "/articles/container-registry/tutorial-troubleshoot-registry-cache.md",
30-
"redirect_url": "/azure/container-registry/tutorial-troubleshoot-artifact-cache",
35+
"redirect_url": "/azure/container-registry/troubleshoot-artifact-cache",
36+
"redirect_document_id": false
37+
},
38+
{
39+
"source_path_from_root": "/articles/container-registry/tutorial-troubleshoot-artifact-cache.md",
40+
"redirect_url": "/azure/container-registry/troubleshoot-artifact-cache",
3141
"redirect_document_id": false
3242
},
3343
{
@@ -60,6 +70,31 @@
6070
"redirect_url": "/azure/container-registry/troubleshoot-artifact-streaming",
6171
"redirect_document_id": false
6272
},
73+
{
74+
"source_path": "articles/container-registry/tutorial-enable-artifact-cache.md",
75+
"redirect_url": "/azure/container-registry/container-registry-artifact-cache",
76+
"redirect_document_id": false
77+
},
78+
{
79+
"source_path": "articles/container-registry/tutorial-enable-artifact-cache-cli.md",
80+
"redirect_url": "/azure/container-registry/container-registry-artifact-cache",
81+
"redirect_document_id": false
82+
},
83+
{
84+
"source_path": "articles/container-registry/tutorial-enable-artifact-cache-auth.md",
85+
"redirect_url": "/azure/container-registry/container-registry-artifact-cache",
86+
"redirect_document_id": false
87+
},
88+
{
89+
"source_path": "articles/container-registry/tutorial-enable-artifact-cache-auth-cli.md",
90+
"redirect_url": "/azure/container-registry/container-registry-artifact-cache",
91+
"redirect_document_id": false
92+
},
93+
{
94+
"source_path": "articles/container-registry/tutorial-artifact-cache-troubleshoot.md",
95+
"redirect_url": "/azure/container-registry/troubleshoot-artifact-cache",
96+
"redirect_document_id": false
97+
},
6398
{
6499
"source_path": "articles/container-registry/container-registry-diagnostics-audit-logs.md",
65100
"redirect_url": "/azure/container-registry/monitor-service"

articles/aks/advanced-container-networking-services-overview.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ms.author: kparekh
66
ms.service: azure-kubernetes-service
77
ms.subservice: aks-networking
88
ms.topic: overview
9-
ms.date: 05/24/2024
9+
ms.date: 05/28/2024
1010
---
1111

1212
# What is Advanced Container Networking Services?
@@ -15,6 +15,9 @@ Advanced Container Networking Services is a suite of services built to significa
1515

1616
With Advanced Container Networking Services, the focus is on delivering a seamless and integrated experience that empowers you to maintain robust security postures, ensure comprehensive compliance and gain deep insights into your network traffic and application performance. This ensures that your containerized applications are not only secure and compliant but also meet or exceed your performance and reliability goals, allowing you to confidently manage and scale your infrastructure.
1717

18+
> [!NOTE]
19+
> Advanced Container Networking Services is only available for clusters running Kubernetes 1.29 or higher.
20+
1821
## What is included in Advanced Container Networking Services?
1922

2023
Advanced Network Observability is the inaugural feature of the Advanced Container Networking Services suite bringing the power of Hubble’s control plane to both Cilium and non-Cilium Linux data planes. While Advanced Network Observability is the foundation of the Advanced Container Networking Services suite, the feature set will evolve over time offering even more insights and providing yet more new & powerful ways to manage your AKS networks.

articles/aks/cluster-extensions.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ For supported Kubernetes versions, refer to the corresponding documentation for
3939
| Extension | Description |
4040
| --------- | ----------- |
4141
| [Dapr][dapr-overview] | Dapr is a portable, event-driven runtime that makes it easy for any developer to build resilient, stateless and stateful applications that run on cloud and edge. |
42+
| [Azure App Configuration][app-config-overview] | Use Azure App Configuration to centrally manage application settings and feature flags. |
4243
| [Azure Machine Learning][azure-ml-overview] | Use Azure Kubernetes Service clusters to train, inference, and manage machine learning models in Azure Machine Learning. |
4344
| [Flux (GitOps)][gitops-overview] | Use GitOps with Flux to manage cluster configuration and application deployment. See also [supported versions of Flux (GitOps)][gitops-support] and [Tutorial: Deploy applications using GitOps with Flux v2][gitops-tutorial].|
4445
| [Azure Container Storage](../storage/container-storage/container-storage-introduction.md) | Use Azure Container Storage to manage block storage on AKS clusters to store data in persistent volumes. |
@@ -57,6 +58,7 @@ You can also [select and deploy Kubernetes applications available through Market
5758
<!-- LINKS -->
5859
<!-- INTERNAL -->
5960
[arc-k8s-extensions]: ../azure-arc/kubernetes/conceptual-extensions.md
61+
[app-config-overview]: ./azure-app-configuration.md
6062
[azure-ml-overview]: ../machine-learning/how-to-attach-kubernetes-anywhere.md
6163
[dapr-overview]: ./dapr.md
6264
[gitops-overview]: ../azure-arc/kubernetes/conceptual-gitops-flux2.md

articles/aks/custom-node-configuration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ az aks nodepool add --name mynodepool1 --cluster-name myAKSCluster --resource-gr
113113
### [Windows node pools](#tab/windows-node-pools)
114114

115115
```azurecli
116-
az aks nodepool add --name mynodepool1 --cluster-name myAKSCluster --resource-group myResourceGroup --os-type Windows --kubelet-config ./windowskubeletconfig.json
116+
az aks nodepool add --name mynp1 --cluster-name myAKSCluster --resource-group myResourceGroup --os-type Windows --kubelet-config ./windowskubeletconfig.json
117117
```
118118

119119
---

articles/api-management/TOC.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@
261261
href: api-management-howto-policies.md
262262
- name: Set or edit policies
263263
href: set-edit-policies.md
264-
- name: Author policies using Microsoft Copilot for Azure
264+
- name: Author policies using Microsoft Copilot in Azure
265265
href: ../copilot/author-api-management-policies.md?toc=%2Fazure%2Fapi-management%2Ftoc.json&bc=/azure/api-management/breadcrumb/toc.json
266266
- name: Debug policies in VS Code
267267
href: api-management-debug-policies.md

articles/api-management/api-management-key-concepts.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ API Management is offered in a variety of pricing tiers to meet the needs of dif
118118
API Management integrates with many complementary Azure services to create enterprise solutions, including:
119119

120120
* **[Azure API Center](../api-center/overview.md)** to build a complete inventory of APIs​ in the organization - regardless of their type, lifecycle stage, or deployment location​ - for API discovery, reuse, and governance
121-
* **[Copilot for Azure](../copilot/overview.md)** to help author API Management policies or explain already configured policies​
121+
* **[Copilot in Azure](../copilot/overview.md)** to help author API Management policies or explain already configured policies​
122122
* **[Azure Key Vault](../key-vault/general/overview.md)** for secure safekeeping and management of [client certificates](api-management-howto-mutual-certificates.md) and [secrets​](api-management-howto-properties.md)
123123
* **[Azure Monitor](api-management-howto-use-azure-monitor.md)** for logging, reporting, and alerting on management operations, systems events, and API requests​
124124
* **[Application Insights](api-management-howto-app-insights.md)** for live metrics, end-to-end tracing, and troubleshooting

articles/api-management/api-management-policies.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ More information about policies:
2222
+ [Policy overview](api-management-howto-policies.md)
2323
+ [Set or edit policies](set-edit-policies.md)
2424
+ [Policy expressions](api-management-policy-expressions.md)
25-
+ [Author policies using Microsoft Copilot for Azure](../copilot/author-api-management-policies.md?toc=%2Fazure%2Fapi-management%2Ftoc.json&bc=/azure/api-management/breadcrumb/toc.json)
25+
+ [Author policies using Microsoft Copilot in Azure](../copilot/author-api-management-policies.md?toc=%2Fazure%2Fapi-management%2Ftoc.json&bc=/azure/api-management/breadcrumb/toc.json)
2626

2727
> [!IMPORTANT]
2828
> [Limit call rate by subscription](rate-limit-policy.md) and [Set usage quota by subscription](quota-policy.md) have a dependency on the subscription key. A subscription key isn't required when other policies are applied.

articles/api-management/api-management-policy-expressions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ For more information working with policies, see:
251251
+ [Tutorial: Transform and protect APIs](transform-api.md)
252252
+ [Policy reference](./api-management-policies.md) for a full list of policy statements and their settings
253253
+ [Policy snippets repo](https://github.com/Azure/api-management-policy-snippets)
254-
+ [Author policies using Microsoft Copilot for Azure](../copilot/author-api-management-policies.md?toc=%2Fazure%2Fapi-management%2Ftoc.json&bc=/azure/api-management/breadcrumb/toc.json)
254+
+ [Author policies using Microsoft Copilot in Azure](../copilot/author-api-management-policies.md?toc=%2Fazure%2Fapi-management%2Ftoc.json&bc=/azure/api-management/breadcrumb/toc.json)
255255

256256
For more information:
257257

articles/api-management/policy-fragments.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,4 +118,4 @@ For more information about working with policies, see:
118118
+ [Set or edit policies](set-edit-policies.md)
119119
+ [Policy reference](./api-management-policies.md) for a full list of policy statements
120120
+ [Policy snippets repo](https://github.com/Azure/api-management-policy-snippets)
121-
+ [Author policies using Microsoft Copilot for Azure](../copilot/author-api-management-policies.md?toc=%2Fazure%2Fapi-management%2Ftoc.json&bc=/azure/api-management/breadcrumb/toc.json)
121+
+ [Author policies using Microsoft Copilot in Azure](../copilot/author-api-management-policies.md?toc=%2Fazure%2Fapi-management%2Ftoc.json&bc=/azure/api-management/breadcrumb/toc.json)

articles/api-management/set-edit-policies.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,4 +234,4 @@ For more information about working with policies, see:
234234
+ [Set or edit policies](set-edit-policies.md)
235235
+ [Policy reference](./api-management-policies.md) for a full list of policy statements and their settings
236236
+ [Policy snippets repo](https://github.com/Azure/api-management-policy-snippets)
237-
+ [Author policies using Microsoft Copilot for Azure](../copilot/author-api-management-policies.md?toc=%2Fazure%2Fapi-management%2Ftoc.json&bc=/azure/api-management/breadcrumb/toc.json)
237+
+ [Author policies using Microsoft Copilot in Azure](../copilot/author-api-management-policies.md?toc=%2Fazure%2Fapi-management%2Ftoc.json&bc=/azure/api-management/breadcrumb/toc.json)

0 commit comments

Comments
 (0)