Skip to content

Commit ad0c6d2

Browse files
authored
Merge pull request #263162 from MicrosoftDocs/main
1/12/2024 PM Publish
2 parents 48a63cc + 7b7d495 commit ad0c6d2

39 files changed

+416
-488
lines changed

.openpublishing.publish.config.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1250,6 +1250,7 @@
12501250
"articles/event-grid/.openpublishing.redirection.event-grid.json",
12511251
"articles/event-hubs/.openpublishing.redirection.event-hubs.json",
12521252
"articles/governance/policy/.openpublishing.redirection.policy.json",
1253+
"articles/governance/policy/.openpublishing.redirection.resource-graph.json",
12531254
"articles/hdinsight/.openpublishing.redirection.hdinsight.json",
12541255
"articles/hdinsight-aks/.openpublishing.redirection.hdinsight-aks.json",
12551256
"articles/healthcare-apis/.openpublishing.redirection.healthcare-apis.json",

articles/ai-services/openai/quotas-limits.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ms.custom:
1010
- ignite-2023
1111
- references_regions
1212
ms.topic: conceptual
13-
ms.date: 12/06/2023
13+
ms.date: 01/12/2024
1414
ms.author: mbullwin
1515
---
1616

@@ -107,7 +107,7 @@ The default quota for models varies by model and region. Default quota limits ar
107107
<tr>
108108
<td>gpt-4 (vision-preview)<br>GPT-4 Turbo with Vision</td>
109109
<td>Sweden Central, Switzerland North, Australia East, West US</td>
110-
<td>10 K</td>
110+
<td>30 K</td>
111111
</tr>
112112
<tr>
113113
<td rowspan="2">text-embedding-ada-002</td>

articles/aks/TOC.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,20 @@
1515
- name: Add-ons, extensions, and other integrations
1616
href: integrations.md
1717
displayName: add-on, extensions, prometheus, grafana, openfaas, spark, istio, linkerd, consul, github, actions
18-
- name: Getting started
19-
items:
20-
- name: Well-architected considerations
21-
href: /azure/architecture/framework/services/compute/azure-kubernetes-service/azure-kubernetes-service?toc=/azure/aks/toc.json&bc=/azure/aks/breadcrumb/toc.json
22-
- name: Plan your implementation
23-
href: /azure/architecture/reference-architectures/containers/aks-start-here?toc=/azure/aks/toc.json&bc=/azure/aks/breadcrumb/toc.json
24-
- name: Optimize costs
25-
href: best-practices-cost.md
26-
- name: Windows vs. Linux containers
27-
href: windows-vs-linux-containers.md
18+
- name: Getting started
19+
items:
20+
- name: Well-architected considerations
21+
href: /azure/architecture/framework/services/compute/azure-kubernetes-service/azure-kubernetes-service?toc=/azure/aks/toc.json&bc=/azure/aks/breadcrumb/toc.json
22+
- name: Plan your implementation
23+
href: /azure/architecture/reference-architectures/containers/aks-start-here?toc=/azure/aks/toc.json&bc=/azure/aks/breadcrumb/toc.json
24+
- name: Windows container considerations
25+
href: windows-vs-linux-containers.md
26+
- name: Optimize costs
27+
href: best-practices-cost.md
2828
- name: Quickstarts
2929
expanded: true
3030
items:
31-
- name: Deploy a Linux-based AKS Cluster
31+
- name: Create a Linux-based AKS Cluster
3232
expanded: true
3333
items:
3434
- name: Use the Azure CLI
@@ -48,15 +48,15 @@
4848
href: learn/quick-kubernetes-deploy-rm-template.md
4949
- name: Use Terraform
5050
href: learn/quick-kubernetes-deploy-terraform.md
51-
- name: Deploy a Windows-based AKS Cluster
51+
- name: Create a Windows-based AKS Cluster
5252
items:
5353
- name: Use the Azure CLI
5454
href: learn/quick-windows-container-deploy-cli.md
5555
- name: Use Azure PowerShell
5656
href: learn/quick-windows-container-deploy-powershell.md
5757
- name: Use the Azure portal
5858
href: learn/quick-windows-container-deploy-portal.md
59-
- name: Develop applications
59+
- name: Work with package managers
6060
expanded: true
6161
items:
6262
- name: Develop with Helm

