Skip to content

Commit a023686

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into privateappgw
2 parents fcfd6ea + bb8ad2f commit a023686

File tree

80 files changed

+396
-256
lines changed

Some content is hidden

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

80 files changed

+396
-256
lines changed

.openpublishing.redirection.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2597,7 +2597,7 @@
25972597
},
25982598
{
25992599
"source_path": "articles/managed-grafana/how-to-sync-teams-with-azure-ad-groups.md",
2600-
"redirect_url": "managed-grafana/how-to-sync-teams-with-entra-groups",
2600+
"redirect_url": "how-to-sync-teams-with-entra-groups",
26012601
"redirect_document_id": false
26022602
},
26032603
{

articles/azure-resource-manager/managed-applications/approve-just-in-time-access.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
---
22
title: Approve just-in-time access
33
description: Describes how consumers of Azure Managed Applications approve requests for just-in-time access to a managed application.
4-
author: MSEvanhi
54
ms.topic: conceptual
65
ms.date: 06/24/2024
7-
ms.author: evanhi
86
---
97

108
# Configure and approve just-in-time access for Azure Managed Applications

articles/azure-resource-manager/managed-applications/concepts-built-in-policy.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
---
22
title: Deploy associations for managed application using Azure Policy
33
description: Learn about deploying associations for a managed application using Azure Policy.
4-
author: msHich
54
ms.topic: conceptual
65
ms.date: 06/24/2024
7-
ms.author: hich
86
---
97

108
# Deploy associations for a managed application using Azure Policy

articles/azure-resource-manager/managed-applications/create-storage-customer-managed-key.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ title: Create Azure Managed Application that deploys storage account encrypted w
33
description: This article describes how to create an Azure Managed Application that deploys a storage account encrypted with a customer-managed key.
44
ms.author: jojok
55
author: jojokoshy
6+
ms.reviewer: evanhi
67
ms.topic: how-to
78
ms.date: 06/24/2024
89
---

articles/azure-resource-manager/managed-applications/index.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ metadata:
88
description: Azure Managed Applications enable you to offer cloud solutions that are easy for consumers to deploy and operate.
99
ms.service: azure-managed-applications
1010
ms.topic: landing-page
11-
author: davidsmatlak
12-
ms.author: davidsmatlak
11+
author: MSEvanhi
12+
ms.author: evanhi
1313
ms.date: 07/11/2024
1414

1515
# linkListType: architecture | concept | deploy | download | get-started | how-to-guide | learn | overview | quickstart | reference | tutorial | video | whats-new

articles/azure-resource-manager/managed-applications/request-just-in-time-access.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
---
22
title: Request just-in-time access
33
description: Describes how publishers of Azure Managed Applications request just-in-time access to a managed application.
4-
author: MSEvanhi
54
ms.topic: conceptual
65
ms.date: 06/24/2024
7-
ms.author: evanhi
86
---
97

108
# Enable and request just-in-time access for Azure Managed Applications

articles/container-apps/.openpublishing.redirection.container-apps.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,11 @@
6464
"source_path_from_root": "/articles/container-apps/network-proxy.md",
6565
"redirect_url": "/azure/container-apps/ingress-overview",
6666
"redirect_document_id": false
67+
},
68+
{
69+
"source_path_from_root": "/articles/container-apps/hardware.md",
70+
"redirect_url": "/azure/container-apps/workload-profiles-overview",
71+
"redirect_document_id": false
6772
}
6873
]
6974
}

articles/container-apps/TOC.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -410,8 +410,6 @@
410410
href: /rest/api/containerapps/
411411
- name: Supported regions
412412
href: https://azure.microsoft.com/explore/global-infrastructure/products-by-region/?products=container-apps
413-
- name: Hardware reference
414-
href: hardware.md
415413
- name: Management SDKs
416414
items:
417415
- name: .NET

articles/container-apps/containers.md

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ services: container-apps
55
author: craigshoemaker
66
ms.service: azure-container-apps
77
ms.topic: conceptual
8-
ms.date: 08/29/2023
8+
ms.date: 09/19/2024
99
ms.author: cshoe
1010
---
1111

@@ -19,11 +19,11 @@ Azure Container Apps supports:
1919

2020
- Any Linux-based x86-64 (`linux/amd64`) container image
2121
- Containers from any public or private container registry
22-
- [Sidecar](#sidecar-containers) and [init](#init-containers) containers
22+
- Optional [sidecar](#sidecar-containers) and [init](#init-containers) containers
2323

2424
Features also include:
2525

26-
- Changes to the `template` configuration section trigger a new [container app revision](application-lifecycle-management.md).
26+
- Apps use the `template` configuration section to define the container image and other settings. Changes to the `template` configuration section trigger a new [container app revision](application-lifecycle-management.md).
2727
- If a container crashes, it automatically restarts.
2828

2929
Jobs features include:
@@ -286,6 +286,10 @@ Azure Container Apps has the following limitations:
286286

287287
- **Operating system**: Linux-based (`linux/amd64`) container images are required.
288288

289+
- **Maximum image size**:
290+
- Consumption workload profile supports container images totaling up to 8GB for each app or job replica.
291+
- Dedicated workload profiles support larger container images. Because a Dedicated workload profile can run multiple apps or jobs, multiple container images share the available disk space. The actual supported image size varies based on resources consumed by other apps and jobs.
292+
289293
## Next steps
290294

291295
> [!div class="nextstepaction"]

articles/container-apps/hardware.md

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

0 commit comments

Comments
 (0)