From db8bb437d0b8e97d7f39cc9350ebc30639c447e3 Mon Sep 17 00:00:00 2001 From: Yi Xian Soo Date: Thu, 6 Mar 2025 13:57:42 -0500 Subject: [PATCH 1/3] Adding Ingress Configuration to Managed Env --- .../ManagedEnvironments.json | 39 ++++++++++++++++++- .../ManagedEnvironments_CreateOrUpdate.json | 30 ++++++++++++++ 2 files changed, 67 insertions(+), 2 deletions(-) diff --git a/specification/app/resource-manager/Microsoft.App/preview/2025-02-02-preview/ManagedEnvironments.json b/specification/app/resource-manager/Microsoft.App/preview/2025-02-02-preview/ManagedEnvironments.json index ba9e9c216b1c..9fec26f9d694 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2025-02-02-preview/ManagedEnvironments.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2025-02-02-preview/ManagedEnvironments.json @@ -1733,6 +1733,42 @@ } } }, + "ingressConfiguration": { + "description": "Settings for the ingress component, including workload profile, scaling, and connection handling.", + "type": "object", + "properties": { + "workloadProfileName": { + "description": "Name of the workload profile used by the ingress component.", + "type": "string" + }, + "scale": { + "description": "Scaling configuration for the ingress component.", + "type": "object", + "properties": { + "minReplicas": { + "description": "Minimum number of ingress replicas.", + "type": "integer" + }, + "maxReplicas": { + "description": "Maximum number of ingress replicas.", + "type": "integer" + } + } + }, + "terminationGracePeriodSeconds": { + "description": "Time (in seconds) to allow active connections to complete on termination.", + "type": "integer" + }, + "headerCountLimit": { + "description": "Maximum number of headers per request allowed by the ingress.", + "type": "integer" + }, + "requestIdleTimeout": { + "description": "Duration (in minutes) before idle requests are timed out.", + "type": "integer" + } + } + }, "privateEndpointConnections": { "description": "Private endpoint connections to the resource.", "type": "array", @@ -1937,5 +1973,4 @@ ] } ] -} - +} \ No newline at end of file diff --git a/specification/app/resource-manager/Microsoft.App/preview/2025-02-02-preview/examples/ManagedEnvironments_CreateOrUpdate.json b/specification/app/resource-manager/Microsoft.App/preview/2025-02-02-preview/examples/ManagedEnvironments_CreateOrUpdate.json index 66b299f82524..f4c035241fc6 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2025-02-02-preview/examples/ManagedEnvironments_CreateOrUpdate.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2025-02-02-preview/examples/ManagedEnvironments_CreateOrUpdate.json @@ -110,6 +110,16 @@ "encryption": { "enabled": true } + }, + "ingressConfiguration": { + "workloadProfileName": "My-CO-01", + "scale": { + "minReplicas": 2, + "maxReplicas": 4 + }, + "terminationGracePeriodSeconds": 3600, + "headerCountLimit": 30, + "RequestIdleTimeout": 5 } } } @@ -221,6 +231,16 @@ "mtls": { "enabled": true } + }, + "ingressConfiguration": { + "workloadProfileName": "My-CO-01", + "scale": { + "minReplicas": 2, + "maxReplicas": 4 + }, + "terminationGracePeriodSeconds": 3600, + "headerCountLimit": 30, + "RequestIdleTimeout": 5 } } } @@ -330,6 +350,16 @@ "mtls": { "enabled": true } + }, + "ingressConfiguration": { + "workloadProfileName": "My-CO-01", + "scale": { + "minReplicas": 2, + "maxReplicas": 4 + }, + "terminationGracePeriodSeconds": 3600, + "headerCountLimit": 30, + "RequestIdleTimeout": 5 } } } From 68bf64b9a53f7a8ab38a6d4d603f3590fcb5fd31 Mon Sep 17 00:00:00 2001 From: Yi Xian Soo Date: Thu, 6 Mar 2025 14:30:35 -0500 Subject: [PATCH 2/3] Adding to lists --- .../ManagedEnvironments_CreateOrUpdate.json | 9 ++++----- .../examples/ManagedEnvironments_Get.json | 13 +++++++++++-- .../ManagedEnvironments_ListByResourceGroup.json | 11 +++++++++++ .../ManagedEnvironments_ListBySubscription.json | 6 ++++-- 4 files changed, 30 insertions(+), 9 deletions(-) diff --git a/specification/app/resource-manager/Microsoft.App/preview/2025-02-02-preview/examples/ManagedEnvironments_CreateOrUpdate.json b/specification/app/resource-manager/Microsoft.App/preview/2025-02-02-preview/examples/ManagedEnvironments_CreateOrUpdate.json index f4c035241fc6..e409e5024e4e 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2025-02-02-preview/examples/ManagedEnvironments_CreateOrUpdate.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2025-02-02-preview/examples/ManagedEnvironments_CreateOrUpdate.json @@ -119,7 +119,7 @@ }, "terminationGracePeriodSeconds": 3600, "headerCountLimit": 30, - "RequestIdleTimeout": 5 + "requestIdleTimeout": 5 } } } @@ -240,7 +240,7 @@ }, "terminationGracePeriodSeconds": 3600, "headerCountLimit": 30, - "RequestIdleTimeout": 5 + "requestIdleTimeout": 5 } } } @@ -359,11 +359,10 @@ }, "terminationGracePeriodSeconds": 3600, "headerCountLimit": 30, - "RequestIdleTimeout": 5 + "requestIdleTimeout": 5 } } } } } -} - +} \ No newline at end of file diff --git a/specification/app/resource-manager/Microsoft.App/preview/2025-02-02-preview/examples/ManagedEnvironments_Get.json b/specification/app/resource-manager/Microsoft.App/preview/2025-02-02-preview/examples/ManagedEnvironments_Get.json index 9ebaa3cfd231..84f62e8cb661 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2025-02-02-preview/examples/ManagedEnvironments_Get.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2025-02-02-preview/examples/ManagedEnvironments_Get.json @@ -76,10 +76,19 @@ "encryption": { "enabled": true } + }, + "ingressConfiguration": { + "workloadProfileName": "My-CO-01", + "scale": { + "minReplicas": 2, + "maxReplicas": 4 + }, + "terminationGracePeriodSeconds": 3600, + "headerCountLimit": 30, + "requestIdleTimeout": 5 } } } } } -} - +} \ No newline at end of file diff --git a/specification/app/resource-manager/Microsoft.App/preview/2025-02-02-preview/examples/ManagedEnvironments_ListByResourceGroup.json b/specification/app/resource-manager/Microsoft.App/preview/2025-02-02-preview/examples/ManagedEnvironments_ListByResourceGroup.json index 3bb0fa46d11f..01b28efc1e5c 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2025-02-02-preview/examples/ManagedEnvironments_ListByResourceGroup.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2025-02-02-preview/examples/ManagedEnvironments_ListByResourceGroup.json @@ -62,6 +62,16 @@ "workloadProfileType": "Consumption" } ], + "ingressConfiguration": { + "workloadProfileName": "AnotherD4", + "scale": { + "maxReplicas": 2, + "minReplicas": 2 + }, + "terminationGracePeriodSeconds": 600, + "headerCountLimit": 50, + "requestIdleTimeout": null + }, "infrastructureResourceGroup": "capp-svc-jlaw-demo1-northcentralus" } }, @@ -94,6 +104,7 @@ "vnetConfiguration": { "infrastructureSubnetId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/RGName/providers/Microsoft.Network/virtualNetworks/VNetName/subnets/subnetName1" }, + "ingressConfiguration": null, "infrastructureResourceGroup": "capp-svc-demo1-northcentralus" } } diff --git a/specification/app/resource-manager/Microsoft.App/preview/2025-02-02-preview/examples/ManagedEnvironments_ListBySubscription.json b/specification/app/resource-manager/Microsoft.App/preview/2025-02-02-preview/examples/ManagedEnvironments_ListBySubscription.json index a899caf828e8..8f91e08e430d 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2025-02-02-preview/examples/ManagedEnvironments_ListBySubscription.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2025-02-02-preview/examples/ManagedEnvironments_ListBySubscription.json @@ -61,6 +61,7 @@ "workloadProfileType": "Consumption" } ], + "ingressConfiguration": null, "infrastructureResourceGroup": "capp-svc-jlaw-demo1-northcentralus" } }, @@ -98,6 +99,7 @@ "expirationDate": "2022-11-06T04:00:00Z", "thumbprint": "CERTIFICATE_THUMBPRINT" }, + "ingressConfiguration": null, "eventStreamEndpoint": "testEndpoint", "infrastructureResourceGroup": "capp-svc-demo1-northcentralus" } @@ -158,6 +160,7 @@ "expirationDate": "2022-11-06T04:00:00Z", "thumbprint": "CERTIFICATE_THUMBPRINT" }, + "ingressConfiguration": null, "eventStreamEndpoint": "testEndpoint" } } @@ -165,5 +168,4 @@ } } } -} - +} \ No newline at end of file From 600cd4d646d9e5a512c6ac6e38bbbadff05d2f16 Mon Sep 17 00:00:00 2001 From: Yi Xian Soo Date: Thu, 6 Mar 2025 14:41:05 -0500 Subject: [PATCH 3/3] Wrong name --- .../examples/ManagedEnvironments_ListByResourceGroup.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/specification/app/resource-manager/Microsoft.App/preview/2025-02-02-preview/examples/ManagedEnvironments_ListByResourceGroup.json b/specification/app/resource-manager/Microsoft.App/preview/2025-02-02-preview/examples/ManagedEnvironments_ListByResourceGroup.json index 01b28efc1e5c..ebbb95d2b0c8 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2025-02-02-preview/examples/ManagedEnvironments_ListByResourceGroup.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2025-02-02-preview/examples/ManagedEnvironments_ListByResourceGroup.json @@ -63,7 +63,7 @@ } ], "ingressConfiguration": { - "workloadProfileName": "AnotherD4", + "workloadProfileName": "My-GP-01", "scale": { "maxReplicas": 2, "minReplicas": 2 @@ -112,5 +112,4 @@ } } } -} - +} \ No newline at end of file