articles/aks/best-practices.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ The following conceptual articles cover some of the fundamental features and com
7676

7777
## Next steps
7878

79-
For guidance on a creating full solutions with AKS for production, see [AKS solution guidance][aks-solution-guidance].
79+
For guidance on a designing an enterprise-scale implementation of AKS, see [Plan your AKS design][plan-aks-design].
8080

8181
<!-- LINKS - internal -->
82-
[aks-solution-guidance]: /azure/architecture/reference-architectures/containers/aks-start-here?WT.mc_id=AKSDOCSPAGE
82+
[plan-aks-design]: /azure/architecture/reference-architectures/containers/aks-start-here?toc=/azure/aks/toc.json&bc=/azure/aks/breadcrumb/toc.json

articles/aks/index.yml

Lines changed: 71 additions & 111 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ metadata:
1111
ms.topic: landing-page
1212
author: mgoedtel
1313
ms.author: magoedte
14-
ms.date: 09/26/2023
14+
ms.date: 01/12/2024
1515
# linkListType: architecture | concept | deploy | download | get-started | how-to-guide | learn | overview | quickstart | reference | sample | tutorial | video | whats-new
1616

1717
landingContent:
@@ -24,6 +24,8 @@ landingContent:
2424
links:
2525
- text: What is AKS?
2626
url: intro-kubernetes.md
27+
- text: Get started with AKS
28+
url: /azure/architecture/reference-architectures/containers/aks-start-here
2729
- linkListType: whats-new
2830
links:
2931
- text: Reduce image pull time with Artifact Streaming on AKS (Preview)
@@ -42,33 +44,9 @@ landingContent:
4244
url: kubernetes-action.md
4345
- text: Enable Azure resources to access AKS clusters using Trusted Access (Preview)
4446
url: trusted-access-feature.md
45-
- linkListType: concept
46-
links:
47-
- text: Kubernetes core concepts for AKS
48-
url: concepts-clusters-workloads.md
49-
- text: Clusters and workloads
50-
url: concepts-clusters-workloads.md
51-
- text: Access and identity
52-
url: concepts-identity.md
53-
- text: Security
54-
url: concepts-security.md
55-
- text: Networking
56-
url: concepts-network.md
57-
- text: Storage
58-
url: concepts-storage.md
59-
- text: Scale
60-
url: concepts-scale.md
61-
- linkListType: learn
62-
links:
63-
- text: Introduction to Azure Kubernetes Service
64-
url: /training/modules/intro-to-azure-kubernetes-service/
65-
- text: Introduction to containers on Azure
66-
url: /training/modules/intro-to-containers/
67-
- text: Build and store container images with Azure Container Registry
68-
url: /training/modules/build-and-store-container-images/
6947

7048
# Card (optional)
71-
- title: Deploy an AKS cluster in 5 minutes
49+
- title: Evaluate Linux-based AKS cluster
7250
linkLists:
7351
- linkListType: quickstart
7452
links:
@@ -82,11 +60,44 @@ landingContent:
8260
url: ./learn/quick-kubernetes-deploy-rm-template.md
8361
- text: Terraform
8462
url: ./learn/quick-kubernetes-deploy-terraform.md
63+
64+
# Card (optional)
65+
- title: Evaluate application deployment on AKS
66+
linkLists:
67+
- linkListType: tutorial
68+
links:
69+
- text: 1. Prepare an application for AKS
70+
url: tutorial-kubernetes-prepare-app.md
71+
- text: 2. Deploy and use Azure Container Registry
72+
url: tutorial-kubernetes-prepare-acr.md
73+
- text: 3. Deploy an AKS cluster
74+
url: tutorial-kubernetes-deploy-cluster.md
75+
- text: 4. Run your application
76+
url: tutorial-kubernetes-deploy-application.md
77+
- text: 5. Scale applications
78+
url: tutorial-kubernetes-scale.md
79+
- text: 6. Update an application
80+
url: tutorial-kubernetes-app-update.md
81+
- text: 7. Upgrade Kubernetes in AKS
82+
url: tutorial-kubernetes-upgrade-cluster.md
8583

