From 3d297d729bd2ce9ed9d07cfbdd4142d831f0de2c Mon Sep 17 00:00:00 2001 From: FNU Arnav Date: Tue, 14 Mar 2023 14:25:04 -0700 Subject: [PATCH 01/11] add container security context property --- .../stable/2023-05-01/containerInstance.json | 77 ++++++++--- .../ContainerGroupsCreatePriority.json | 120 ------------------ .../examples/ContainerGroupsGetPriority.json | 87 ------------- 3 files changed, 59 insertions(+), 225 deletions(-) delete mode 100644 specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/examples/ContainerGroupsCreatePriority.json delete mode 100644 specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/examples/ContainerGroupsGetPriority.json diff --git a/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/containerInstance.json b/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/containerInstance.json index 274b6a961604..82f5ae377850 100644 --- a/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/containerInstance.json +++ b/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/containerInstance.json @@ -119,9 +119,6 @@ }, "ContainerGroupsGet_Failed": { "$ref": "./examples/ContainerGroupsGet_Failed.json" - }, - "ContainerGroupsGetWithPriority": { - "$ref": "./examples/ContainerGroupsGetPriority.json" } }, "summary": "Get the properties of the specified container group.", @@ -169,9 +166,6 @@ }, "ConfidentialContainerGroup": { "$ref": "./examples/ContainerGroupCreateConfidential.json" - }, - "ContainerGroupsCreateWithPriority": { - "$ref": "./examples/ContainerGroupsCreatePriority.json" } }, "summary": "Create or update container groups.", @@ -947,6 +941,61 @@ "readinessProbe": { "description": "The readiness probe.", "$ref": "#/definitions/ContainerProbe" + }, + "securityContext": { + "description": "The container security properties.", + "$ref": "#/definitions/SecurityContextDefinition" + } + } + }, + "SecurityContextDefinition": { + "description": "The security context for the container.", + "type": "object", + "properties": { + "privileged": { + "type": "boolean", + "description": "The flag to determine if the container permissions is eleveted to Privileged." + }, + "allowPrivilegeEscalation": { + "type": "boolean", + "description": "A boolean value indicating whether the init process can elevate its privileges" + }, + "capabilities": { + "description": "The capabilities to add or drop from a container.", + "$ref": "#/definitions/SecurityContextCapabilitiesDefinition" + }, + "runAsGroup": { + "type": "integer", + "format": "int32", + "description": "Sets the User GID for the container." + }, + "runAsUser": { + "type": "integer", + "format": "int32", + "description": "Sets the User UID for the container." + }, + "seccompProfile": { + "type": "string", + "description": "a base64 encoded string containing the contents of the JSON in the Seccomp profile" + } + } + }, + "SecurityContextCapabilitiesDefinition": { + "description": "The capabilities to add or drop from a container.", + "properties": { + "add": { + "type": "array", + "items": { + "type": "string" + }, + "description": "The capabilities to add to the container." + }, + "drop": { + "type": "array", + "items": { + "type": "string" + }, + "description": "The capabilities to drop from the container." } } }, @@ -1476,18 +1525,6 @@ "confidentialComputeProperties": { "description": "The properties for confidential container group", "$ref": "#/definitions/ConfidentialComputeProperties" - }, - "priority": { - "type": "string", - "description": "The priority of the container group.", - "enum": [ - "Regular", - "Spot" - ], - "x-ms-enum": { - "name": "ContainerGroupPriority", - "modelAsString": true - } } }, "required": [ @@ -2361,6 +2398,10 @@ "x-ms-identifiers": [ "name" ] + }, + "securityContext": { + "description": "The container security properties.", + "$ref": "#/definitions/SecurityContextDefinition" } } }, diff --git a/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/examples/ContainerGroupsCreatePriority.json b/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/examples/ContainerGroupsCreatePriority.json deleted file mode 100644 index 8abebd18f27a..000000000000 --- a/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/examples/ContainerGroupsCreatePriority.json +++ /dev/null @@ -1,120 +0,0 @@ -{ - "parameters": { - "subscriptionId": "subid", - "api-version": "2023-05-01", - "resourceGroupName": "demo", - "containerGroupName": "demo1", - "containerGroup": { - "properties": { - "sku": "Standard", - "containers": [ - { - "name": "test-container-001", - "properties": { - "image": "alpine:latest", - "command": [ - "/bin/sh", - "-c", - "sleep 10" - ], - "resources": { - "requests": { - "memoryInGB": 1, - "cpu": 1 - } - } - } - } - ], - "restartPolicy": "Never", - "osType": "Linux", - "priority": "Spot" - }, - "location": "eastus" - } - }, - "responses": { - "200": { - "body": { - "properties": { - "sku": "Standard", - "provisioningState": "Succeeded", - "containers": [ - { - "name": "test-container-001", - "properties": { - "image": "alpine:latest", - "command": [ - "/bin/sh", - "-c", - "sleep 10" - ], - "ports": [], - "environmentVariables": [], - "resources": { - "requests": { - "memoryInGB": 1, - "cpu": 1 - } - } - } - } - ], - "initContainers": [], - "restartPolicy": "Never", - "osType": "Linux", - "instanceView": { - "events": [], - "state": "Succeeded" - }, - "priority": "Spot" - }, - "id": "/subscriptions/subId/resourceGroups/demo/providers/Microsoft.ContainerInstance/containerGroups/demo1", - "name": "demo1", - "type": "Microsoft.ContainerInstance/containerGroups", - "location": "eastus" - } - }, - "201": { - "body": { - "properties": { - "sku": "Standard", - "provisioningState": "Created", - "containers": [ - { - "name": "test-container-001", - "properties": { - "image": "alpine:latest", - "command": [ - "/bin/sh", - "-c", - "sleep 10" - ], - "ports": [], - "environmentVariables": [], - "resources": { - "requests": { - "memoryInGB": 1, - "cpu": 1 - } - } - } - } - ], - "initContainers": [], - "restartPolicy": "Never", - "osType": "Linux", - "instanceView": { - "events": [], - "state": "Created" - }, - "priority": "Spot" - }, - "id": "/subscriptions/subId/resourceGroups/demo/providers/Microsoft.ContainerInstance/containerGroups/demo1", - "name": "demo1", - "type": "Microsoft.ContainerInstance/containerGroups", - "location": "eastus" - } - } - } -} diff --git a/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/examples/ContainerGroupsGetPriority.json b/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/examples/ContainerGroupsGetPriority.json deleted file mode 100644 index 16980f61d8ac..000000000000 --- a/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/examples/ContainerGroupsGetPriority.json +++ /dev/null @@ -1,87 +0,0 @@ -{ - "parameters": { - "subscriptionId": "subid", - "resourceGroupName": "demo", - "containerGroupName": "demo1", - "api-version": "2023-05-01" - }, - "responses": { - "200": { - "body": { - "properties": { - "sku": "Standard", - "provisioningState": "Succeeded", - "containers": [ - { - "name": "test-container-001", - "properties": { - "image": "alpine:latest", - "command": [ - "/bin/sh", - "-c", - "sleep 10" - ], - "ports": [], - "environmentVariables": [], - "instanceView": { - "restartCount": 0, - "currentState": { - "state": "Terminated", - "startTime": "2022-11-11T19:33:44.217Z", - "exitCode": 0, - "finishTime": "2022-11-11T19:33:55.565Z", - "detailStatus": "Completed" - }, - "events": [ - { - "count": 2, - "firstTimestamp": "2022-11-11T19:28:22Z", - "lastTimestamp": "2022-11-11T19:32:09Z", - "name": "Pulling", - "message": "pulling image \"alpine@sha256:1304f174557314a7ed9eddb4eab12fed12cb0cd9809e4c28f29af86979a3c870\"", - "type": "Normal" - }, - { - "count": 2, - "firstTimestamp": "2022-11-11T19:32:08Z", - "lastTimestamp": "2022-11-11T19:32:38Z", - "name": "Pulled", - "message": "Successfully pulled image \"alpine@sha256:1304f174557314a7ed9eddb4eab12fed12cb0cd9809e4c28f29af86979a3c870\"", - "type": "Normal" - }, - { - "count": 1, - "firstTimestamp": "2022-11-11T19:33:44Z", - "lastTimestamp": "2022-11-11T19:33:44Z", - "name": "Started", - "message": "Started container", - "type": "Normal" - } - ] - }, - "resources": { - "requests": { - "memoryInGB": 1, - "cpu": 1 - } - } - } - } - ], - "initContainers": [], - "restartPolicy": "Never", - "osType": "Linux", - "instanceView": { - "events": [], - "state": "Succeeded" - }, - "priority": "Spot" - }, - "id": "/subscriptions/subId/resourceGroups/demo/providers/Microsoft.ContainerInstance/containerGroups/demo1", - "name": "demo1", - "type": "Microsoft.ContainerInstance/containerGroups", - "location": "eastus" - } - } - } -} From d28d82b6e311455f116d2cb3ece8deae7df7fac8 Mon Sep 17 00:00:00 2001 From: FNU Arnav Date: Tue, 14 Mar 2023 14:26:22 -0700 Subject: [PATCH 02/11] update readme tag to previous stable version --- specification/containerinstance/resource-manager/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/containerinstance/resource-manager/readme.md b/specification/containerinstance/resource-manager/readme.md index 60df22de90c1..a6091f0e0e39 100644 --- a/specification/containerinstance/resource-manager/readme.md +++ b/specification/containerinstance/resource-manager/readme.md @@ -26,7 +26,7 @@ These are the global settings for the ContainerInstance API. ``` yaml openapi-type: arm -tag: package-2023-05 +tag: package-2022-09 ``` From 4156b8a0d3be344136d45e55c04ec0f22cea6091 Mon Sep 17 00:00:00 2001 From: FNU Arnav Date: Thu, 16 Mar 2023 21:08:28 -0700 Subject: [PATCH 03/11] add example with security context --- .../examples/ContainerGroupCreateConfidential.json | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/examples/ContainerGroupCreateConfidential.json b/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/examples/ContainerGroupCreateConfidential.json index 40c1b66429b3..40b178eaec35 100644 --- a/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/examples/ContainerGroupCreateConfidential.json +++ b/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/examples/ContainerGroupCreateConfidential.json @@ -72,7 +72,10 @@ "memoryInGB": 1.5, "cpu": 1.0 } - } + }, + "securityContext": { + "privileged": true + } } } ], @@ -124,7 +127,10 @@ "memoryInGB": 1.5, "cpu": 1.0 } - } + }, + "securityContext": { + "privileged": true + } } } ], From 6063a49914d6c94cb57482d14658c02e95b8dd58 Mon Sep 17 00:00:00 2001 From: FNU Arnav Date: Thu, 16 Mar 2023 21:38:46 -0700 Subject: [PATCH 04/11] avocado fix default tag should contain all endpoints --- specification/containerinstance/resource-manager/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/containerinstance/resource-manager/readme.md b/specification/containerinstance/resource-manager/readme.md index a6091f0e0e39..60df22de90c1 100644 --- a/specification/containerinstance/resource-manager/readme.md +++ b/specification/containerinstance/resource-manager/readme.md @@ -26,7 +26,7 @@ These are the global settings for the ContainerInstance API. ``` yaml openapi-type: arm -tag: package-2022-09 +tag: package-2023-05 ``` From b925c2a01cfb8798b2b20f561884debfe137f10c Mon Sep 17 00:00:00 2001 From: FNU Arnav Date: Fri, 17 Mar 2023 13:24:25 -0700 Subject: [PATCH 05/11] add back spot priority changes --- .../stable/2023-05-01/containerInstance.json | 19 +++ .../ContainerGroupsCreatePriority.json | 120 ++++++++++++++++++ .../examples/ContainerGroupsGetPriority.json | 87 +++++++++++++ 3 files changed, 226 insertions(+) create mode 100644 specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/examples/ContainerGroupsCreatePriority.json create mode 100644 specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/examples/ContainerGroupsGetPriority.json diff --git a/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/containerInstance.json b/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/containerInstance.json index 82f5ae377850..08f0f982c7b4 100644 --- a/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/containerInstance.json +++ b/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/containerInstance.json @@ -119,6 +119,9 @@ }, "ContainerGroupsGet_Failed": { "$ref": "./examples/ContainerGroupsGet_Failed.json" + }, + "ContainerGroupsGetWithPriority": { + "$ref": "./examples/ContainerGroupsGetPriority.json" } }, "summary": "Get the properties of the specified container group.", @@ -166,6 +169,9 @@ }, "ConfidentialContainerGroup": { "$ref": "./examples/ContainerGroupCreateConfidential.json" + }, + "ContainerGroupsCreateWithPriority": { + "$ref": "./examples/ContainerGroupsCreatePriority.json" } }, "summary": "Create or update container groups.", @@ -1527,6 +1533,19 @@ "$ref": "#/definitions/ConfidentialComputeProperties" } }, + "priority": { + "type": "string", + "description": "The priority of the container group.", + "enum": [ + "Regular", + "Spot" + ], + "x-ms-enum": { + "name": "ContainerGroupPriority", + "modelAsString": true + } + } + }, "required": [ "containers", "osType" diff --git a/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/examples/ContainerGroupsCreatePriority.json b/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/examples/ContainerGroupsCreatePriority.json new file mode 100644 index 000000000000..5719bd28b887 --- /dev/null +++ b/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/examples/ContainerGroupsCreatePriority.json @@ -0,0 +1,120 @@ +{ + "parameters": { + "subscriptionId": "subid", + "api-version": "2022-10-01-preview", + "resourceGroupName": "demo", + "containerGroupName": "demo1", + "containerGroup": { + "properties": { + "sku": "Standard", + "containers": [ + { + "name": "test-container-001", + "properties": { + "image": "alpine:latest", + "command": [ + "/bin/sh", + "-c", + "sleep 10" + ], + "resources": { + "requests": { + "memoryInGB": 1, + "cpu": 1 + } + } + } + } + ], + "restartPolicy": "Never", + "osType": "Linux", + "priority": "Spot" + }, + "location": "eastus" + } + }, + "responses": { + "200": { + "body": { + "properties": { + "sku": "Standard", + "provisioningState": "Succeeded", + "containers": [ + { + "name": "test-container-001", + "properties": { + "image": "alpine:latest", + "command": [ + "/bin/sh", + "-c", + "sleep 10" + ], + "ports": [], + "environmentVariables": [], + "resources": { + "requests": { + "memoryInGB": 1, + "cpu": 1 + } + } + } + } + ], + "initContainers": [], + "restartPolicy": "Never", + "osType": "Linux", + "instanceView": { + "events": [], + "state": "Succeeded" + }, + "priority": "Spot" + }, + "id": "/subscriptions/subId/resourceGroups/demo/providers/Microsoft.ContainerInstance/containerGroups/demo1", + "name": "demo1", + "type": "Microsoft.ContainerInstance/containerGroups", + "location": "eastus" + } + }, + "201": { + "body": { + "properties": { + "sku": "Standard", + "provisioningState": "Created", + "containers": [ + { + "name": "test-container-001", + "properties": { + "image": "alpine:latest", + "command": [ + "/bin/sh", + "-c", + "sleep 10" + ], + "ports": [], + "environmentVariables": [], + "resources": { + "requests": { + "memoryInGB": 1, + "cpu": 1 + } + } + } + } + ], + "initContainers": [], + "restartPolicy": "Never", + "osType": "Linux", + "instanceView": { + "events": [], + "state": "Created" + }, + "priority": "Spot" + }, + "id": "/subscriptions/subId/resourceGroups/demo/providers/Microsoft.ContainerInstance/containerGroups/demo1", + "name": "demo1", + "type": "Microsoft.ContainerInstance/containerGroups", + "location": "eastus" + } + } + } +} diff --git a/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/examples/ContainerGroupsGetPriority.json b/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/examples/ContainerGroupsGetPriority.json new file mode 100644 index 000000000000..d480e6ef016a --- /dev/null +++ b/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/examples/ContainerGroupsGetPriority.json @@ -0,0 +1,87 @@ +{ + "parameters": { + "subscriptionId": "subid", + "resourceGroupName": "demo", + "containerGroupName": "demo1", + "api-version": "2022-10-01-preview" + }, + "responses": { + "200": { + "body": { + "properties": { + "sku": "Standard", + "provisioningState": "Succeeded", + "containers": [ + { + "name": "test-container-001", + "properties": { + "image": "alpine:latest", + "command": [ + "/bin/sh", + "-c", + "sleep 10" + ], + "ports": [], + "environmentVariables": [], + "instanceView": { + "restartCount": 0, + "currentState": { + "state": "Terminated", + "startTime": "2022-11-11T19:33:44.217Z", + "exitCode": 0, + "finishTime": "2022-11-11T19:33:55.565Z", + "detailStatus": "Completed" + }, + "events": [ + { + "count": 2, + "firstTimestamp": "2022-11-11T19:28:22Z", + "lastTimestamp": "2022-11-11T19:32:09Z", + "name": "Pulling", + "message": "pulling image \"alpine@sha256:1304f174557314a7ed9eddb4eab12fed12cb0cd9809e4c28f29af86979a3c870\"", + "type": "Normal" + }, + { + "count": 2, + "firstTimestamp": "2022-11-11T19:32:08Z", + "lastTimestamp": "2022-11-11T19:32:38Z", + "name": "Pulled", + "message": "Successfully pulled image \"alpine@sha256:1304f174557314a7ed9eddb4eab12fed12cb0cd9809e4c28f29af86979a3c870\"", + "type": "Normal" + }, + { + "count": 1, + "firstTimestamp": "2022-11-11T19:33:44Z", + "lastTimestamp": "2022-11-11T19:33:44Z", + "name": "Started", + "message": "Started container", + "type": "Normal" + } + ] + }, + "resources": { + "requests": { + "memoryInGB": 1, + "cpu": 1 + } + } + } + } + ], + "initContainers": [], + "restartPolicy": "Never", + "osType": "Linux", + "instanceView": { + "events": [], + "state": "Succeeded" + }, + "priority": "Spot" + }, + "id": "/subscriptions/subId/resourceGroups/demo/providers/Microsoft.ContainerInstance/containerGroups/demo1", + "name": "demo1", + "type": "Microsoft.ContainerInstance/containerGroups", + "location": "eastus" + } + } + } +} From dce49f7286cc99c1e8d8ae3202066f0b49cea20e Mon Sep 17 00:00:00 2001 From: FNU Arnav Date: Fri, 17 Mar 2023 13:40:56 -0700 Subject: [PATCH 06/11] use previous stable version as default tag --- specification/containerinstance/resource-manager/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/containerinstance/resource-manager/readme.md b/specification/containerinstance/resource-manager/readme.md index 60df22de90c1..a6091f0e0e39 100644 --- a/specification/containerinstance/resource-manager/readme.md +++ b/specification/containerinstance/resource-manager/readme.md @@ -26,7 +26,7 @@ These are the global settings for the ContainerInstance API. ``` yaml openapi-type: arm -tag: package-2023-05 +tag: package-2022-09 ``` From 5b68095ad50b991809ad64f8b710388eee077398 Mon Sep 17 00:00:00 2001 From: FNU Arnav Date: Fri, 17 Mar 2023 14:01:20 -0700 Subject: [PATCH 07/11] prettier fix --- .../examples/ContainerGroupCreateConfidential.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/examples/ContainerGroupCreateConfidential.json b/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/examples/ContainerGroupCreateConfidential.json index 40b178eaec35..81823f813c08 100644 --- a/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/examples/ContainerGroupCreateConfidential.json +++ b/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/examples/ContainerGroupCreateConfidential.json @@ -73,9 +73,9 @@ "cpu": 1.0 } }, - "securityContext": { - "privileged": true - } + "securityContext": { + "privileged": true + } } } ], @@ -128,9 +128,9 @@ "cpu": 1.0 } }, - "securityContext": { - "privileged": true - } + "securityContext": { + "privileged": true + } } } ], From 5c0e698a3c83555f013626c55c2b948a85146e28 Mon Sep 17 00:00:00 2001 From: FNU Arnav Date: Fri, 17 Mar 2023 14:05:28 -0700 Subject: [PATCH 08/11] use spaces --- .../stable/2023-05-01/containerInstance.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/containerInstance.json b/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/containerInstance.json index 08f0f982c7b4..eb07c03fe390 100644 --- a/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/containerInstance.json +++ b/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/containerInstance.json @@ -120,7 +120,7 @@ "ContainerGroupsGet_Failed": { "$ref": "./examples/ContainerGroupsGet_Failed.json" }, - "ContainerGroupsGetWithPriority": { + "ContainerGroupsGetWithPriority": { "$ref": "./examples/ContainerGroupsGetPriority.json" } }, @@ -170,7 +170,7 @@ "ConfidentialContainerGroup": { "$ref": "./examples/ContainerGroupCreateConfidential.json" }, - "ContainerGroupsCreateWithPriority": { + "ContainerGroupsCreateWithPriority": { "$ref": "./examples/ContainerGroupsCreatePriority.json" } }, From d4491b420c93891b787da43d926e74031dd6b760 Mon Sep 17 00:00:00 2001 From: FNU Arnav Date: Fri, 17 Mar 2023 14:54:31 -0700 Subject: [PATCH 09/11] fix error --- .../stable/2023-05-01/containerInstance.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/containerInstance.json b/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/containerInstance.json index eb07c03fe390..1164670ec281 100644 --- a/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/containerInstance.json +++ b/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/containerInstance.json @@ -1532,8 +1532,7 @@ "description": "The properties for confidential container group", "$ref": "#/definitions/ConfidentialComputeProperties" } - }, - "priority": { + "priority": { "type": "string", "description": "The priority of the container group.", "enum": [ From 1b729c6306a8f98235ef0e97e402897cb83e5925 Mon Sep 17 00:00:00 2001 From: FNU Arnav Date: Fri, 17 Mar 2023 14:59:50 -0700 Subject: [PATCH 10/11] use spaces --- .../stable/2023-05-01/containerInstance.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/containerInstance.json b/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/containerInstance.json index 1164670ec281..8d61a3b16d79 100644 --- a/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/containerInstance.json +++ b/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/containerInstance.json @@ -1531,8 +1531,8 @@ "confidentialComputeProperties": { "description": "The properties for confidential container group", "$ref": "#/definitions/ConfidentialComputeProperties" - } - "priority": { + }, + "priority": { "type": "string", "description": "The priority of the container group.", "enum": [ From e533946833578c66d00f430672545873a650e9cd Mon Sep 17 00:00:00 2001 From: FNU Arnav Date: Fri, 17 Mar 2023 15:22:17 -0700 Subject: [PATCH 11/11] fix CI errors --- custom-words.txt | 4 +++- .../stable/2023-05-01/containerInstance.json | 5 +++-- .../2023-05-01/examples/ContainerGroupsCreatePriority.json | 2 +- .../2023-05-01/examples/ContainerGroupsGetPriority.json | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/custom-words.txt b/custom-words.txt index f7cb0a9e1823..0b097b6ec18e 100644 --- a/custom-words.txt +++ b/custom-words.txt @@ -1448,6 +1448,7 @@ nonreadable nonstarted Nonsupported nopublicipaddresses +Noreuse northcentralus northeurope norwayeast @@ -2703,6 +2704,7 @@ routesets wayfind wayfinding Securitytypes +seccomp leadgen dryruns Dryrun @@ -2755,4 +2757,4 @@ Ochestrator remediatable Overprovisioning Unprepares -Unpreparing \ No newline at end of file +Unpreparing diff --git a/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/containerInstance.json b/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/containerInstance.json index 8d61a3b16d79..6b4540674ca7 100644 --- a/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/containerInstance.json +++ b/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/containerInstance.json @@ -960,7 +960,7 @@ "properties": { "privileged": { "type": "boolean", - "description": "The flag to determine if the container permissions is eleveted to Privileged." + "description": "The flag to determine if the container permissions is elevated to Privileged." }, "allowPrivilegeEscalation": { "type": "boolean", @@ -982,12 +982,13 @@ }, "seccompProfile": { "type": "string", - "description": "a base64 encoded string containing the contents of the JSON in the Seccomp profile" + "description": "a base64 encoded string containing the contents of the JSON in the seccomp profile" } } }, "SecurityContextCapabilitiesDefinition": { "description": "The capabilities to add or drop from a container.", + "type": "object", "properties": { "add": { "type": "array", diff --git a/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/examples/ContainerGroupsCreatePriority.json b/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/examples/ContainerGroupsCreatePriority.json index 5719bd28b887..8abebd18f27a 100644 --- a/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/examples/ContainerGroupsCreatePriority.json +++ b/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/examples/ContainerGroupsCreatePriority.json @@ -1,7 +1,7 @@ { "parameters": { "subscriptionId": "subid", - "api-version": "2022-10-01-preview", + "api-version": "2023-05-01", "resourceGroupName": "demo", "containerGroupName": "demo1", "containerGroup": { diff --git a/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/examples/ContainerGroupsGetPriority.json b/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/examples/ContainerGroupsGetPriority.json index d480e6ef016a..16980f61d8ac 100644 --- a/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/examples/ContainerGroupsGetPriority.json +++ b/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/examples/ContainerGroupsGetPriority.json @@ -3,7 +3,7 @@ "subscriptionId": "subid", "resourceGroupName": "demo", "containerGroupName": "demo1", - "api-version": "2022-10-01-preview" + "api-version": "2023-05-01" }, "responses": { "200": {