Skip to content

Commit c5c5ac1

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into migrate
2 parents 6bcf7e2 + 2deea61 commit c5c5ac1

33 files changed

+165
-154
lines changed

articles/ai-services/document-intelligence/sdk-overview-v4-0.md

Lines changed: 31 additions & 31 deletions
Large diffs are not rendered by default.

articles/ai-services/document-intelligence/toc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ items:
1818
- name: Changelog and release history
1919
displayName: latest, update, beta, package, preview, version
2020
href: changelog-release-history.md
21-
- name: "SDK targets: REST API 2023–10–31-preview"
21+
- name: "SDK targets: REST API 2024–02–29-preview"
2222
displayName: get started, installation, downloads, documentAnalysisClient, document analysis client, Azure AD, Azure Active Directory, identity, changelog, package, version,AzureKeyCredential, Azure key credential, key, endpoint
2323
href: sdk-overview-v4-0.md
2424
- name: "SDK targets: REST API 2023–7–31 latest (GA)"

articles/aks/best-practices-app-cluster-reliability.md

Lines changed: 29 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -186,33 +186,37 @@ You can use the `nodeSelector` field in your pod specification to specify the no
186186
The following example pod definition file shows how to use pod anti-affinity to ensure that pods are spread across nodes:
187187

188188
```yaml
189-
apiVersion: v1
190-
kind: Pod
189+
apiVersion: apps/v1
190+
kind: Deployment
191191
metadata:
192-
name: with-node-affinity
192+
name: multi-zone-deployment
193+
labels:
194+
app: myapp
193195
spec:
194-
affinity:
195-
nodeAffinity:
196-
requiredDuringSchedulingIgnoredDuringExecution:
197-
nodeSelectorTerms:
198-
- matchExpressions:
199-
- key: topology.kubernetes.io/zone
200-
operator: In
201-
values:
202-
- 0 # Azure Availability Zone 0
203-
- 1 # Azure Availability Zone 1
204-
- 2 # Azure Availability Zone 2
205-
preferredDuringSchedulingIgnoredDuringExecution:
206-
- weight: 1
207-
preference:
208-
matchExpressions:
209-
- key: another-node-label-key
210-
operator: In
211-
values:
212-
- another-node-label-value
213-
containers:
214-
- name: with-node-affinity
215-
image: registry.k8s.io/pause:2.0
196+
replicas: 3
197+
selector:
198+
matchLabels:
199+
app: myapp
200+
template:
201+
metadata:
202+
labels:
203+
app: myapp
204+
spec:
205+
containers:
206+
- name: myapp-container
207+
image: nginx
208+
ports:
209+
- containerPort: 80
210+
affinity:
211+
podAntiAffinity:
212+
requiredDuringSchedulingIgnoredDuringExecution:
213+
- labelSelector:
214+
matchExpressions:
215+
- key: app
216+
operator: In
217+
values:
218+
- myapp
219+
topologyKey: topology.kubernetes.io/zone
216220
```
217221

218222
For more information, see [Affinity and anti-affinity in Kubernetes](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity).