86-
# Card
87-
- title: Deploy an application in 5 minutes
84+
# Card
85+
- title: Evaluate Windows-based AKS cluster
8886
linkLists:
89-
- linkListType: quickstart
87+
- linkListType: concept
88+
links:
89+
- text: Windows Server containers FAQ
90+
url: windows-faq.md
91+
- linkListType: quickstart
92+
links:
93+
- text: Create a Windows Server container using the Azure CLI
94+
url: learn/quick-windows-container-deploy-cli.md
95+
- text: Create a Windows Server container using the Azure PowerShell
96+
url: learn/quick-windows-container-deploy-powershell.md
97+
# Card
98+
- title: Evaluate application deployment methods
99+
linkLists:
100+
- linkListType: tutorial
90101
links:
91102
- text: Develop with Helm
92103
url: quickstart-helm.md
@@ -96,96 +107,32 @@ landingContent:
96107
url: draft-devx-extension-aks.md
97108
- text: Use Automated Deployments
98109
url: automated-deployments.md
99-
- linkListType: how-to-guide
100-
links:
101-
- text: Use Bridge to Kubernetes with Visual Studio Code
102-
url: https://code.visualstudio.com/docs/containers/bridge-to-kubernetes
103-
- text: Use Bridge to Kubernetes with Visual Studio
104-
url: /visualstudio/containers/bridge-to-kubernetes
105-
- text: Run Java Open Liberty
106-
url: howto-deploy-java-liberty-app.md
107-
- text: Run Java WebLogic Server
108-
url: howto-deploy-java-wls-app.md
109-
110+
110111
# Card
111112
- title: Architecture guidance
112113
linkLists:
113114
- linkListType: architecture
114115
links:
115-
- text: Baseline architecture
116-
url: /azure/architecture/reference-architectures/containers/aks/secure-baseline-aks?WT.mc_id=AKSDOCSPAGE
117-
- text: Baseline for microservices
118-
url: /azure/architecture/reference-architectures/containers/aks-microservices/aks-microservices-advanced?WT.mc_id=AKSDOCSPAGE
119-
- text: Baseline for PCI-DSS 3.2.1
120-
url: /azure/architecture/reference-architectures/containers/aks-pci/aks-pci-intro?WT.mc_id=AKSDOCSPAGE
121-
- text: Baseline for multiregion
122-
url: /azure/architecture/reference-architectures/containers/aks-multi-region/aks-multi-cluster?WT.mc_id=AKSDOCSPAGE
123-
- text: Day-2 operations guide
124-
url: /azure/architecture/operator-guides/aks/day-2-operations-guide?WT.mc_id=AKSDOCSPAGE
125-
- text: Best practices for cluster operators and developers
126-
url: best-practices.md
127-
- text: Other AKS solutions
128-
url: /azure/architecture/reference-architectures/containers/aks-start-here?WT.mc_id=AKSDOCSPAGE
129-
130-
- title: Configure your cluster for Windows containers
131-
linkLists:
132-
- linkListType: quickstart
133-
links:
134-
- text: Create a Windows Server container using the Azure CLI
135-
url: learn/quick-windows-container-deploy-cli.md
136-
- text: Create a Windows Server container using the Azure PowerShell
137-
url: learn/quick-windows-container-deploy-powershell.md
138-
- linkListType: concept
139-
links:
140-
- text: Windows Server node security
141-
url: concepts-security.md#node-security
142-
- text: Security baseline
143-
url: /security/benchmark/azure/baselines/aks-security-baseline?context=%2Fazure%2Faks%2Fcontext%2Faks-context
144-
- text: Windows AKS customer stories
145-
url: windows-aks-customer-stories.md
146-
- linkListType: how-to-guide
147-
links:
148-
- text: Upgrade from Windows Server 2019 to 2022
149-
url: ./upgrade-windows-2019-2022.md
150-
- text: Create Dockerfiles for Windows Server containers
151-
url: /virtualization/windowscontainers/manage-docker/manage-windows-dockerfile?context=%2Fazure%2Faks%2Fcontext%2Faks-context
152-
- text: Optimize Dockerfiles for Windows Server containers
153-
url: /virtualization/windowscontainers/manage-docker/optimize-windows-dockerfile?context=%2Fazure%2Faks%2Fcontext%2Faks-context
154-
- text: Use HostProcess containers
155-
url: use-windows-hpc.md
156-
- text: Enable network policies
157-
url: ./use-network-policies.md
158-
- text: Use Azure disks CSI drivers
159-
url: azure-disk-csi.md#windows-containers
160-
- text: Use Azure files CSI drivers
161-
url: azure-files-csi.md#windows-containers
162-
- text: Connect to Windows Server nodes over RDP
163-
url: rdp.md
164-
- text: Connect to Windows Server nodes over SSH
165-
url: node-access.md#windows-server-proxy-connection
166-
- text: Windows Server containers FAQ
167-
url: windows-faq.md
116+
- text: Baseline architecture
117+
url: /azure/architecture/reference-architectures/containers/aks/secure-baseline-aks?WT.mc_id=AKSDOCSPAGE
118+
- text: Baseline for microservices
119+
url: /azure/architecture/reference-architectures/containers/aks-microservices/aks-microservices-advanced?WT.mc_id=AKSDOCSPAGE
120+
- text: Baseline for PCI-DSS 3.2.1
121+
url: /azure/architecture/reference-architectures/containers/aks-pci/aks-pci-intro?WT.mc_id=AKSDOCSPAGE
122+
- text: Baseline for multiregion
123+
url: /azure/architecture/reference-architectures/containers/aks-multi-region/aks-multi-cluster?WT.mc_id=AKSDOCSPAGE
168124

