From f81bdb3e82b926386e38d53088bfdbed379c08f9 Mon Sep 17 00:00:00 2001 From: jijohn Date: Fri, 18 Oct 2024 00:23:03 -0700 Subject: [PATCH 1/4] Add running status --- .../preview/2024-10-02-preview/ContainerApps.json | 15 +++++++++++++++ .../examples/ContainerApps_CreateOrUpdate.json | 2 ++ ...rApps_CreateOrUpdate_ConnectedEnvironment.json | 2 ++ .../examples/ContainerApps_Get.json | 1 + .../ContainerApps_Kind_CreateOrUpdate.json | 2 ++ .../ContainerApps_ListByResourceGroup.json | 1 + .../ContainerApps_ListBySubscription.json | 1 + .../ContainerApps_ManagedBy_CreateOrUpdate.json | 2 ++ .../examples/ContainerApps_Patch.json | 1 + ...ainerApps_SourceToCloudApp_CreateOrUpdate.json | 2 ++ .../examples/ContainerApps_Start.json | 1 + .../examples/ContainerApps_Stop.json | 1 + .../ContainerApps_TcpApp_CreateOrUpdate.json | 2 ++ 13 files changed, 33 insertions(+) diff --git a/specification/app/resource-manager/Microsoft.App/preview/2024-10-02-preview/ContainerApps.json b/specification/app/resource-manager/Microsoft.App/preview/2024-10-02-preview/ContainerApps.json index e39fcab95f60..459b809fb289 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2024-10-02-preview/ContainerApps.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2024-10-02-preview/ContainerApps.json @@ -755,6 +755,21 @@ "modelAsString": true } }, + "runningStatus": { + "description": "Running status of the Container App.", + "enum": [ + "Progressing", + "Running", + "Stopped", + "Suspended" + ], + "type": "string", + "readOnly": true, + "x-ms-enum": { + "name": "ContainerAppRunningStatus", + "modelAsString": true + } + }, "deploymentErrors": { "description": "Any errors that occurred during deployment", "type": "string", diff --git a/specification/app/resource-manager/Microsoft.App/preview/2024-10-02-preview/examples/ContainerApps_CreateOrUpdate.json b/specification/app/resource-manager/Microsoft.App/preview/2024-10-02-preview/examples/ContainerApps_CreateOrUpdate.json index 887cf7205e48..b191fa0e7eee 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2024-10-02-preview/examples/ContainerApps_CreateOrUpdate.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2024-10-02-preview/examples/ContainerApps_CreateOrUpdate.json @@ -271,6 +271,7 @@ }, "properties": { "provisioningState": "Succeeded", + "runningStatus": "Running", "managedEnvironmentId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/rg/providers/Microsoft.App/managedEnvironments/demokube", "workloadProfileName": "My-GP-01", "latestRevisionFqdn": "testcontainerApp0-pjxhsye.demokube-t24clv0g.eastus.containerApps.k4apps.io", @@ -491,6 +492,7 @@ }, "properties": { "provisioningState": "InProgress", + "runningStatus": "Progressing", "managedEnvironmentId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/rg/providers/Microsoft.App/managedEnvironments/demokube", "latestRevisionFqdn": "testcontainerApp0-pjxhsye.demokube-t24clv0g.eastus.containerApps.k4apps.io", "configuration": { diff --git a/specification/app/resource-manager/Microsoft.App/preview/2024-10-02-preview/examples/ContainerApps_CreateOrUpdate_ConnectedEnvironment.json b/specification/app/resource-manager/Microsoft.App/preview/2024-10-02-preview/examples/ContainerApps_CreateOrUpdate_ConnectedEnvironment.json index dc0f3af52a8c..4e713ec21cb9 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2024-10-02-preview/examples/ContainerApps_CreateOrUpdate_ConnectedEnvironment.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2024-10-02-preview/examples/ContainerApps_CreateOrUpdate_ConnectedEnvironment.json @@ -192,6 +192,7 @@ }, "properties": { "provisioningState": "Succeeded", + "runningStatus": "Running", "environmentId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/rg/providers/Microsoft.App/connectedEnvironments/demokube", "latestRevisionFqdn": "testcontainerApp0-pjxhsye.demokube-t24clv0g.eastus.containerApps.k4apps.io", "latestReadyRevisionName": "testcontainerApp0-pjxhsye", @@ -348,6 +349,7 @@ }, "properties": { "provisioningState": "InProgress", + "runningStatus": "Progressing", "environmentId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/rg/providers/Microsoft.App/connectedEnvironments/demokube", "latestRevisionFqdn": "testcontainerApp0-pjxhsye.demokube-t24clv0g.eastus.containerApps.k4apps.io", "configuration": { diff --git a/specification/app/resource-manager/Microsoft.App/preview/2024-10-02-preview/examples/ContainerApps_Get.json b/specification/app/resource-manager/Microsoft.App/preview/2024-10-02-preview/examples/ContainerApps_Get.json index fa361a38b50b..2fe09417b9cf 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2024-10-02-preview/examples/ContainerApps_Get.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2024-10-02-preview/examples/ContainerApps_Get.json @@ -26,6 +26,7 @@ }, "properties": { "provisioningState": "Succeeded", + "runningStatus": "Running", "managedEnvironmentId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/rg/providers/Microsoft.App/managedEnvironments/demokube", "workloadProfileName": "My-GP-01", "latestRevisionFqdn": "testcontainerApp0-pjxhsye.demokube-t24clv0g.eastus.containerApps.k4apps.io", diff --git a/specification/app/resource-manager/Microsoft.App/preview/2024-10-02-preview/examples/ContainerApps_Kind_CreateOrUpdate.json b/specification/app/resource-manager/Microsoft.App/preview/2024-10-02-preview/examples/ContainerApps_Kind_CreateOrUpdate.json index bc30bd2bdcfd..83eabdc26732 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2024-10-02-preview/examples/ContainerApps_Kind_CreateOrUpdate.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2024-10-02-preview/examples/ContainerApps_Kind_CreateOrUpdate.json @@ -51,6 +51,7 @@ "kind": "workflowapp", "properties": { "provisioningState": "Succeeded", + "runningStatus": "Running", "managedEnvironmentId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg/providers/Microsoft.App/managedEnvironments/testmanagedenv3", "environmentId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg/providers/Microsoft.App/managedEnvironments/testmanagedenv3", "workloadProfileName": null, @@ -132,6 +133,7 @@ "kind": "workflowapp", "properties": { "provisioningState": "InProgress", + "runningStatus": "Progressing", "managedEnvironmentId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg/providers/Microsoft.App/managedEnvironments/testmanagedenv3", "environmentId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg/providers/Microsoft.App/managedEnvironments/testmanagedenv3", "workloadProfileName": null, diff --git a/specification/app/resource-manager/Microsoft.App/preview/2024-10-02-preview/examples/ContainerApps_ListByResourceGroup.json b/specification/app/resource-manager/Microsoft.App/preview/2024-10-02-preview/examples/ContainerApps_ListByResourceGroup.json index 86676d23f54a..2a712e8941a0 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2024-10-02-preview/examples/ContainerApps_ListByResourceGroup.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2024-10-02-preview/examples/ContainerApps_ListByResourceGroup.json @@ -16,6 +16,7 @@ "location": "East US", "properties": { "provisioningState": "Succeeded", + "runningStatus": "Running", "managedEnvironmentId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/rg/providers/Microsoft.App/managedEnvironments/demokube", "workloadProfileName": "My-GP-01", "latestRevisionFqdn": "testcontainerApp0-pjxhsye.demokube-t24clv0g.eastus.containerApps.k4apps.io", diff --git a/specification/app/resource-manager/Microsoft.App/preview/2024-10-02-preview/examples/ContainerApps_ListBySubscription.json b/specification/app/resource-manager/Microsoft.App/preview/2024-10-02-preview/examples/ContainerApps_ListBySubscription.json index e670ad3b5522..f7d49969e525 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2024-10-02-preview/examples/ContainerApps_ListBySubscription.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2024-10-02-preview/examples/ContainerApps_ListBySubscription.json @@ -15,6 +15,7 @@ "location": "East US", "properties": { "provisioningState": "Succeeded", + "runningStatus": "Running", "managedEnvironmentId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/rg/providers/Microsoft.App/managedEnvironments/demokube", "workloadProfileName": "My-GP-01", "latestRevisionFqdn": "testcontainerApp0-pjxhsye.demokube-t24clv0g.eastus.containerApps.k4apps.io", diff --git a/specification/app/resource-manager/Microsoft.App/preview/2024-10-02-preview/examples/ContainerApps_ManagedBy_CreateOrUpdate.json b/specification/app/resource-manager/Microsoft.App/preview/2024-10-02-preview/examples/ContainerApps_ManagedBy_CreateOrUpdate.json index bbf8611cc5ec..6b7ce9fa2a3b 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2024-10-02-preview/examples/ContainerApps_ManagedBy_CreateOrUpdate.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2024-10-02-preview/examples/ContainerApps_ManagedBy_CreateOrUpdate.json @@ -71,6 +71,7 @@ "managedBy": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/rg/providers/Microsoft.AppPlatform/Spring/springapp", "properties": { "provisioningState": "Succeeded", + "runningStatus": "Running", "managedEnvironmentId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/rg/providers/Microsoft.App/managedEnvironments/demokube", "latestRevisionFqdn": "testcontainerAppManagedBy-pjxhsye.demokube-t24clv0g.eastus.containerApps.k4apps.io", "latestReadyRevisionName": "testcontainerAppManagedBy-pjxhsye", @@ -144,6 +145,7 @@ "managedBy": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/rg/providers/Microsoft.AppPlatform/Spring/springapp", "properties": { "provisioningState": "InProgress", + "runningStatus": "Progressing", "managedEnvironmentId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/rg/providers/Microsoft.App/managedEnvironments/demokube", "latestRevisionFqdn": "testcontainerAppManagedBy-pjxhsye.demokube-t24clv0g.eastus.containerApps.k4apps.io", "configuration": { diff --git a/specification/app/resource-manager/Microsoft.App/preview/2024-10-02-preview/examples/ContainerApps_Patch.json b/specification/app/resource-manager/Microsoft.App/preview/2024-10-02-preview/examples/ContainerApps_Patch.json index e3b887bc1067..f81661fc4369 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2024-10-02-preview/examples/ContainerApps_Patch.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2024-10-02-preview/examples/ContainerApps_Patch.json @@ -161,6 +161,7 @@ "location": "East US", "properties": { "provisioningState": "Succeeded", + "runningStatus": "Running", "managedEnvironmentId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/rg/providers/Microsoft.App/managedEnvironments/demokube", "workloadProfileName": "My-GP-01", "latestRevisionFqdn": "testcontainerApp0-pjxhsye.demokube-t24clv0g.eastus.containerApps.k4apps.io", diff --git a/specification/app/resource-manager/Microsoft.App/preview/2024-10-02-preview/examples/ContainerApps_SourceToCloudApp_CreateOrUpdate.json b/specification/app/resource-manager/Microsoft.App/preview/2024-10-02-preview/examples/ContainerApps_SourceToCloudApp_CreateOrUpdate.json index cfdc3b16a498..7879d34551fc 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2024-10-02-preview/examples/ContainerApps_SourceToCloudApp_CreateOrUpdate.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2024-10-02-preview/examples/ContainerApps_SourceToCloudApp_CreateOrUpdate.json @@ -209,6 +209,7 @@ "location": "East US", "properties": { "provisioningState": "Succeeded", + "runningStatus": "Running", "managedEnvironmentId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/rg/providers/Microsoft.App/managedEnvironments/demokube", "workloadProfileName": "My-GP-01", "latestRevisionFqdn": "testcontainerApp0-pjxhsye.demokube-t24clv0g.eastus.containerApps.k4apps.io", @@ -369,6 +370,7 @@ "location": "East US", "properties": { "provisioningState": "InProgress", + "runningStatus": "Progressing", "managedEnvironmentId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/rg/providers/Microsoft.App/managedEnvironments/demokube", "latestRevisionFqdn": "testcontainerApp0-pjxhsye.demokube-t24clv0g.eastus.containerApps.k4apps.io", "configuration": { diff --git a/specification/app/resource-manager/Microsoft.App/preview/2024-10-02-preview/examples/ContainerApps_Start.json b/specification/app/resource-manager/Microsoft.App/preview/2024-10-02-preview/examples/ContainerApps_Start.json index 3830d698f927..717f867bd302 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2024-10-02-preview/examples/ContainerApps_Start.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2024-10-02-preview/examples/ContainerApps_Start.json @@ -15,6 +15,7 @@ "location": "East US", "properties": { "provisioningState": "Succeeded", + "runningStatus": "Running", "managedEnvironmentId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/rg/providers/Microsoft.App/managedEnvironments/demokube", "workloadProfileName": "My-GP-01", "latestRevisionFqdn": "testcontainerApp0-pjxhsye.demokube-t24clv0g.eastus.containerApps.k4apps.io", diff --git a/specification/app/resource-manager/Microsoft.App/preview/2024-10-02-preview/examples/ContainerApps_Stop.json b/specification/app/resource-manager/Microsoft.App/preview/2024-10-02-preview/examples/ContainerApps_Stop.json index 8e6c32d7af9f..c3080307e21e 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2024-10-02-preview/examples/ContainerApps_Stop.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2024-10-02-preview/examples/ContainerApps_Stop.json @@ -15,6 +15,7 @@ "location": "East US", "properties": { "provisioningState": "Succeeded", + "runningStatus": "Running", "managedEnvironmentId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/rg/providers/Microsoft.App/managedEnvironments/demokube", "workloadProfileName": "My-GP-01", "latestRevisionFqdn": "testcontainerApp0-pjxhsye.demokube-t24clv0g.eastus.containerApps.k4apps.io", diff --git a/specification/app/resource-manager/Microsoft.App/preview/2024-10-02-preview/examples/ContainerApps_TcpApp_CreateOrUpdate.json b/specification/app/resource-manager/Microsoft.App/preview/2024-10-02-preview/examples/ContainerApps_TcpApp_CreateOrUpdate.json index f87f8985def5..f168a6cda169 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2024-10-02-preview/examples/ContainerApps_TcpApp_CreateOrUpdate.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2024-10-02-preview/examples/ContainerApps_TcpApp_CreateOrUpdate.json @@ -69,6 +69,7 @@ "location": "East US", "properties": { "provisioningState": "Succeeded", + "runningStatus": "Running", "managedEnvironmentId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/rg/providers/Microsoft.App/managedEnvironments/demokube", "latestRevisionFqdn": "testcontainerAppTcp-pjxhsye.demokube-t24clv0g.eastus.containerApps.k4apps.io", "latestReadyRevisionName": "testcontainerAppTcp-pjxhsye", @@ -141,6 +142,7 @@ "location": "East US", "properties": { "provisioningState": "InProgress", + "runningStatus": "Progressing", "managedEnvironmentId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/rg/providers/Microsoft.App/managedEnvironments/demokube", "latestRevisionFqdn": "testcontainerAppTcp-pjxhsye.demokube-t24clv0g.eastus.containerApps.k4apps.io", "configuration": { From 90c2db90dee8aa147c7f8c6444bfa86fc93074de Mon Sep 17 00:00:00 2001 From: Jitin John Date: Fri, 18 Oct 2024 08:01:07 +0000 Subject: [PATCH 2/4] prettier fix --- .../examples/ContainerApps_ManagedBy_CreateOrUpdate.json | 1 - .../examples/ContainerApps_TcpApp_CreateOrUpdate.json | 1 - 2 files changed, 2 deletions(-) diff --git a/specification/app/resource-manager/Microsoft.App/preview/2024-10-02-preview/examples/ContainerApps_ManagedBy_CreateOrUpdate.json b/specification/app/resource-manager/Microsoft.App/preview/2024-10-02-preview/examples/ContainerApps_ManagedBy_CreateOrUpdate.json index 6b7ce9fa2a3b..042f281bf741 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2024-10-02-preview/examples/ContainerApps_ManagedBy_CreateOrUpdate.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2024-10-02-preview/examples/ContainerApps_ManagedBy_CreateOrUpdate.json @@ -210,4 +210,3 @@ } } } - diff --git a/specification/app/resource-manager/Microsoft.App/preview/2024-10-02-preview/examples/ContainerApps_TcpApp_CreateOrUpdate.json b/specification/app/resource-manager/Microsoft.App/preview/2024-10-02-preview/examples/ContainerApps_TcpApp_CreateOrUpdate.json index f168a6cda169..9af9ad0480ac 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2024-10-02-preview/examples/ContainerApps_TcpApp_CreateOrUpdate.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2024-10-02-preview/examples/ContainerApps_TcpApp_CreateOrUpdate.json @@ -207,4 +207,3 @@ } } } - From 12e1dfddbc67f320c06a5ef7f75ec3c646d4abc8 Mon Sep 17 00:00:00 2001 From: jijohn Date: Wed, 23 Oct 2024 10:03:41 -0700 Subject: [PATCH 3/4] Update description --- .../preview/2024-10-02-preview/ContainerApps.json | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/specification/app/resource-manager/Microsoft.App/preview/2024-10-02-preview/ContainerApps.json b/specification/app/resource-manager/Microsoft.App/preview/2024-10-02-preview/ContainerApps.json index 0383b6a4fd9b..7187b246a476 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2024-10-02-preview/ContainerApps.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2024-10-02-preview/ContainerApps.json @@ -761,7 +761,15 @@ "Progressing", "Running", "Stopped", - "Suspended" + "Suspended", + "Ready" + ], + "x-enum-descriptions": [ + "Container App is transitioning between Stopped and Running states.", + "Container App is in Running state", + "Container App is in Stopped state", + "Container App Job is in Suspended state", + "Container App Job is in Ready state" ], "type": "string", "readOnly": true, From 736b495070c16f68b9e1f1c4ba633d19525e4bac Mon Sep 17 00:00:00 2001 From: Jitin John Date: Thu, 24 Oct 2024 15:58:09 -0700 Subject: [PATCH 4/4] Addressed arm comment on description --- .../2024-10-02-preview/ContainerApps.json | 31 ++++++++++++++----- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/specification/app/resource-manager/Microsoft.App/preview/2024-10-02-preview/ContainerApps.json b/specification/app/resource-manager/Microsoft.App/preview/2024-10-02-preview/ContainerApps.json index d1cb32a41e67..3518ae0d3c66 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2024-10-02-preview/ContainerApps.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2024-10-02-preview/ContainerApps.json @@ -764,18 +764,33 @@ "Suspended", "Ready" ], - "x-enum-descriptions": [ - "Container App is transitioning between Stopped and Running states.", - "Container App is in Running state", - "Container App is in Stopped state", - "Container App Job is in Suspended state", - "Container App Job is in Ready state" - ], "type": "string", "readOnly": true, "x-ms-enum": { "name": "ContainerAppRunningStatus", - "modelAsString": true + "modelAsString": true, + "values": [ + { + "value": "Progressing", + "description": "Container App is transitioning between Stopped and Running states." + }, + { + "value": "Running", + "description": "Container App is in Running state." + }, + { + "value": "Stopped", + "description": "Container App is in Stopped state." + }, + { + "value": "Suspended", + "description": "Container App Job is in Suspended state." + }, + { + "value": "Ready", + "description": "Container App Job is in Ready state." + } + ] } }, "deploymentErrors": {