articles/aks/learn/quick-kubernetes-deploy-azd.md

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: Learn how to quickly deploy a Kubernetes cluster and deploy an appl
44
ms.author: schaffererin
55
author: schaffererin
66
ms.topic: quickstart
7-
ms.date: 03/15/2024
7+
ms.date: 03/21/2024
88
ms.custom: H1Hack27Feb2017, mvc, devcenter, seo-javascript-september2019, seo-javascript-october2019, seo-python-october2019, contperf-fy21q1, mode-api, devx-track-extended-azdevcli
99
#Customer intent: As a developer or cluster operator, I want to deploy an AKS cluster and deploy an application so I can see how to run applications using the managed Kubernetes service in Azure.
1010
---
@@ -67,7 +67,7 @@ The quickstart application includes the following Kubernetes deployments and ser
6767
6868
The `azd` template contains all the code needed to create the services, but you need to sign in to your Azure account in order to host the application on AKS.
6969
70-
1. Sign in to your account using the [`azd auth login`][az-auth-login] command.
70+
1. Sign in to your account using the [`azd auth login`][azd-auth-login] command.
7171
7272
```azdeveloper
7373
azd auth login
@@ -97,7 +97,7 @@ The `azd` template contains all the code needed to create the services, but you
9797
9898
## Create and deploy resources for your cluster
9999
100-
`azd` runs all the hooks inside of the [`azd-hooks` folder](https://github.com/Azure-Samples/aks-store-demo/tree/main/azd-hooks) to preregister, provision, and deploy the application services.
100+
`azd` runs all the hooks inside of the [`azd-hooks` folder][azd-hooks-folder] to preregister, provision, and deploy the application services.
101101
102102
The `azd` template for this quickstart creates a new resource group with an AKS cluster and an Azure key vault. The key vault stores client secrets and runs the services in the `pets` namespace
103103
@@ -135,15 +135,19 @@ The `azd` template for this quickstart creates a new resource group with an AKS
135135
136136
## Test the application
137137
138-
When the application runs, a Kubernetes service exposes the application front end to the internet. This process can take a few minutes to complete.
138+
When the application runs, a Kubernetes service exposes the application front end to the internet. This process can take a few minutes to complete. To manage a Kubernetes cluster, use the Kubernetes command-line client, [kubectl][kubectl]. `kubectl` is already installed during `azd up`.
139139
140140
1. Set your namespace as the demo namespace `pets` using the [`kubectl set-context`][kubectl-set-context] command.
141141
142142
```console
143143
kubectl config set-context --current --namespace=pets
144144
```
145145
146-
2. Check the status of the deployed pods using the [`kubectl get pods`][kubectl-get-pods] command. Make sure all pods are `Running` before proceeding.
146+
2. Check the status of the deployed pods using the [`kubectl get pods`][kubectl-get] command. Make sure all pods are `Running` before proceeding.
147+
148+
```console
149+
kubectl get pods
150+
```
147151
148152
3. Check for a public IP address for the store-front application and monitor progress using the [`kubectl get service`][kubectl-get] command with the `--watch` argument.
149153
@@ -175,7 +179,7 @@ When the application runs, a Kubernetes service exposes the application front en
175179
176180
Once you're finished with the quickstart, clean up unnecessary resources to avoid Azure charges.
177181
178-
1. Delete all the resources created in the quickstart using the [`azd down`][az-down] command.
182+
1. Delete all the resources created in the quickstart using the [`azd down`][azd-down] command.
179183
180184
```azdeveloper
181185
azd down
@@ -215,26 +219,18 @@ To learn more about AKS and walk through a complete code-to-deployment example,
215219
> [AKS tutorial][aks-tutorial]
216220
217221
<!-- LINKS - external -->
222+
[azd-hooks-folder]: https://github.com/Azure-Samples/aks-store-demo/tree/main/azd-hooks
218223
[kubectl]: https://kubernetes.io/docs/reference/kubectl/
219-
[kubectl-apply]: https://kubernetes.io/docs/reference/generated/kubectl/kubectl-commands#apply
220224
[kubectl-get]: https://kubernetes.io/docs/reference/generated/kubectl/kubectl-commands#get
221225
[kubectl-set-context]: https://kubernetes.io/docs/reference/generated/kubectl/kubectl-commands#config-set-context
222-
[kubectl-get-pods]: https://kubernetes.io/docs/reference/generated/kubectl/kubectl-commands#get-pods
223226
224227
<!-- LINKS - internal -->
225228
[aks-tutorial]: ../tutorial-kubernetes-prepare-app.md
226-
[azure-resource-group]: ../../azure-resource-manager/management/overview.md
227-
[az-aks-create]: /cli/azure/aks#az-aks-create
228-
[az-aks-get-credentials]: /cli/azure/aks#az-aks-get-credentials
229-
[install-azure-cli]: /cli/azure/install-azure-cli
230-
[az-aks-install-cli]: /cli/azure/aks#az-aks-install-cli
231-
[az-group-create]: /cli/azure/group#az-group-create
232-
[az-group-delete]: /cli/azure/group#az-group-delete
233229
[azd-init]: /azure/developer/azure-developer-cli/reference#azd-init
234230
[azd-up]: /azure/developer/azure-developer-cli/reference#azd-up
235-
[az-auth-login]: /azure/developer/azure-developer-cli/reference#azd-auth-login
231+
[azd-down]: /azure/developer/azure-developer-cli/reference#azd-down
232+
[azd-auth-login]: /azure/developer/azure-developer-cli/reference#azd-auth-login
236233
[azd-install]: /azure/developer/azure-developer-cli/install-azd
237234
[kubernetes-concepts]: ../concepts-clusters-workloads.md
238-
[kubernetes-deployment]: ../concepts-clusters-workloads.md#deployments-and-yaml-manifests
239235
[aks-solution-guidance]: /azure/architecture/reference-architectures/containers/aks-start-here?toc=/azure/aks/toc.json&bc=/azure/aks/breadcrumb/toc.json
240236
[baseline-reference-architecture]: /azure/architecture/reference-architectures/containers/aks/baseline-aks?toc=/azure/aks/toc.json&bc=/azure/aks/breadcrumb/toc.json

