Skip to content

Commit f1547c4

Browse files
Juliehzlp-bouchonruslanyzhenqxuMSFTnajian
authored and
anandanthony
committed
Release app microsoft.app 2022 10 01 (Azure#21683)
* Adds base for updating Microsoft.App from version preview/2022-06-01-preview to version 2022-10-01 * Updates readme * Updates API version in new specs and examples * Add AppState and LatestReadyRevisionName (Azure#21034) * Add new props * add defaults * Add swagger for client cert & CORS policy (Azure#21126) * Fix password format of env domain for 2022-10-01 (Azure#21463) * fix * fix * Remove AppState property as we decided to postpone it (Azure#21483) * Remove AppState property as we decided to postpone it * Fix swagger issues * More swagger fixes * s360 swagger correctness fixes (Azure#21472) Co-authored-by: Nan Jiang <[email protected]> * Add kind for managed environment (Azure#21589) * add * fix * fix (Azure#21730) * fix (Azure#21747) Co-authored-by: p-bouchon <[email protected]> Co-authored-by: Ruslan Yakushev <[email protected]> Co-authored-by: zhenqxuMSFT <[email protected]> Co-authored-by: najian <[email protected]> Co-authored-by: Nan Jiang <[email protected]>
1 parent 2447d7e commit f1547c4

15 files changed

+231
-44
lines changed

‎specification/app/resource-manager/Microsoft.App/stable/2022-10-01/CommonDefinitions.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,6 @@
317317
"x-ms-secret": true
318318
},
319319
"certificatePassword": {
320-
"format": "byte",
321320
"description": "Certificate password",
322321
"type": "string",
323322
"x-ms-secret": true
@@ -687,7 +686,8 @@
687686
},
688687
"ignoreErrors": {
689688
"description": "Boolean describing if the component errors are ignores",
690-
"type": "boolean"
689+
"type": "boolean",
690+
"default": false
691691
},
692692
"initTimeout": {
693693
"description": "Initialization timeout",
@@ -758,7 +758,7 @@
758758
"description": "Collection of secrets used by a Dapr component",
759759
"type": "array",
760760
"items": {
761-
"$ref": "./CommonDefinitions.json#/definitions/Secret"
761+
"$ref": "./CommonDefinitions.json#/definitions/DaprSecret"
762762
},
763763
"x-ms-identifiers": [
764764
"name"

‎specification/app/resource-manager/Microsoft.App/stable/2022-10-01/ContainerApps.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -293,6 +293,12 @@
293293
}
294294
],
295295
"responses": {
296+
"200": {
297+
"description": "Ok",
298+
"schema": {
299+
"$ref": "#/definitions/ContainerApp"
300+
}
301+
},
296302
"202": {
297303
"description": "Patch operation is in progress."
298304
},

‎specification/app/resource-manager/Microsoft.App/stable/2022-10-01/ManagedEnvironments.json

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -289,6 +289,12 @@
289289
}
290290
],
291291
"responses": {
292+
"200": {
293+
"description": "Ok",
294+
"schema": {
295+
"$ref": "#/definitions/ManagedEnvironment"
296+
}
297+
},
292298
"202": {
293299
"description": "Patch operation is in progress."
294300
},
@@ -804,7 +810,7 @@
804810
},
805811
"runtimeSubnetId": {
806812
"type": "string",
807-
"description": "This field is deprecated and not used. If you wish to provide your own subnet that Container App containers are injected into, then you should leverage the infrastructureSubnetId.",
813+
"description": "Resource ID of a subnet that Container App containers are injected into. This subnet must be in the same VNET as the subnet defined in infrastructureSubnetId. Must not overlap with any other provided IP ranges.",
808814
"x-ms-mutability": [
809815
"create",
810816
"read"
@@ -849,6 +855,10 @@
849855
}
850856
],
851857
"properties": {
858+
"kind": {
859+
"type": "string",
860+
"description": "Kind of the Environment."
861+
},
852862
"sku": {
853863
"$ref": "#/definitions/EnvironmentSkuProperties",
854864
"description": "SKU properties of the Environment."

‎specification/app/resource-manager/Microsoft.App/stable/2022-10-01/examples/ConnectedEnvironmentsCertificate_CreateOrUpdate.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"location": "East US",
1010
"properties": {
1111
"password": "private key password",
12-
"value": "PFX-or-PEM-blob"
12+
"value": "Y2VydA=="
1313
}
1414
}
1515
},