169125
# Card
170-
- title: Deploy, manage, and update applications
126+
- title: Production deployment guidance
171127
linkLists:
172-
- linkListType: tutorial
128+
- linkListType: deploy
173129
links:
174-
- text: 1. Prepare an application for AKS
175-
url: tutorial-kubernetes-prepare-app.md
176-
- text: 2. Deploy and use Azure Container Registry
177-
url: tutorial-kubernetes-prepare-acr.md
178-
- text: 3. Deploy an AKS cluster
179-
url: tutorial-kubernetes-deploy-cluster.md
180-
- text: 4. Run your application
181-
url: tutorial-kubernetes-deploy-application.md
182-
- text: 5. Scale applications
183-
url: tutorial-kubernetes-scale.md
184-
- text: 6. Update an application
185-
url: tutorial-kubernetes-app-update.md
186-
- text: 7. Upgrade Kubernetes in AKS
187-
url: tutorial-kubernetes-upgrade-cluster.md
188-
130+
- text: AKS Landing Zone accelerator
131+
url: /azure/cloud-adoption-framework/scenarios/app-platform/aks/landing-zone-accelerator
132+
- text: AKS baseline cluster reference implementation (GitHub)
133+
url: https://github.com/mspnp/aks-baseline
134+
135+
# Card
189136
- title: Extend the capabilities of your cluster
190137
linkLists:
191138
- linkListType: concept
@@ -198,6 +145,20 @@ landingContent:
198145
url: cluster-extensions.md
199146
- text: GitHub Actions for AKS
200147
url: integrations.md#github-actions
148+
149+
# Card
150+
- title: Operations guidance
151+
linkLists:
152+
- linkListType: how-to-guide
153+
links:
154+
- text: Day-2 operations guide
155+
url: /azure/architecture/operator-guides/aks/day-2-operations-guide?WT.mc_id=AKSDOCSPAGE
156+
- text: Best practices for cluster operators and developers
157+
url: best-practices.md
158+
- text: Plan how to monitor AKS
159+
url: monitor-aks.md
160+
- text: Plan how to monitor AKS cluster networks
161+
url: network-observability-overview.md
201162
# Card
202163
- title: Troubleshooting
203164
linkLists:
@@ -209,4 +170,3 @@ landingContent:
209170
url: /troubleshoot/azure/azure-kubernetes//troubleshoot-aks-cluster-creation-issues
210171
- text: Troubleshoot common issues
211172
url: /troubleshoot/azure/azure-kubernetes/aks-common-issues-faq
212-

