Skip to content

Commit 40a3af4

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into cust-intents-yechiel
2 parents 919dcbb + a90f286 commit 40a3af4

File tree

51 files changed

+665
-735
lines changed

Some content is hidden

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

51 files changed

+665
-735
lines changed

articles/app-service/app-service-plan-manage.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,9 @@ You can create an empty App Service plan, or you can create a plan as part of ap
5050

5151
## Move an app to another App Service plan
5252

53-
You can move an app to another App Service plan, as long as the source plan and the target plan are in the _same resource group and geographical region and of the same OS type_. Any change in type, such as Windows to Linux or any type that's different from the originating type, isn't supported.
53+
You can move an app to another App Service plan, as long as the source plan and the target plan are in the _same resource group and geographical region and of the same OS type_. Any change in type, such as Windows to Linux or any type that's different from the originating type, isn't supported.
54+
55+
Any VNET integration configured on the app must be disabled prior to changing App Service plans.
5456

5557

5658
> [!NOTE]

articles/azure-app-configuration/howto-import-export-data.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ ms.author: malev
1414

1515
Azure App Configuration supports data import and export operations. Use these operations to work with configuration data in bulk and exchange data between your App Configuration store and code project. For example, you can set up one App Configuration store for testing and another one for production. You can copy application settings between them so that you don't have to enter data twice.
1616