articles/azure-maps/how-to-secure-sas-app.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
title: How to secure an Azure Maps application with a SAS token
33
titleSuffix: Azure Maps
44
description: Create an Azure Maps account secured with SAS token authentication.
5-
author: stack111
6-
ms.author: dstack
5+
author: eriklindeman
6+
ms.author: eriklind
77
ms.date: 06/08/2022
88
ms.topic: how-to
99
ms.service: azure-maps

articles/azure-vmware/deploy-disaster-recovery-using-vmware-hcx.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ The diagram shows the deployment of VMware HCX from on-premises VMware vSphere t
1616
:::image type="content" source="./media/disaster-recovery-virtual-machines/hcx-disaster-recovery-scenario-1-diagram.png" alt-text="Diagram shows the VMware HCX manual disaster recovery solution in Azure VMware Solution with on-premises VMware vSphere." border="true" lightbox="./media/disaster-recovery-virtual-machines/hcx-disaster-recovery-scenario-1-diagram.png":::
1717

1818
>[!IMPORTANT]
19-
>Although part of VMware HCX, VMware HCX Disaster Recovery (DR) is not recommended for large deployments. The disaster recovery orchestration is 100% manual, and Azure VMware Solution currently doesn't have runbooks or features to support manual VMware HCX DR failover. For enterprise-class disaster recovery, refer to VMware Site Recovery Manager (SRM) or VMware business continuity and disaster recovery (BCDR) solutions.
19+
>Although part of VMware HCX, VMware HCX Disaster Recovery (DR) is not recommended for large deployments. The disaster recovery orchestration is 100% manual, and Azure VMware Solution currently doesn't have runbooks or features to support manual VMware HCX DR failover. For enterprise-class disaster recovery, refer to VMware Site Recovery Manager (SRM) or VMware Business Continuity and Disaster Recovery (BCDR) solutions.
2020
21-
VMware HCX provides various operations that provide fine control and granularity in replication policies. Available Operations include:
21+
VMware HCX provides various operations for fine control and granularity in replication policies. Available Operations include:
2222

2323
- **Reverse** – After a disaster occurs, reverse helps make Site B the source site and Site A, where the protected VM now lives.
2424

articles/azure-vmware/enable-public-ip-nsx-edge.md

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ A Source Network Address Translation (SNAT) service with Port Address Translatio
9090
9191
#### Create a SNAT rule
9292

93-
1. In your Azure VMware Solution private cloud, select **vCenter Server Credentials**.
93+
1. In your Azure VMware Solution private cloud, select **VMware credentials**.
9494
1. Locate your NSX Manager URL and credentials.
9595
1. Sign in to VMware NSX Manager.
9696
1. Go to **NAT Rules**.
@@ -116,7 +116,8 @@ For more information on NSX-T Data Center NAT configuration and options, see the
116116

