Skip to content

Commit 2995749

Browse files
authored
Merge pull request #301665 from niteshj11/nj-updatev1links
[SCOPED] Update v1 links to v2
2 parents 89c451b + 45e0987 commit 2995749

22 files changed

+43
-45
lines changed

articles/azure-functions/container-concepts.md

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -35,23 +35,23 @@ The degree to which various features and behaviors of Azure Functions are suppor
3535
| Feature/behavior | [Container Apps (integrated)][Azure Container Apps] | [Container Apps (direct)](../container-apps/overview.md) | [Premium plan](./functions-premium-plan.md) | [Dedicated plan](./dedicated-plan.md) | [Kubernetes] |
3636
| ------ | ------ | ------ |------|-------| ------|
3737
| Product support | Yes | No | Yes |Yes | No |
38-
| Functions portal integration | Yes | No | Yes | Yes | No |
38+
| Functions portal integration | No | No | Yes | Yes | No |
3939
| [Event-driven scaling](./event-driven-scaling.md) | Yes<sup>5</sup> | Yes ([scale rules](../container-apps/scale-app.md#scale-rules)) | Yes | No | No |
4040
| Maximum scale (instances) | 1000<sup>1</sup| 1000<sup>1</sup| 100<sup>2</sup| 10-30<sup>3</sup| Varies by cluster |
4141
| [Scale-to-zero instances](./event-driven-scaling.md#scale-in-behaviors) | Yes | Yes | No | No | KEDA |
4242
| Execution time limit | Unbounded<sup>6</sup>| Unbounded<sup>6</sup> | Unbounded<sup>7</sup> | Unbounded<sup>8</sup> | None |
43-
| [Core Tools deployment](./functions-run-local.md#deploy-containers) | [`func azurecontainerapps`](./functions-core-tools-reference.md#func-azurecontainerapps-deploy) | No | No | No | [`func kubernetes`](./functions-core-tools-reference.md#func-kubernetes-deploy) |
44-
| [Revisions](../container-apps/revisions.md) | No | Yes |No |No |No |
43+
| [Core Tools deployment](./functions-run-local.md#deploy-containers) | No | No | No | No | [`func kubernetes`](./functions-core-tools-reference.md#func-kubernetes-deploy) |
44+
| [Revisions](../container-apps/revisions.md) | [Yes](../container-apps/revisions.md) | Yes |No |No |No |
4545
| [Deployment slots](./functions-deployment-slots.md) |No |No |Yes |Yes |No |
46-
| [Streaming logs](./streaming-logs.md) | Yes | [Yes](../container-apps/log-streaming.md) | Yes | Yes | No |
47-
| [Console access](../container-apps/container-console.md) | Not currently available<sup>4</sup> | Yes | Yes (using [Kudu](./functions-how-to-custom-container.md#enable-ssh-connections)| Yes (using [Kudu](./functions-how-to-custom-container.md#enable-ssh-connections)| Yes (in pods [using `kubectl`](https://kubernetes.io/docs/reference/kubectl/)) |
46+
| [Streaming logs](./streaming-logs.md) | [Yes](../container-apps/log-streaming.md) | [Yes](../container-apps/log-streaming.md) | Yes | Yes | No |
47+
| [Console access](../container-apps/container-console.md) | [Yes](../container-apps/container-console.md) | Yes | Yes (using [Kudu](./functions-how-to-custom-container.md#enable-ssh-connections)| Yes (using [Kudu](./functions-how-to-custom-container.md#enable-ssh-connections)| Yes (in pods [using `kubectl`](https://kubernetes.io/docs/reference/kubectl/)) |
4848
| Cold start mitigation | Minimum replicas | [Scale rules](../container-apps/scale-app.md#scale-rules) | [Always-ready/pre-warmed instances](functions-premium-plan.md#eliminate-cold-starts) | n/a | n/a |
49-
| [App Service authentication](../app-service/overview-authentication-authorization.md) | Not currently available<sup>4</sup> | Yes | Yes | Yes | No |
50-
| [Custom domain names](../app-service/app-service-web-tutorial-custom-domain.md) | Not currently available<sup>4</sup> | Yes | Yes | Yes | No |
51-
| [Private key certificates](../app-service/overview-tls.md) | Not currently available<sup>4</sup> | Yes | Yes | Yes | No |
52-
| Virtual networks | Yes | Yes | Yes | Yes | Yes |
53-
| Availability zones | Yes | Yes | Yes | Yes | Yes |
54-
| Diagnostics | Not currently available<sup>4</sup> | [Yes](../container-apps/troubleshooting.md#use-the-diagnose-and-solve-problems-tool) | [Yes](./functions-diagnostics.md) | [Yes](./functions-diagnostics.md) | No |
49+
| [App Service authentication](../app-service/overview-authentication-authorization.md) | [Yes](../container-apps/authentication.md) | Yes | Yes | Yes | No |
50+
| [Custom domain names](../app-service/app-service-web-tutorial-custom-domain.md) | [Yes](../container-apps/custom-domains-certificates.md) | Yes | Yes | Yes | No |
51+
| [Private key certificates](../app-service/overview-tls.md) | [Yes](../container-apps/custom-domains-certificates.md) | Yes | Yes | Yes | No |
52+
| Virtual networks | [Yes](../container-apps/networking.md) | Yes | Yes | Yes | Yes |
53+
| Availability zones | [Yes](../reliability/reliability-azure-container-apps.md) | Yes | Yes | Yes | Yes |
54+
| Diagnostics | [Yes](../container-apps/troubleshooting.md#use-the-diagnose-and-solve-problems-tool) | [Yes](../container-apps/troubleshooting.md#use-the-diagnose-and-solve-problems-tool) | [Yes](./functions-diagnostics.md) | [Yes](./functions-diagnostics.md) | No |
5555
| Dedicated hardware | Yes ([workload profiles](../container-apps/workload-profiles-overview.md)) | Yes ([workload profiles](../container-apps/workload-profiles-overview.md)) | No | Yes | Yes |
5656
| Dedicated GPUs | Yes ([workload profiles](../container-apps/workload-profiles-overview.md)) | Yes ([workload profiles](../container-apps/workload-profiles-overview.md)) | No | No | Yes |
5757
| [Configurable memory/CPU count](../container-apps/workload-profiles-overview.md) | Yes | Yes | No | No | Yes |
@@ -62,7 +62,6 @@ The degree to which various features and behaviors of Azure Functions are suppor
6262
1. On Container Apps, the default is 10 instances, but you can set the [maximum number of replicas](../container-apps/scale-app.md#scale-definition), which has an overall maximum of 1000. This setting is honored as long as there's enough cores quota available. When you create your function app from the Azure portal, you're limited to 300 instances.
6363
2. In some regions, Linux apps on a Premium plan can scale to 100 instances. For more information, see the [Premium plan article](functions-premium-plan.md#region-max-scale-out). <br/>
6464
3. For specific limits for the various App Service plan options, see the [App Service plan limits](../azure-resource-manager/management/azure-subscription-service-limits.md#azure-app-service-limits).
65-
4. Feature parity is a goal of integrated hosting on Azure Container Apps.
6665
5. Requires [KEDA](./functions-kubernetes-keda.md); supported by most triggers. To learn which triggers support event-driven scaling, see [Considerations for Container Apps hosting](functions-container-apps-hosting.md#considerations-for-container-apps-hosting).
6766
6. When the [minimum number of replicas](../container-apps/scale-app.md#scale-definition) is set to zero, the default timeout depends on the specific triggers used in the app.
6867
7. There's no maximum execution timeout duration enforced. However, the grace period given to a function execution is 60 minutes [during scale in](event-driven-scaling.md#scale-in-behaviors), and a grace period of 10 minutes is given during platform updates.
@@ -87,14 +86,14 @@ In some cases, we're required to make platform-level changes that could mean tha
8786
| I want to... | See article: |
8887
| --- | --- |
8988
| Create my first containerized functions | [Create a function app in a local Linux container](functions-create-container-registry.md) |
90-
| Create and deploy functions to Azure Container Apps | [Create your first containerized functions on Azure Container Apps](functions-deploy-container-apps.md) |
89+
| Create and deploy functions to Azure Container Apps | [Create your first containerized functions on Azure Container Apps](../container-apps/functions-usage.md) |
9190
| Create and deploy containerized functions to Azure Functions | [Create your first containerized Azure Functions](functions-deploy-container.md)|
9291

9392
## Related articles
9493

9594
+ [Working with containers and Azure Functions](functions-how-to-custom-container.md)
9695

9796

98-
[Azure Container Apps]: functions-container-apps-hosting.md
97+
[Azure Container Apps]: ../container-apps/functions-overview.md
9998
[Kubernetes]: functions-kubernetes-keda.md
10099
[Azure Functions]: functions-how-to-custom-container.md?pivots=azure-functions#azure-portal-create-using-containers

articles/azure-functions/functions-consumption-costs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Azure Functions currently offers these different hosting options for your functi
2121
| [**Flex Consumption plan**](flex-consumption-plan.md)| You pay for execution time on the instances on which your functions are running, plus any _always ready_ instances. Instances are dynamically added and removed based on the number of incoming events. This is the recommended dynamic scale plan, which also supports virtual network integration. |
2222
| [**Premium**](functions-premium-plan.md) | Provides you with the same features and scaling mechanism as the Consumption plan, but with enhanced performance and virtual network integration. Cost is based on your chosen pricing tier. To learn more, see [Azure Functions Premium plan](functions-premium-plan.md). |
2323
| [**Dedicated (App Service)**](dedicated-plan.md) <br/>(basic tier or higher) | When you need to run in dedicated VMs or in isolation, use custom images, or want to use your excess App Service plan capacity. Uses [regular App Service plan billing](https://azure.microsoft.com/pricing/details/app-service/). Cost is based on your chosen pricing tier.|
24-
| [**Container Apps**](functions-container-apps-hosting.md) | Create and deploy containerized function apps in a fully managed environment hosted by Azure Container Apps, which lets you run your functions alongside other microservices, APIs, websites, and workflows as container-hosted programs. |
24+
| [**Container Apps**](../container-apps/functions-overview.md) | Create and deploy containerized function apps in a fully managed environment hosted by Azure Container Apps, which lets you run your functions alongside other microservices, APIs, websites, and workflows as container-hosted programs. |
2525
| [**Consumption**](consumption-plan.md) | You're only charged for the time that your function app runs. This plan includes a [free grant][pricing page] on a per subscription basis.|
2626

2727
You should always choose the option that best supports the feature, performance, and cost requirements for your function executions. To learn more, see [Azure Functions scale and hosting](functions-scale.md).

articles/azure-functions/functions-create-container-registry.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ This article shows you how to use Azure Functions Core tools to create your firs
1313

1414
For a complete example of deploying containerized functions to Azure, which include the steps in this article, see one of the following articles:
1515

16-
+ [Create your first containerized Azure Functions on Azure Container Apps](functions-deploy-container-apps.md)
16+
+ [Create your first containerized Azure Functions on Azure Container Apps](../container-apps/functions-usage.md)
1717
+ [Create your first containerized Azure Functions](functions-deploy-container.md)
1818

1919
You can also create a function app in the Azure portal by using an existing containerized function app from a container registry. For more information, see [Azure portal create using containers](functions-how-to-custom-container.md#azure-portal-create-using-containers).

articles/azure-functions/functions-deploy-container.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ In this article, you create a function app running in a Linux container and depl
1414
Deploying your function code to Azure Functions in a container requires [Premium plan](functions-premium-plan.md) or [Dedicated (App Service) plan](dedicated-plan.md) hosting. Completing this article incurs costs of a few US dollars in your Azure account, which you can minimize by [cleaning-up resources](#clean-up-resources) when you're done.
1515

1616
> [!TIP]
17-
> When you need to run your event-driven functions in Azure in the same environment as other microservices, APIs, websites, workflows, or any container hosted programs, consider instead hosting your containerized function apps in Azure Container Apps. Functions provides integrated support for developing, deploying, and managing containerized function apps on Container Apps. For more information, see [Azure Container Apps hosting of Azure Functions](functions-container-apps-hosting.md).
17+
> When you need to run your event-driven functions in Azure in the same environment as other microservices, APIs, websites, workflows, or any container hosted programs, consider instead hosting your containerized function apps in Azure Container Apps. Functions provides integrated support for developing, deploying, and managing containerized function apps on Container Apps. For more information, see [Azure Container Apps hosting of Azure Functions](../container-apps/functions-overview.md).
1818
1919
[!INCLUDE [functions-create-container-registry](../../includes/functions-create-container-registry.md)]
2020

articles/azure-functions/functions-deployment-slots.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ The number of available slots depends on your specific hosting option:
1616
| [Flex Consumption plan](flex-consumption-plan.md) | Not currently supported |
1717
| [Premium plan](functions-premium-plan.md) | 3 |
1818
| [Dedicated (App Service) plan](dedicated-plan.md) | [1-20](../azure-resource-manager/management/azure-subscription-service-limits.md#azure-app-service-limits) |
19-
| [Container Apps](functions-container-apps-hosting.md) | Uses [Revisions](../container-apps/revisions.md) |
19+
| [Container Apps](../container-apps/functions-overview.md) | Uses [Revisions](../container-apps/revisions.md) |
2020

2121
The following descriptions reflect how functions are affected by swapping slots:
2222

articles/azure-functions/functions-deployment-technologies.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Currently, Functions offers five options for hosting your function apps:
3434
+ [Consumption](consumption-plan.md)
3535
+ [Elastic Premium plan](functions-premium-plan.md)
3636
+ [Dedicated (App Service) plan](dedicated-plan.md)
37-
+ [Azure Container Apps](functions-container-apps-hosting.md)
37+
+ [Azure Container Apps](../container-apps/functions-overview.md)
3838

3939
Each plan has different behaviors. Not all deployment technologies are available for each hosting plan and operating system. This chart provides information on the supported deployment technologies:
4040

@@ -174,7 +174,7 @@ You can deploy a function app running in a Linux container.
174174
>
175175
>+ Deploy to Azure Functions resources you create in the Azure portal. For more information, see [Azure portal create using containers](functions-how-to-custom-container.md#azure-portal-create-using-containers).
176176
>+ Deploy to Azure Functions resources you create from the command line. Requires either a Premium or Dedicated (App Service) plan. To learn how, see [Create your first containerized Azure Functions](functions-deploy-container.md).
177-
>+ Deploy to Azure Container Apps. To learn how, see [Create your first containerized Azure Functions on Azure Container Apps](functions-deploy-container-apps.md).
177+
>+ Deploy to Azure Container Apps. To learn how, see [Create your first containerized Azure Functions on Azure Container Apps](../container-apps/functions-usage.md).
178178
>+ Deploy to Azure Arc (preview). To learn how, see [Working with containers and Azure Functions](functions-how-to-custom-container.md?pivots=azure-arc).
179179
>+ Deploy to a Kubernetes cluster. You can deploy to a cluster using [Azure Functions Core Tools](functions-run-local.md). Use the [`func kubernetes deploy`](functions-core-tools-reference.md#func-kubernetes-deploy) command.
180180

articles/azure-functions/functions-develop-vs-code.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ You can't use the [quick create](functions-develop-vs-code.md?tabs=quick-create#
339339

340340
## Create an Azure Container Apps deployment
341341

342-
You use Visual Studio Code to create Azure resources for a containerized code project. When the extension detects the presence of a Dockerfile during resource creation, it asks you if you want to deploy the container image instead of just the code. Visual Studio Code creates an Azure Container Apps environment for your containerized code project that's integrated with Azure Functions. For more information, see [Azure Container Apps hosting of Azure Functions](functions-container-apps-hosting.md).
342+
You use Visual Studio Code to create Azure resources for a containerized code project. When the extension detects the presence of a Dockerfile during resource creation, it asks you if you want to deploy the container image instead of just the code. Visual Studio Code creates an Azure Container Apps environment for your containerized code project that's integrated with Azure Functions. For more information, see [Azure Container Apps hosting of Azure Functions](../azure-functions/functions-container-apps-hosting.md).
343343

344344
>[!NOTE]
345345
>Container deployment requires the [Azure Container Apps extension for Visual Studio Code](https://marketplace.visualstudio.com/items?itemName=ms-azuretools.vscode-azurecontainerapps). This extension is currently in preview.

articles/azure-functions/functions-how-to-custom-container.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Choose the hosting environment for your containerized function app at the top of
2424
If you want to jump right in, the following article shows you how to create your first function running in a Linux container and deploy the image from a container registry to a supported Azure hosting service:
2525

2626
:::zone pivot="container-apps"
27-
> [Create your first containerized Azure Functions on Azure Container Apps](functions-deploy-container-apps.md)
27+
> [Create your first containerized Azure Functions on Azure Container Apps](../container-apps/functions-usage.md)
2828
2929
To learn more about deployments to Azure Container Apps, see [Azure Container Apps hosting of Azure Functions](./functions-container-apps-hosting.md).
3030
:::zone-end

articles/azure-functions/functions-infrastructure-as-code.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ The template code required depends on the desired hosting options for your funct
2626
| [Azure Functions Flex Consumption plan](functions-infrastructure-as-code.md?pivots=consumption-plan) | Code-only | [Flex Consumption plan](./flex-consumption-plan.md) |
2727
| [Azure Functions Elastic Premium plan](functions-infrastructure-as-code.md?pivots=premium-plan) | Code \| Container | [Premium plan](./functions-premium-plan.md)|
2828
| [Azure Functions Dedicated (App Service) plan](functions-infrastructure-as-code.md?pivots=dedicated-plan) | Code \| Container | [Dedicated plan](./dedicated-plan.md)|
29-
| [Azure Container Apps](functions-infrastructure-as-code.md?pivots=premium-plan) | Container-only | [Container Apps hosting of Azure Functions](functions-container-apps-hosting.md)|
29+
| [Azure Container Apps](functions-infrastructure-as-code.md?pivots=premium-plan) | Container-only | [Container Apps hosting of Azure Functions](../container-apps/functions-overview.md)|
3030
| [Azure Arc](functions-infrastructure-as-code.md?pivots=premium-plan) | Code \| Container | [App Service, Functions, and Logic Apps on Azure Arc (Preview)](../app-service/overview-arc-integration.md)|
3131

3232
When using this article, keep these considerations in mind:
@@ -72,7 +72,7 @@ An Azure Container Apps-hosted deployment typically consists of these resources:
7272
|------|-------|----|
7373
| A [storage account](#create-storage-account) | Required | [Microsoft.Storage/storageAccounts](/azure/templates/microsoft.storage/storageaccounts) |
7474
| An [Application Insights](#create-application-insights) component | Recommended | [Microsoft.Insights/components](/azure/templates/microsoft.insights/components)<sup>*</sup>|
75-
| A [managed environment](./functions-container-apps-hosting.md#) | Required | [Microsoft.App/managedEnvironments](/azure/templates/microsoft.app/managedenvironments) |
75+
| A [managed environment](../container-apps/functions-overview.md#) | Required | [Microsoft.App/managedEnvironments](/azure/templates/microsoft.app/managedenvironments) |
7676
| A [function app](#create-the-function-app) | Required | [Microsoft.Web/sites](/azure/templates/microsoft.web/sites) |
7777
::: zone-end
7878
::: zone pivot="azure-arc"
@@ -1573,7 +1573,7 @@ resource functionApp 'Microsoft.Web/sites@2022-03-01' = {
15731573

15741574
::: zone-end
15751575
::: zone pivot="container-apps"
1576-
When deploying [containerized functions to Azure Container Apps](./functions-container-apps-hosting.md), your template must:
1576+
When deploying [containerized functions to Azure Container Apps](../container-apps/functions-overview.md), your template must:
15771577

15781578
+ Set the `kind` field to a value of `functionapp,linux,container,azurecontainerapps`.
15791579
+ Set the `managedEnvironmentId` site property to the fully qualified URI of the Container Apps environment.

0 commit comments

Comments
 (0)