17-
This article provides a guide for importing and exporting data using either the [Azure portal](https://portal.azure.com) or the [Azure CLI](./scripts/cli-import.md). If you have adopted [Configuration as Code](./howto-best-practices.md#configuration-as-code) and manage your configurations in GitHub or Azure Devops, you can set up ongoing configuration file import using [GitHub Actions](./push-kv-github-action.md) or use the [Azure Pipeline Push Task](./push-kv-devops-pipeline.md).
17+
This article provides a guide for importing and exporting data using either the [Azure portal](https://portal.azure.com) or the [Azure CLI](./scripts/cli-import.md). If you have adopted [Configuration as Code](./howto-best-practices.md#configuration-as-code) and manage your configurations in GitHub or Azure DevOps, you can set up ongoing configuration file import using [GitHub Actions](./push-kv-github-action.md) or use the [Azure Pipeline Push Task](./push-kv-devops-pipeline.md).
1818

1919
## Import data
2020

articles/azure-cache-for-redis/cache-how-to-upgrade.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ This table contains the information for which Redis version are available in eac
3636
| Tier | Available Redis version |
3737
|:---------------------------- |:------------------------------------:|
3838
| Basic, Standard, Premium | 6.0 (GA) |
39-
| Enterprise, Enterprise Flash | Redis 6.0 (GA), Redis 7.2 (preview) |
39+
| Enterprise, Enterprise Flash | 7.2 (GA) |
4040

4141
## How to upgrade - Basic, Standard, and Premium tiers
4242

articles/azure-cache-for-redis/cache-tutorial-aks-get-started.md

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ms.date: 10/01/2024
99

1010
# Tutorial: Connect to Azure Cache for Redis from your application hosted on Azure Kubernetes Service
1111

12-
In this tutorial, you adapt the [AKS sample voting application](https://github.com/Azure-Samples/azure-voting-app-redis/tree/master) to use with an Azure Cache for Redis instance instead. The original sample uses a Redis cache deployed as a container to your AKS cluster. Following some simple steps, you can configure the AKS sample voting application to connect to your Azure Cache for Redis instance.
12+
In this tutorial, you use this [sample](https://github.com/Azure-Samples/azure-cache-redis-samples/tree/main/tutorial/connect-from-aks) to connect with an Azure Cache for Redis instance.
1313

1414
## Prerequisites
1515

@@ -37,16 +37,18 @@ In this tutorial, you adapt the [AKS sample voting application](https://github.c
3737

3838
## Run sample locally
3939

40-
To run this sample locally, configure your user principal as a Redis User on your Redis instance. The code sample will use your user principal through (DefaultAzureCredential)[https://learn.microsoft.com/en-us/dotnet/azure/sdk/authentication/?tabs=command-line#use-defaultazurecredential-in-an-application] to connect to Redis instance.
40+
To run this sample locally, configure your user principal as a Redis User on your Redis instance. The code sample uses your user principal through [DefaultAzureCredential](/dotnet/azure/sdk/authentication/?tabs=command-line#use-defaultazurecredential-in-an-application) to connect to Redis instance.
4141

4242
## Configure your AKS cluster
4343

44-
Follow these [steps](/azure/aks/workload-identity-deploy-cluster) to configure a workload identity for your AKS cluster. Complete the following steps:
44+
Follow these [steps](/azure/aks/workload-identity-deploy-cluster) to configure a workload identity for your AKS cluster.
4545

46-
- Enable OIDC issuer and workload identity
47-
- Skip the step to create user assigned managed identity if you already created your managed identity. If you create a new managed identity, ensure that you create a new Redis User for your managed identity and assign appropriate data access permissions.
48-
- Create a Kubernetes Service account annotated with the client ID of your user assigned managed identity
49-
- Create a federated identity credential for your AKS cluster.
46+
Then, complete the following steps:
47+
48+
- Enable OIDC issuer and workload identity
49+
- Skip the step to create user assigned managed identity if you already created your managed identity. If you create a new managed identity, ensure that you create a new Redis User for your managed identity and assign appropriate data access permissions.
50+
- Create a Kubernetes Service account annotated with the client ID of your user assigned managed identity
51+
- Create a federated identity credential for your AKS cluster.
5052

5153
## Configure your workload that connects to Azure Cache for Redis
5254

@@ -194,4 +196,4 @@ kubectl delete pod entrademo-pod
194196

195197
- [Quickstart: Deploy an Azure Kubernetes Service (AKS) cluster using the Azure portal](/azure/aks/learn/quick-kubernetes-deploy-portal)
196198
- [Quickstart: Deploy and configure workload identity on an Azure Kubernetes Service (AKS) cluster](/azure/aks/workload-identity-deploy-cluster)
197-
- [Azure Cache for Redis Entra ID Authentication](/azure/azure-cache-for-redis/cache-azure-active-directory-for-authentication)
199+
- [Azure Cache for Redis Microsoft Entra ID Authentication](/azure/azure-cache-for-redis/cache-azure-active-directory-for-authentication)

articles/azure-netapp-files/azure-netapp-files-delegate-subnet.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ services: azure-netapp-files
55
author: b-hchen
66
ms.service: azure-netapp-files
77
ms.topic: how-to
8-
ms.date: 09/28/2023
8+
ms.date: 10/09/2024
99
ms.author: anfdocs
1010
---
1111
# Delegate a subnet to Azure NetApp Files
@@ -14,20 +14,20 @@ You must delegate a subnet to Azure NetApp Files. When you create a volume, you
1414

1515
## Considerations
1616

17-
* When creating the delegated subnet for Azure NetApp Files, the size of the subnet matters. A subnet with a /28 network mask provides (only) 11 usable IP addresses, which might be insufficient for certain use cases. In that case, you should plan for a larger delegated subnet. For instance, a subnet with a /26 network mask provides 59 and a /24 network mask provides 251 available IP addresses respectively. You should consider even larger subnets (for example, /23 network mask) in scenarios where application volume group for SAP HANA is used and where many volumes and storage endpoints are anticipated. The network mask of the delegated network can't be changed after the initial creation. Make sure to plan your VNet and delegated subnet sizes consciously.
17+
* When creating the delegated subnet for Azure NetApp Files, the size of the subnet matters. A subnet with a /28 network mask provides (only) 11 usable IP addresses, which might be insufficient for certain use cases. In that case, you should plan for a larger delegated subnet. For instance, a subnet with a /26 network mask provides 59 and a /24 network mask provides 251 available IP addresses respectively. You should consider even larger subnets (for example, /23 network mask) in scenarios where application volume group for SAP HANA is used and where many volumes and storage endpoints are anticipated. The network mask of the delegated network can't be changed after the initial creation. Make sure to plan your virtual network (VNet) and delegated subnet sizes consciously.
1818
* In each VNet, only one subnet can be delegated to Azure NetApp Files.
1919
Azure enables you to create multiple delegated subnets in a VNet. However, any attempts to create a new volume would fail if you use more than one delegated subnet.
2020
You can have only a single delegated subnet in a VNet. A NetApp account can deploy volumes into multiple VNets, each having its own delegated subnet.
21-
* You can't designate a network security group or service endpoint in the delegated subnet. Doing so causes the subnet delegation to fail.
21+
* If you're using Basic network features, you can't designate a network security group (NSG) or service endpoint in the delegated subnet. Doing so causes the subnet delegation to fail. To designate an NSG or service endpoint, [upgrade to Standard network features](configure-network-features.md).
2222
* Access to a volume from a globally peered virtual network isn't currently supported using Basic networks features. Global VNet peering is supported with Standard network features. For more information, see [Supported network topologies](azure-netapp-files-network-topologies.md#supported-network-topologies).
2323
* For Azure NetApp Files support of [User-defined routes](../virtual-network/virtual-networks-udr-overview.md#custom-routes) (UDRs) and Network security groups (NSGs), see [Constraints in Guidelines for Azure NetApp Files network planning](azure-netapp-files-network-topologies.md#constraints).
2424
To establish routing or access control ***to*** the Azure NetApp Files delegated subnet, you can apply UDRs and NSGs to other subnets, even within the same VNet as the subnet delegated to Azure NetApp Files.
2525

2626
## Steps
2727

28-
1. Go to the **Virtual networks** blade in the Azure portal and select the virtual network that you want to use for Azure NetApp Files.
28+
1. Navigate to **Virtual networks** in the Azure portal. Select the virtual network that you want to use for Azure NetApp Files.
2929

30-
1. Select **Subnets** from the Virtual network blade and click the **+Subnet** button.
30+
1. From Virtual network, select **Subnets** then the **+Subnet** button.
3131

3232
1. Create a new subnet to use for Azure NetApp Files by completing the following required fields in the Add Subnet page:
3333
* **Name**: Specify the subnet name.

0 commit comments

Comments
 (0)