117117
You can create a No-NAT or No-SNAT rule in NSX Manager to exclude certain matches from performing NAT. This policy can be used to allow private IP address traffic to bypass existing network translation rules.
118118

119-
1. In your Azure VMware Solution private cloud, select **vCenter Server Credentials**.
119+
1. In your Azure VMware Solution private cloud, select **VMware credentials**.
120+
1. Locate your NSX Manager URL and credentials.
120121
1. Sign in to NSX Manager, and then select **NAT Rules**.
121122
1. Select the T1 router, and then select **Add NAT Rule**.
122123
1. Select **No SNAT** rule as the type of NAT rule.
@@ -129,7 +130,8 @@ A Destination Network Translation (DNAT) service is used to expose a VM on a spe
129130

130131
#### Create a DNAT rule
131132

132-
1. In your Azure VMware Solution private cloud, select **vCenter Server Credentials**.
133+
1. In your Azure VMware Solution private cloud, select **VMware credentials**.
134+
1. Locate your NSX Manager URL and credentials.
133135
1. Sign in to NSX Manager, and then select **NAT Rules**.
134136
1. Select the T1 router, and then select **Add DNAT Rule**.
135137
1. Enter a name for the rule.
@@ -147,6 +149,7 @@ The VM is now exposed to the internet on the specific public IP address or on sp
147149
You can provide security protection for your network traffic in and out of the public internet through your gateway firewall.
148150

149151
1. In your Azure VMware Solution private cloud, select **VMware credentials**.
152+
1. Locate your NSX Manager URL and credentials.
150153
1. Sign in to NSX Manager.
151154
1. On the NSX-T overview page, select **Gateway Policies**.
152155
1. Select **Gateway Specific Rules**, choose the T1 gateway, and then select **Add Policy**.

