Skip to content

Commit 464e1db

Browse files
fnuarnavsaprakas
authored and
anandanthony
committed
[Hub Generated] Review request for Microsoft.ContainerInstance to add version stable/2022-09-01 (Azure#21158)
* Adds base for updating Microsoft.ContainerInstance from version stable/2021-10-01 to version 2022-09-01 * Updates readme * Updates API version in new specs and examples * Adding a new property 'identity' to EncryptionProperties * Including retry timeout minutes as part of same api version update * Fixing SpellCheck error * added Extensions property to swagger spec * add x-ms-identifier; fix spellings * remove retryTimeoutMinutes from spec * use correct nesting for extension properties * extension required properties * added contianer group extension example * add reference to extensions example * added example for contianer group encryptionProperties * fix errors in example schema * added LRO headery azure-asyncoperation to examples Co-authored-by: Sandeep Prakash <[email protected]> Co-authored-by: Sandeep Prakash <[email protected]>
1 parent fcbaad6 commit 464e1db

22 files changed

+3958
-2
lines changed

‎specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2022-09-01/containerInstance.json‎

Lines changed: 2453 additions & 0 deletions
Large diffs are not rendered by default.

‎specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2022-09-01/examples/CachedImagesList.json‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
{
2+
"parameters": {
3+
"subscriptionId": "subid",
4+
"location": "westcentralus",
5+
"api-version": "2022-09-01"
6+
},
7+
"responses": {
8+
"200": {
9+
"body": {
10+
"value": [
11+
{
12+
"osType": "Linux",
13+
"image": "ubuntu:16.04"
14+
},
15+
{
16+
"osType": "Linux",
17+
"image": "alpine:3.6"
18+
},
19+
{
20+
"osType": "Windows",
21+
"image": "microsoft/nanoserver:10.0.14393.2485"
22+
}
23+
]
24+
}
25+
}
26+
}
27+
}

‎specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2022-09-01/examples/CapabilitiesList.json‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
{
2+
"parameters": {
3+
"subscriptionId": "subid",
4+
"location": "westus",
5+
"api-version": "2022-09-01"
6+
},
7+
"responses": {
8+
"200": {
9+
"body": {
10+
"value": [
11+
{
12+
"resourceType": "containerGroups",
13+
"osType": "Linux",
14+
"location": "West US",
15+
"ipAddressType": "Public",
16+
"gpu": "K80",
17+
"capabilities": {
18+
"maxMemoryInGB": 14,
19+
"maxCpu": 4,
20+
"maxGpuCount": 4
21+
}
22+
},
23+
{
24+
"resourceType": "containerGroups",
25+
"osType": "Windows",
26+
"location": "West US",
27+
"ipAddressType": "Public",
28+
"gpu": "None",
29+
"capabilities": {
30+
"maxMemoryInGB": 14,
31+
"maxCpu": 4,
32+
"maxGpuCount": 0
33+
}
34+
}
35+
]
36+
}
37+
}
38+
}
39+
}

‎specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2022-09-01/examples/ContainerAttach.json‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
{
2+
"parameters": {
3+
"subscriptionId": "subid",
4+
"api-version": "2022-09-01",
5+
"resourceGroupName": "demo",
6+
"containerGroupName": "demo1",
7+
"containerName": "container1"
8+
},
9+
"responses": {
10+
"200": {
11+
"body": {
12+
"webSocketUri": "wss://web-socket-uri",
13+
"password": "password"
14+
}
15+
}
16+
}
17+
}

‎specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2022-09-01/examples/ContainerExec.json‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
{
2+
"parameters": {
3+
"subscriptionId": "subid",
4+
"api-version": "2022-09-01",
5+
"resourceGroupName": "demo",
6+
"containerGroupName": "demo1",
7+
"containerName": "container1",
8+
"containerExecRequest": {
9+
"command": "/bin/bash",
10+
"terminalSize": {
11+
"rows": 12,
12+
"cols": 12
13+
}
14+
}
15+
},
16+
"responses": {
17+
"200": {
18+
"body": {
19+
"webSocketUri": "wss://web-socket-uri",
20+
"password": "password"
21+
}
22+
}
23+
}
24+
}

‎specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2022-09-01/examples/ContainerGroupEncryptionProperties.json‎

Lines changed: 192 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,192 @@
1+
{
2+
"parameters": {
3+
"subscriptionId": "subid",
4+
"api-version": "2022-09-01",
5+
"resourceGroupName": "demo",
6+
"containerGroupName": "demo1",
7+
"zones": [
8+
"1"
9+
],
10+
"containerGroup": {
11+
"location": "eastus2",
12+
"identity": {
13+
"type": "UserAssigned",
14+
"userAssignedIdentities": {
15+
"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/test-rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/container-group-identity": {}
16+
}
17+
},
18+
"properties": {
19+
"containers": [
20+
{
21+
"name": "demo1",
22+
"properties": {
23+
"command": [],
24+
"environmentVariables": [],
25+
"image": "nginx",
26+
"ports": [
27+
{
28+
"port": 80
29+
}
30+
],
31+
"resources": {
32+
"requests": {
33+
"cpu": 1,
34+
"memoryInGB": 1.5
35+
}
36+
}
37+
}
38+
}
39+
],
40+
"imageRegistryCredentials": [],
41+
"ipAddress": {
42+
"ports": [
43+
{
44+
"protocol": "TCP",
45+
"port": 80
46+
}
47+
],
48+
"type": "Public"
49+
},
50+
"osType": "Linux",
51+
"encryptionProperties": {
52+
"vaultBaseUrl": "https://testkeyvault.vault.azure.net",
53+
"keyName": "test-key",
54+
"keyVersion": "<key version>",
55+
"identity": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/test-rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/container-group-identity"
56+
}
57+
}
58+
}
59+
},
60+
"responses": {
61+
"200": {
62+
"body": {
63+
"properties": {
64+
"sku": "Standard",
65+
"encryptionProperties": {
66+
"vaultBaseUrl": "https://testkeyvault.vault.azure.net/",
67+
"keyName": "test-key",
68+
"keyVersion": "<key version>",
69+
"identity": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/test-rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/container-group-identity"
70+
},
71+
"provisioningState": "Pending",
72+
"containers": [
73+
{
74+
"name": "demo1",
75+
"properties": {
76+
"image": "nginx",
77+
"command": [],
78+
"ports": [
79+
{
80+
"port": 80
81+
}
82+
],
83+
"environmentVariables": [],
84+
"resources": {
85+
"requests": {
86+
"memoryInGB": 1.5,
87+
"cpu": 1.0
88+
}
89+
}
90+
}
91+
}
92+
],
93+
"initContainers": [],
94+
"imageRegistryCredentials": [],
95+
"ipAddress": {
96+
"ports": [
97+
{
98+
"protocol": "TCP",
99+
"port": 80
100+
}
101+
],
102+
"type": "Public"
103+
},
104+
"osType": "Linux",
105+
"instanceView": {
106+
"events": [],
107+
"state": "Pending"
108+
}
109+
},
110+
"identity": {
111+
"userAssignedIdentities": {
112+
"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/test-rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/container-group-identity": {
113+
"principalId": "<principal id>",
114+
"clientId": "<client id>"
115+
}
116+
},
117+
"tenantId": "<tenant id>",
118+
"type": "UserAssigned"
119+
},
120+
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/test-rg/providers/Microsoft.ContainerInstance/containerGroups/test-container-encryption",
121+
"name": "test-container-encryption",
122+
"type": "Microsoft.ContainerInstance/containerGroups",
123+
"location": "eastus2"
124+
}
125+
},
126+
"201": {
127+
"body": {
128+
"properties": {
129+
"sku": "Standard",
130+
"encryptionProperties": {
131+
"vaultBaseUrl": "https://testkeyvault.vault.azure.net/",
132+
"keyName": "test-key",
133+
"keyVersion": "key version",
134+
"identity": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/test-rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/container-group-identity"
135+
},
136+
"provisioningState": "Running",
137+
"containers": [
138+
{
139+
"name": "demo1",
140+
"properties": {
141+
"image": "nginx",
142+
"command": [],
143+
"ports": [
144+
{
145+
"port": 80
146+
}
147+
],
148+
"environmentVariables": [],
149+
"resources": {
150+
"requests": {
151+
"memoryInGB": 1.5,
152+
"cpu": 1.0
153+
}
154+
}
155+
}
156+
}
157+
],
158+
"initContainers": [],
159+
"imageRegistryCredentials": [],
160+
"ipAddress": {
161+
"ports": [
162+
{
163+
"protocol": "TCP",
164+
"port": 80
165+
}
166+
],
167+
"type": "Public"
168+
},
169+
"osType": "Linux",
170+
"instanceView": {
171+
"events": [],
172+
"state": "Pending"
173+
}
174+
},
175+
"identity": {
176+
"userAssignedIdentities": {
177+
"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/test-rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/container-group-identity": {
178+
"principalId": "<principal id>",
179+
"clientId": "<client id>"
180+
}
181+
},
182+
"tenantId": "<tenant id>",
183+
"type": "UserAssigned"
184+
},
185+
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/test-rg/providers/Microsoft.ContainerInstance/containerGroups/test-container-encryption",
186+
"name": "test-container-encryption",
187+
"type": "Microsoft.ContainerInstance/containerGroups",
188+
"location": "eastus2"
189+
}
190+
}
191+
}
192+
}

0 commit comments

Comments
 (0)