Skip to content

Commit 27713f0

Browse files
authored
Merge pull request #227187 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents 47349a3 + 1815c4f commit 27713f0

File tree

6 files changed

+12
-5
lines changed

6 files changed

+12
-5
lines changed

articles/aks/internal-lb.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ ms.date: 03/04/2019
1616
# Use an internal load balancer with Azure Kubernetes Service (AKS)
1717

1818
You can create and use an internal load balancer to restrict access to your applications in Azure Kubernetes Service (AKS).
19-
An internal load balancer makes a Kubernetes service accessible only to applications running in the same virtual network as the Kubernetes cluster. This article shows you how to create and use an internal load balancer with AKS.
19+
An internal load balancer does not have a public IP and makes a Kubernetes service accessible only to applications that can reach the private IP. These applications can be within the same VNET or in another VNET through VNET peering. This article shows you how to create and use an internal load balancer with AKS.
2020

2121
> [!NOTE]
2222
> Azure Load Balancer is available in two SKUs: *Basic* and *Standard*. The *Standard* SKU is used by default when you create an AKS cluster. When you create a *LoadBalancer* service type, you'll get the same load balancer type as when you provisioned the cluster. For more information, see [Azure Load Balancer SKU comparison][azure-lb-comparison].

articles/azure-arc/kubernetes/validation-program.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ The following providers and their corresponding Kubernetes distributions have su
2424
| Provider name | Distribution name | Version |
2525
| ------------ | ----------------- | ------- |
2626
| RedHat | [OpenShift Container Platform](https://www.openshift.com/products/container-platform) | [4.9.43](https://docs.openshift.com/container-platform/4.9/release_notes/ocp-4-9-release-notes.html), [4.10.23](https://docs.openshift.com/container-platform/4.10/release_notes/ocp-4-10-release-notes.html), 4.11.0-rc.6 |
27-
| VMware | [Tanzu Kubernetes Grid](https://tanzu.vmware.com/kubernetes-grid) | TKGm 1.6.0; upstream K8s v1.23.8+vmware.2 <br>TKGm 1.5.3; upstream K8s v1.22.8+vmware.1 <br>TKGm 1.4.0; upstream K8s v1.21.2+vmware.1 <br>TKGm 1.3.1; upstream K8s v1.20.5_vmware.2 <br>TKGm 1.2.1; upstream K8s v1.19.3+vmware.1 |
27+
| VMware | [Tanzu Kubernetes Grid](https://tanzu.vmware.com/kubernetes-grid) | TKG 2.1.0; upstream K8s v1.24.9_vmware.1 <br> TKGm 1.6.0; upstream K8s v1.23.8+vmware.2 <br>TKGm 1.5.3; upstream K8s v1.22.8+vmware.1 <br>TKGm 1.4.0; upstream K8s v1.21.2+vmware.1 <br>TKGm 1.3.1; upstream K8s v1.20.5_vmware.2 <br>TKGm 1.2.1; upstream K8s v1.19.3+vmware.1 |
2828
| Canonical | [Charmed Kubernetes](https://ubuntu.com/kubernetes) | [1.24](https://ubuntu.com/kubernetes/docs/1.24/components) |
2929
| SUSE Rancher | [Rancher Kubernetes Engine](https://rancher.com/products/rke/) | RKE CLI version: [v1.3.13](https://github.com/rancher/rke/releases/tag/v1.3.13); Kubernetes versions: 1.24.2, 1.23.8 |
3030
| Nutanix | [Nutanix Kubernetes Engine](https://www.nutanix.com/products/kubernetes-engine) | Version [2.5](https://portal.nutanix.com/page/documents/details?targetId=Nutanix-Kubernetes-Engine-v2_5:Nutanix-Kubernetes-Engine-v2_5); upstream K8s v1.23.11 |

articles/dns/dns-private-resolver-overview.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,8 @@ Azure DNS Private Resolver is available in the following regions:
6464
| South Central US | France Central | Korea Central |
6565
| North Central US | Sweden Central | South Africa North|
6666
| West Central US | Switzerland North| Australia East |
67-
| West US 3 | | Central India |
67+
| West US 2 | | Central India |
68+
| West US 3 | | |
6869
| Canada Central | | |
6970
| Brazil South | | |
7071

articles/dns/private-dns-privatednszone.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ To understand how many private DNS zones you can create in a subscription and ho
3232
| --- | --- | --- |
3333
|azclient.ms | azclient.us | azclient.cn
3434
|azure.com | azure.us | azure.cn
35-
|azure-api.net | azure-api.us | azure-api.cn
3635
|cloudapp.net | usgovcloudapp.net | chinacloudapp.cn
3736
|core.windows.net | core.usgovcloudapi.net | core.chinacloudapi.cn
3837
|microsoft.com | microsoft.us | microsoft.cn

articles/iot-edge/how-to-store-data-blob.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,8 @@ You can use [Azure Storage Explorer](https://azure.microsoft.com/features/storag
197197

198198
1. Download and install Azure Storage Explorer
199199

200+
1. The latest version of Azure Storage Explorer uses a newer storage API version not supported by the blob storage module. Start Azure Storage Explorer. Select the **Edit** menu. Verify the **Target Azure Stack Hub APIs** is selected. If it isn't, select **Target Azure Stack Hub**. Restart Azure Storage Explorer for the change to take effect. This configuration is required for compatibility with your IoT Edge environment.
201+
200202
1. Connect to Azure Storage using a connection string
201203

202204
1. Provide connection string: `DefaultEndpointsProtocol=http;BlobEndpoint=http://<host device name>:11002/<your local account name>;AccountName=<your local account name>;AccountKey=<your local account key>;`

articles/virtual-machine-scale-sets/virtual-machine-scale-sets-upgrade-scale-set.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -301,6 +301,9 @@ To update existing VMs, you must do a "manual upgrade" of each existing VM. You
301301
az vmss update-instances --resource-group myResourceGroup --name myScaleSet --instance-ids {instanceIds}
302302
```
303303
304+
> [!NOTE]
305+
> The `az vmss update-instances` command will manually upgrade the selected instance to the latest model. While upgrading, the instance may be restarted.
306+
304307
- You can also use the language-specific [Azure SDKs](https://azure.microsoft.com/downloads/).
305308
306309
>[!NOTE]
@@ -326,8 +329,10 @@ There is one type of modification to global scale set properties that does not f
326329
az vmss reimage --resource-group myResourceGroup --name myScaleSet --instance-id instanceId
327330
```
328331
329-
- You can also use the language-specific [Azure SDKs](https://azure.microsoft.com/downloads/).
332+
> [!NOTE]
333+
> The `az vmss reimage` command will reimage the selected instance, restoing him to the initial state. The instance may be restarted, and any local data will be lost.
330334
335+
- You can also use the language-specific [Azure SDKs](https://azure.microsoft.com/downloads/).
331336
332337
## Properties with restrictions on modification
333338

0 commit comments

Comments
 (0)