From 9f4a64ebd7dcf91d18e8fc177fdf1076db3c55d3 Mon Sep 17 00:00:00 2001 From: Xingjian Wang Date: Tue, 18 Apr 2023 15:20:04 -0700 Subject: [PATCH 1/2] add replica/container running state --- .../ContainerAppsRevisions.json | 48 +++++++++++++++++++ .../examples/Replicas_Get.json | 7 ++- .../examples/Replicas_List.json | 7 ++- 3 files changed, 60 insertions(+), 2 deletions(-) diff --git a/specification/app/resource-manager/Microsoft.App/preview/2023-04-01-preview/ContainerAppsRevisions.json b/specification/app/resource-manager/Microsoft.App/preview/2023-04-01-preview/ContainerAppsRevisions.json index 07c66e0c18ad..11bb76070673 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2023-04-01-preview/ContainerAppsRevisions.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2023-04-01-preview/ContainerAppsRevisions.json @@ -522,6 +522,25 @@ "format": "date-time", "readOnly": true }, + "runningState": { + "description": "Current running state of the replica", + "enum": [ + "Running", + "NotRunning", + "Unknown" + ], + "type": "string", + "readOnly": true, + "x-ms-enum": { + "name": "ContainerAppReplicaRunningState", + "modelAsString": true + } + }, + "runningStateDetails": { + "description": "The details of replica currect running state", + "type": "string", + "readOnly": true + }, "containers": { "description": "The containers collection under a replica.", "type": "array", @@ -531,6 +550,16 @@ "x-ms-identifiers": [ "name" ] + }, + "initContainers": { + "description": "The init containers collection under a replica.", + "type": "array", + "items": { + "$ref": "#/definitions/ReplicaContainer" + }, + "x-ms-identifiers": [ + "name" + ] } }, "x-ms-client-flatten": true @@ -578,6 +607,25 @@ "description": "The container restart count", "type": "integer" }, + "runningState": { + "description": "Current running state of the container", + "enum": [ + "Running", + "Terminated", + "Waiting" + ], + "type": "string", + "readOnly": true, + "x-ms-enum": { + "name": "ContainerAppContainerRunningState", + "modelAsString": true + } + }, + "runningStateDetails": { + "description": "The details of container currect running state", + "type": "string", + "readOnly": true + }, "logStreamEndpoint": { "description": "Log Stream endpoint", "type": "string", diff --git a/specification/app/resource-manager/Microsoft.App/preview/2023-04-01-preview/examples/Replicas_Get.json b/specification/app/resource-manager/Microsoft.App/preview/2023-04-01-preview/examples/Replicas_Get.json index bf2ecd2f449f..3d27a409e4c1 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2023-04-01-preview/examples/Replicas_Get.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2023-04-01-preview/examples/Replicas_Get.json @@ -16,6 +16,8 @@ "type": "Microsoft.Web/containerapps/revisions/replicas", "properties": { "createdTime": "2022-01-25T19:42:45Z", + "runningState": "Running", + "runningStateDetails": "testDetail", "containers": [ { "name": "hello92", @@ -23,10 +25,13 @@ "ready": true, "started": true, "restartCount": 0, + "runningState": "Running", + "runningStateDetails": "testDetail", "logStreamEndpoint": "testLogStreamEndpoint", "execEndpoint": "testExecEndpoint" } - ] + ], + "initContainers": [] } } } diff --git a/specification/app/resource-manager/Microsoft.App/preview/2023-04-01-preview/examples/Replicas_List.json b/specification/app/resource-manager/Microsoft.App/preview/2023-04-01-preview/examples/Replicas_List.json index 7f2808c53742..262f453932c2 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2023-04-01-preview/examples/Replicas_List.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2023-04-01-preview/examples/Replicas_List.json @@ -17,6 +17,8 @@ "type": "Microsoft.Web/containerapps/revisions/replicas", "properties": { "createdTime": "2022-01-25T19:42:45Z", + "runningState": "Running", + "runningStateDetails": "testDetail", "containers": [ { "name": "hello92", @@ -24,10 +26,13 @@ "ready": true, "started": true, "restartCount": 0, + "runningState": "Running", + "runningStateDetails": "testDetail", "logStreamEndpoint": "testLogStreamEndpoint", "execEndpoint": "testExecEndpoint" } - ] + ], + "initContainers": [] } } ] From c2f2c3a3b6de87fc8d82131f8ea0927f81fb047b Mon Sep 17 00:00:00 2001 From: Xingjian Wang Date: Tue, 18 Apr 2023 15:29:01 -0700 Subject: [PATCH 2/2] spell error fix --- .../preview/2023-04-01-preview/ContainerAppsRevisions.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/app/resource-manager/Microsoft.App/preview/2023-04-01-preview/ContainerAppsRevisions.json b/specification/app/resource-manager/Microsoft.App/preview/2023-04-01-preview/ContainerAppsRevisions.json index 11bb76070673..f3c76e44227f 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2023-04-01-preview/ContainerAppsRevisions.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2023-04-01-preview/ContainerAppsRevisions.json @@ -537,7 +537,7 @@ } }, "runningStateDetails": { - "description": "The details of replica currect running state", + "description": "The details of replica current running state", "type": "string", "readOnly": true }, @@ -622,7 +622,7 @@ } }, "runningStateDetails": { - "description": "The details of container currect running state", + "description": "The details of container current running state", "type": "string", "readOnly": true },