articles/aks/learn/quick-kubernetes-deploy-bicep-extensibility-kubernetes-provider.md

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
---
2-
title: 'Quickstart: Create an Azure Kubernetes Service (AKS) cluster using the Bicep extensibility Kubernetes provider'
3-
description: Learn how to quickly create a Kubernetes cluster using the Bicep extensibility Kubernetes provider and deploy an application in Azure Kubernetes Service (AKS).
2+
title: 'Quickstart: Deploy an Azure Kubernetes Service (AKS) cluster using the Bicep extensibility Kubernetes provider'
3+
description: Learn how to quickly deploy a Kubernetes cluster using the Bicep extensibility Kubernetes provider and deploy an application in Azure Kubernetes Service (AKS).
44
ms.topic: quickstart
55
ms.custom: devx-track-bicep
6-
ms.date: 12/27/2023
7-
#Customer intent: As a developer or cluster operator, I want to quickly create an AKS cluster and deploy an application so that I can see how to run applications using the managed Kubernetes service in Azure.
6+
ms.date: 01/11/2024
7+
#Customer intent: As a developer or cluster operator, I want to quickly deploy an AKS cluster and deploy an application so that I can see how to run applications using the managed Kubernetes service in Azure.
88
---
99

10-
# Quickstart: Deploy an Azure Kubernetes Service (AKS) cluster using the Bicep extensibility Kubernetes provider (Preview)
10+
# Quickstart: Deploy an Azure Kubernetes Service (AKS) cluster using the Bicep extensibility Kubernetes provider (preview)
1111

1212
Azure Kubernetes Service (AKS) is a managed Kubernetes service that lets you quickly deploy and manage clusters. In this quickstart, you:
1313

@@ -27,6 +27,9 @@ Azure Kubernetes Service (AKS) is a managed Kubernetes service that lets you qui
2727
> }
2828
> ```
2929
30+
> [!NOTE]
31+
> To get started with quickly provisioning an AKS cluster, this article includes steps to deploy a cluster with default settings for evaluation purposes only. Before deploying a production-ready cluster, we recommend that you familiarize yourself with our [baseline reference architecture][baseline-reference-architecture] to consider how it aligns with your business requirements.
32+
3033
## Before you begin
3134
3235
* This quickstart assumes a basic understanding of Kubernetes concepts. For more information, see [Kubernetes core concepts for Azure Kubernetes Service (AKS)][kubernetes-concepts].
@@ -432,4 +435,5 @@ To learn more about AKS and walk through a complete code-to-deployment example,
432435
[new-azresourcegroup]: /powershell/module/az.resources/new-azresourcegroup
433436
[new-azresourcegroupdeployment]: /powershell/module/az.resources/new-azresourcegroupdeployment
434437
[az-sshkey-create]: /cli/azure/sshkey#az_sshkey_create
435-
[aks-solution-guidance]: /azure/architecture/reference-architectures/containers/aks-start-here?WT.mc_id=AKSDOCSPAGE
438+
[baseline-reference-architecture]: /azure/architecture/reference-architectures/containers/aks/baseline-aks?toc=/azure/aks/toc.json&bc=/azure/aks/breadcrumb/toc.json
439+
[aks-solution-guidance]: /azure/architecture/reference-architectures/containers/aks-start-here?toc=/azure/aks/toc.json&bc=/azure/aks/breadcrumb/toc.json

0 commit comments

Comments
 (0)