‎specification/app/resource-manager/Microsoft.App/stable/2022-10-01/examples/ConnectedEnvironments_CreateOrUpdate.json

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,19 @@
44
"resourceGroupName": "examplerg",
55
"connectedEnvironmentName": "testenv",
66
"api-version": "2022-10-01",
7-
"kind": "kubernetes",
87
"location": "East US",
9-
"extendedLocation": {
10-
"name": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/examplerg/providers/Microsoft.ExtendedLocation/customLocations/testcustomlocation",
11-
"type": "CustomLocation"
12-
},
138
"environmentEnvelope": {
9+
"extendedLocation": {
10+
"name": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/examplerg/providers/Microsoft.ExtendedLocation/customLocations/testcustomlocation",
11+
"type": "CustomLocation"
12+
},
1413
"location": "East US",
1514
"properties": {
1615
"staticIp": "1.2.3.4",
1716
"daprAIConnectionString": "InstrumentationKey=00000000-0000-0000-0000-000000000000;IngestionEndpoint=https://northcentralus-0.in.applicationinsights.azure.com/",
1817
"customDomainConfiguration": {
1918
"dnsSuffix": "www.my-name.com",
20-
"certificateValue": "PFX-or-PEM-blob",
19+
"certificateValue": "Y2VydA==",
2120
"certificatePassword": "private key password"
2221
}
2322
}

‎specification/app/resource-manager/Microsoft.App/stable/2022-10-01/examples/ConnectedEnvironments_Delete.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,11 @@
1313
},
1414
"responses": {
1515
"200": {},
16-
"202": {},
16+
"202": {
17+
"headers": {
18+
"location": "https://management.azure.com/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.App/localtions/eastus/operationResults/00000"
19+
}
20+
},
1721
"204": {}
1822
}
1923
}

