Skip to content

Commit 90f730f

Browse files
authored
Merge pull request #280445 from MicrosoftDocs/main
7/10 11:00 AM IST Publish
2 parents 56e8b63 + d62087d commit 90f730f

File tree

92 files changed

+639
-454
lines changed

Some content is hidden

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

92 files changed

+639
-454
lines changed

.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4502,6 +4502,11 @@
45024502
"source_path_from_root": "/articles/kubernetes-fleet/configuration-propagation.md",
45034503
"redirect_url": "/azure/kubernetes-fleet/resource-propagation"
45044504
},
4505+
{
4506+
"source_path_from_root": "/articles/aks/network-observability-byo-cli.md",
4507+
"redirect_url": "/azure/aks/network-observability-overview",
4508+
"redirect_document_id": false
4509+
},
45054510
{
45064511
"source_path_from_root": "/articles/orbital/license-spacecraft.md",
45074512
"redirect_url": "/azure/orbital/initiate-licensing",

articles/aks/TOC.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -693,8 +693,10 @@
693693
href: cost-analysis.md
694694
- name: Network Observability
695695
items:
696+
- name: Network Observability
697+
href: network-observability-managed-cli.md
696698
- name: Advanced Network Observability - Azure managed Prometheus and Grafana
697-
href: advanced-network-observability-cli.md
699+
href: advanced-network-observability-cli.md
698700
- name: Advanced Network Observability - Bring Your Own Prometheus and Grafana
699701
href: advanced-network-observability-bring-your-own-cli.md
700702
- name: Service Mesh

articles/aks/azure-csi-blob-storage-provision.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ The following table includes parameters you can use to define a custom storage c
4747
|skuName | Specify an Azure storage account type (alias: `storageAccountType`). | `Standard_LRS`, `Premium_LRS`, `Standard_GRS`, `Standard_RAGRS` | No | `Standard_LRS`|
4848
|location | Specify an Azure location. | `eastus` | No | If empty, driver will use the same location name as current cluster.|
4949
|resourceGroup | Specify an Azure resource group name. | myResourceGroup | No | If empty, driver will use the same resource group name as current cluster.|
50-
|storageAccount | Specify an Azure storage account name.| storageAccountName | - No for blobfuse mount </br> - Yes for NFSv3 mount. | - For blobfuse mount: if empty, driver finds a suitable storage account that matches `skuName` in the same resource group. If a storage account name is provided, storage account must exist. </br> - For NFSv3 mount, storage account name must be provided.|
50+
|storageAccount | Specify an Azure storage account name.| storageAccountName | - No | When a specific storage account name is not provided, the driver will look for a suitable storage account that matches the account settings within the same resource group. If it fails to find a matching storage account, it will create a new one. However, if a storage account name is specified, the storage account must already exist. |
5151
|networkEndpointType| Specify network endpoint type for the storage account created by driver. If privateEndpoint is specified, a [private endpoint][storage-account-private-endpoint] is created for the storage account. For other cases, a service endpoint will be created for NFS protocol.<sup>1</sup> | `privateEndpoint` | No | For an AKS cluster, add the AKS cluster name to the Contributor role in the resource group hosting the VNET.|
5252
|protocol | Specify blobfuse mount or NFSv3 mount. | `fuse`, `nfs` | No | `fuse`|
5353
|containerName | Specify the existing container (directory) name. | container | No | If empty, driver creates a new container name, starting with `pvc-fuse` for blobfuse or `pvc-nfs` for NFS v3. |

articles/aks/azure-csi-files-storage-provision.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ description: Learn how to create a static or dynamic persistent volume with Azur
55
ms.topic: article
66
ms.custom: devx-track-azurecli
77
ms.subservice: aks-storage
8-
ms.date: 06/28/2024
8+
ms.date: 07/09/2024
99
author: tamram
1010
ms.author: tamram
1111

@@ -57,6 +57,7 @@ The following table includes parameters you can use to define a custom storage c
5757
|shareName | Specify Azure file share name. | Existing or new Azure file share name. | No | If empty, driver generates an Azure file share name. |
5858
|shareNamePrefix | Specify Azure file share name prefix created by driver. | Share name can only contain lowercase letters, numbers, hyphens, and length should be fewer than 21 characters. | No |
5959
|skuName | Azure Files storage account type (alias: `storageAccountType`)| `Standard_LRS`, `Standard_ZRS`, `Standard_GRS`, `Standard_RAGRS`, `Standard_RAGZRS`,`Premium_LRS`, `Premium_ZRS` | No | `StandardSSD_LRS`<br> Minimum file share size for Premium account type is 100 GB.<br> ZRS account type is supported in limited regions.<br> NFS file share only supports Premium account type.|
60+
|storageAccount | Specify an Azure storage account name.| storageAccountName | - No | When a specific storage account name is not provided, the driver will look for a suitable storage account that matches the account settings within the same resource group. If it fails to find a matching storage account, it will create a new one. However, if a storage account name is specified, the storage account must already exist. |
6061
|storageEndpointSuffix | Specify Azure storage endpoint suffix. | `core.windows.net`, `core.chinacloudapi.cn`, etc. | No | If empty, driver uses default storage endpoint suffix according to cloud environment. For example, `core.windows.net`. |
6162
|tags | [Tags][tag-resources] are created in new storage account. | Tag format: 'foo=aaa,bar=bbb' | No | "" |
6263
|--- | **Following parameters are only for SMB protocol** | --- | --- |

articles/aks/long-term-support.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,8 @@ To carry out an in-place upgrade to the latest LTS version, you need to specify
128128
az aks upgrade --resource-group myResourceGroup --name myAKSCluster --kubernetes-version 1.32.2
129129
```
130130
> [!NOTE]
131-
> The next Long Term Support Version after 1.27 is to be determined. However Customers will get a minimum 6 months of overlap between 1.27 LTS and the next LTS version to plan upgrades.
131+
132+
> 1.30 is the next LTS version after 1.27. Customers will be able to upgrade from 1.27 LTS to 1.30 LTS starting August, 2024. 1.27 LTS goes End of Life by July 2025.
132133
> Kubernetes 1.32.2 is used as an example version in this article. Check the [AKS release tracker](release-tracker.md) for available Kubernetes releases.
133134
134135
## Frequently asked questions

articles/aks/network-observability-byo-cli.md

Lines changed: 0 additions & 235 deletions
This file was deleted.

0 commit comments

Comments
 (0)