articles/azure-vmware/introduction.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ The following table provides a detailed list of roles and responsibilities betwe
158158
| -------- | ---------------- |
159159
| Microsoft - Azure VMware Solution | Physical infrastructure<ul><li>Azure regions</li><li>Azure availability zones</li><li>Express Route/Global Reach</ul></li>Compute/Network/Storage<ul><li>Rack and power Bare Metal hosts</li><li>Rack and power network equipment</ul></li>Private cloud deploy/lifecycle<ul><li>VMware ESXi deploy, patch, and upgrade</li><li>VMware vCenter Servers deploy, patch, and upgrade</li><li>VMware NSX-T Data Centers deploy, patch, and upgrade</li><li>VMware vSAN deploy, patch, and upgrade</ul></li>Private cloud Networking - VMware NSX-T Data Center provider config<ul><li>Microsoft Edge node/cluster, VMware NSX-T Data Center host preparation</li><li>Provider Tier-0 and Tenant Tier-1 Gateway</li><li>Connectivity from Tier-0 (using BGP) to Azure Network via ExpressRoute</ul></li>Private cloud compute - VMware vCenter Server provider config<ul><li>Create default cluster</li><li>Configure virtual networking for vMotion, Management, vSAN, and others</ul></li>Private cloud backup/restore<ul><li>Back up and restore VMware vCenter Server</li><li>Back up and restore VMware NSX-T Data Center NSX-T Manager</ul></li>Private cloud health monitoring and corrective actions, for example: replace failed hosts</br><br>(optional) VMware HCX deploys with fully configured compute profile on cloud side as add-on</br><br>(optional) VMware SRM deploys, upgrade, and scale up/down</br><br>Support - Private cloud platforms and VMware HCX |
160160
| Customer | Request Azure VMware Solution host quote with Microsoft<br>Plan and create a request for private clouds on Azure portal with:<ul><li>Host count</li><li>Management network range</li><li>Other information</ul></li>Configure private cloud network and security (VMware NSX-T Data Center)<ul><li>Network segments to host applications</li><li>More Tier -1 routers</li><li>Firewall</li><li>VMware NSX-T Data Center LB</li><li>IPsec VPN</li><li>NAT</li><li>Public IP addresses</li><li>Distributed firewall/gateway firewall</li><li>Network extension using VMware HCX or VMware NSX-T Data Center</li><li>AD/LDAP config for RBAC</ul></li>Configure private cloud - VMware vCenter Server<ul><li>AD/LDAP config for RBAC</li><li>Deploy and lifecycle management of Virtual Machines (VMs) and application<ul><li>Install operating systems</li><li>Patch operating systems</li><li>Install antivirus software</li><li>Install backup software</li><li>Install configuration management software</li><li>Install application components</li><li>VM networking using VMware NSX-T Data Center segments</ul></li><li>Migrate Virtual Machines (VMs)<ul><li>VMware HCX configuration</li><li>Live vMotion</li><li>Cold migration</li><li>Content library sync</ul></li></ul></li>Configure private cloud - vSAN<ul><li>Define and maintain vSAN VM policies</li><li>Add hosts to maintain adequate 'slack space'</ul></li>Configure VMware HCX<ul><li>Download and deploy HCA connector OVA in on-premises</li><li>Pairing on-premises VMware HCX connector</li><li>Configure the network profile, compute profile, and service mesh</li><li>Configure VMware HCX network extension/MON</li><li>Upgrade/updates</ul></li>Network configuration to connect to on-premises, virtual network, or internet</br><br>Add or delete hosts requests to cluster from Portal</br><br>Deploy/lifecycle management of partner (third party) solutions |
161-
| Partner ecosystem | Support for their product/solution. For reference, the following are some of the supported Azure VMware Solution partner solution/product:<ul><li>BCDR - VMware SRM, JetStream, Zerto, and others</li><li>Backup - Veeam, Commvault, Rubrik, and others</li><li>VDI - Horizon/Citrix</li><li>Multitenancy for enterprises - VMware Cloud Director Service (CDS), VMware vCloud Director Availability (VCDA)</li><li>Security solutions - BitDefender, TrendMicro, Checkpoint</li><li>Other VMware products - Aria Suite, NSX Advanced Load Balancer |
161+
| Partner ecosystem | Support for their product/solution. For reference, the following are some of the supported Azure VMware Solution partner solution/product:<ul><li>BCDR - VMware SRM, JetStream, Zerto, and others</li><li>Backup - Veeam, Commvault, Rubrik, and others</li><li>VDI - Horizon, Citrix</li><li>Multitenancy for enterprises - VMware Cloud Director Service (CDS), VMware vCloud Director Availability (VCDA)</li><li>Security solutions - BitDefender, TrendMicro, Checkpoint</li><li>Other VMware products - Aria Suite, NSX Advanced Load Balancer |
162162

163163

164164
## Next steps

articles/azure-vmware/rotate-cloudadmin-credentials.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Consider and determine which services connect to vCenter Server as *cloudadmin@v
2222

2323
One way to determine which services authenticate to vCenter Server with the cloudadmin user is to inspect vSphere events using the vSphere Client for your private cloud. After you identify such services, and before rotating the password, you must stop these services. Otherwise, the services won't work after you rotate the password. You can also experience temporary locks on your vCenter Server CloudAdmin account, as these services continuously attempt to authenticate using a cached version of the old credentials.
2424

25-
Instead of using the cloudadmin user to connect services to vCenter Server or NSX-T Data Center, we recommend individual accounts for each service. For more information about setting up separate accounts for connected services, see [Access and Identity Concepts](./concepts-identity.md).
25+
Instead of using the cloudadmin user to connect services to vCenter Server or NSX-T, we recommend individual accounts for each service. For more information about setting up separate accounts for connected services, see [Access and Identity Concepts](./concepts-identity.md).
2626

2727
## Reset your vCenter Server credentials
2828

0 commit comments

Comments
 (0)