‎specification/app/resource-manager/Microsoft.App/stable/2022-10-01/examples/ConnectedEnvironments_Get.json

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,7 @@
55
"connectedEnvironmentName": "examplekenv",
66
"api-version": "2022-10-01",
77
"kind": "kubernetes",
8-
"location": "East US",
9-
"extendedLocation": {
10-
"name": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/examplerg/providers/Microsoft.ExtendedLocation/customLocations/testcustomlocation",
11-
"type": "CustomLocation"
12-
}
8+
"location": "East US"
139
},
1410
"responses": {
1511
"200": {

‎specification/app/resource-manager/Microsoft.App/stable/2022-10-01/examples/ConnectedEnvironments_ListBySubscription.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@
1212
"name": "sample1",
1313
"type": "Microsoft.App/connectedEnvironments",
1414
"location": "North Central US",
15+
"extendedLocation": {
16+
"name": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/examplerg/providers/Microsoft.ExtendedLocation/customLocations/testcustomlocation",
17+
"type": "CustomLocation"
18+
},
1519
"tags": {},
1620
"properties": {
1721
"provisioningState": "Succeeded",
@@ -32,6 +36,10 @@
3236
"name": "sample2",
3337
"type": "Microsoft.App/connectedEnvironments",
3438
"location": "North Central US",
39+
"extendedLocation": {
40+
"name": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/examplerg/providers/Microsoft.ExtendedLocation/customLocations/testcustomlocation",
41+
"type": "CustomLocation"
42+
},
3543
"tags": {},
3644
"properties": {
3745
"provisioningState": "Succeeded",

‎specification/app/resource-manager/Microsoft.App/stable/2022-10-01/examples/ContainerApps_Patch.json

Lines changed: 129 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,135 @@
114114
}
115115
},
116116
"responses": {
117+
"200": {
118+
"headers": {},
119+
"body": {
120+
"id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/rg/providers/Microsoft.App/containerApps/testcontainerApp0",
121+
"name": "testcontainerApp0",
122+
"type": "Microsoft.App/containerApps",
123+
"location": "East US",
124+
"properties": {
125+
"provisioningState": "Succeeded",
126+
"managedEnvironmentId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/rg/providers/Microsoft.App/managedEnvironments/demokube",
127+
"workloadProfileType": "GeneralPurpose",
128+
"latestRevisionName": "testcontainerApp0-pjxhsye",
129+
"latestReadyRevisionName": "testcontainerApp0-pjxhsye",
130+
"latestRevisionFqdn": "testcontainerApp0-pjxhsye.demokube-t24clv0g.eastus.containerApps.k4apps.io",
131+
"configuration": {
132+
"ingress": {
133+
"fqdn": "testcontainerApp0.demokube-t24clv0g.eastus.containerApps.k4apps.io",
134+
"external": true,
135+
"targetPort": 3000,
136+
"transport": "auto",
137+
"customDomains": [
138+
{
139+
"name": "www.my-name.com",
140+
"bindingType": "SniEnabled",
141+
"certificateId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/rg/providers/Microsoft.App/managedEnvironments/demokube/certificates/my-certificate-for-my-name-dot-com"
142+
},
143+
{
144+
"name": "www.my-other-name.com",
145+
"bindingType": "SniEnabled",
146+
"certificateId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/rg/providers/Microsoft.App/managedEnvironments/demokube/certificates/my-certificate-for-my-other-name-dot-com"
147+
}
148+
],
149+
"traffic": [
150+
{
151+
"weight": 80,
152+
"revisionName": "testcontainerApp0-ab1234"
153+
},
154+
{
155+
"weight": 20,
156+
"revisionName": "testcontainerApp0-ab4321",
157+
"label": "staging"
158+
}
159+
],
160+
"ipSecurityRestrictions": [
161+
{
162+
"name": "Allow work IP A subnet",
163+
"description": "Allowing all IP's within the subnet below to access containerapp",
164+
"ipAddressRange": "192.168.1.1/32",
165+
"action": "Allow"
166+
},
167+
{
168+
"name": "Allow work IP B subnet",
169+
"description": "Allowing all IP's within the subnet below to access containerapp",
170+
"ipAddressRange": "192.168.1.1/8",
171+
"action": "Allow"
172+
}
173+
]
174+
},
175+
"dapr": {
176+
"enabled": true,
177+
"appPort": 3000,
178+
"appProtocol": "http",
179+
"httpReadBufferSize": 30
180+
}
181+
},
182+
"template": {
183+
"containers": [
184+
{
185+
"image": "repo/testcontainerApp0:v4",
186+
"name": "testcontainerApp0",
187+
"resources": {
188+
"cpu": 0.2,
189+
"memory": "100Mi"
190+
},
191+
"probes": [
192+
{
193+
"type": "Liveness",
194+
"httpGet": {
195+
"path": "/health",
196+
"port": 8080,
197+
"httpHeaders": [
198+
{
199+
"name": "Custom-Header",
200+
"value": "Awesome"
201+
}
202+
]
203+
},
204+
"initialDelaySeconds": 3,
205+
"periodSeconds": 3
206+
}
207+
]
208+
}
209+
],
210+
"initContainers": [
211+
{
212+
"image": "repo/testcontainerApp0:v4",
213+
"name": "testinitcontainerApp0",
214+
"resources": {
215+
"cpu": 0.2,
216+
"memory": "100Mi"
217+
},
218+
"command": [
219+
"/bin/sh"
220+
],
221+
"args": [
222+
"-c",
223+
"while true; do echo hello; sleep 10;done"
224+
]
225+
}
226+
],
227+
"scale": {
228+
"minReplicas": 1,
229+
"maxReplicas": 5,
230+
"rules": [
231+
{
232+
"name": "httpscalingrule",
233+
"http": {
234+
"metadata": {
235+
"concurrentRequests": "50"
236+
}
237+
}
238+
}
239+
]
240+
}
241+
},
242+
"eventStreamEndpoint": "testEndpoint"
243+
}
244+
}
245+
},
117246
"202": {
118247
"headers": {
119248
"azure-asyncoperation": "https://management.azure.com/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.App/locations/eastus/containerappOperationResults/62e4d893-d233-4005-988e-a428d9f77076?api-version=2022-10-01"

‎specification/app/resource-manager/Microsoft.App/stable/2022-10-01/examples/ManagedEnvironments_CreateOrUpdate.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
"api-version": "2022-10-01",
77
"environmentEnvelope": {
88
"location": "East US",
9+
"kind": "serverless",
910
"sku": {
1011
"name": "Premium"
1112
},
@@ -27,7 +28,7 @@
2728
"customDomainConfiguration": {
2829
"dnsSuffix": "www.my-name.com",
2930
"certificateValue": "Y2VydA==",
30-
"certificatePassword": "Y2VydA=="
31+
"certificatePassword": "private key password"
3132
},
3233
"workloadProfiles": [
3334
{

0 commit comments

Comments
 (0)