Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[fix S360] add missing property to REVISIONS/REPLICAS/ #21037

Merged
merged 6 commits into from
Oct 14, 2022
Merged

[fix S360] add missing property to REVISIONS/REPLICAS/ #21037

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e747205
[fix S360] add missing property to REVISIONS/REPLICAS/
Oct 8, 2022
7d29dfb
Merge branch 'Azure:main' into naji/fixReplicasMissingProperty
najian Oct 11, 2022
0aea3a5
add 200 response for patch action to fix s360
Oct 11, 2022
c98a36a
Merge branch 'naji/fixReplicasMissingProperty' of https://github.com/…
Oct 11, 2022
bdacbe2
add example of patch200
Oct 11, 2022
53de88d
Update ManagedEnvironments_GetAuthToken.json
Oct 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions ...fication/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/ContainerApps.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,6 +293,12 @@
}
],
"responses": {
"200": {
"description": "Ok.",
"schema": {
"$ref": "#/definitions/ContainerApp"
}
},
"202": {
"description": "Patch operation is in progress."
},
Expand Down
6 changes: 6 additions & 0 deletions ...on/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/ManagedEnvironments.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,6 +289,12 @@
}
],
"responses": {
"200": {
"description": "Ok",
"schema": {
"$ref": "#/definitions/ManagedEnvironment"
}
},
"202": {
"description": "Patch operation is in progress."
},
Expand Down
127 changes: 127 additions & 0 deletions ...source-manager/Microsoft.App/preview/2022-06-01-preview/examples/ContainerApps_Patch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,133 @@
}
},
"responses": {
"200": {
"headers": {},
"body": {
"id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/rg/providers/Microsoft.App/containerApps/testcontainerApp0",
"name": "testcontainerApp0",
"type": "Microsoft.App/containerApps",
"location": "East US",
"properties": {
"provisioningState": "Succeeded",
"managedEnvironmentId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/rg/providers/Microsoft.App/managedEnvironments/demokube",
najian marked this conversation as resolved.
Show resolved Hide resolved
"workloadProfileType": "GeneralPurpose",
"latestRevisionFqdn": "testcontainerApp0-pjxhsye.demokube-t24clv0g.eastus.containerApps.k4apps.io",
"configuration": {
"ingress": {
"fqdn": "testcontainerApp0.demokube-t24clv0g.eastus.containerApps.k4apps.io",
"external": true,
"targetPort": 3000,
"transport": "auto",
"customDomains": [
{
"name": "www.my-name.com",
"bindingType": "SniEnabled",
"certificateId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/rg/providers/Microsoft.App/managedEnvironments/demokube/certificates/my-certificate-for-my-name-dot-com"
},
{
"name": "www.my-other-name.com",
"bindingType": "SniEnabled",
"certificateId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/rg/providers/Microsoft.App/managedEnvironments/demokube/certificates/my-certificate-for-my-other-name-dot-com"
}
],
"traffic": [
{
"weight": 80,
"revisionName": "testcontainerApp0-ab1234"
},
{
"weight": 20,
"revisionName": "testcontainerApp0-ab4321",
"label": "staging"
}
],
"ipSecurityRestrictions": [
{
"name": "Allow work IP A subnet",
"description": "Allowing all IP's within the subnet below to access containerapp",
"ipAddressRange": "192.168.1.1/32",
"action": "Allow"
},
{
"name": "Allow work IP B subnet",
"description": "Allowing all IP's within the subnet below to access containerapp",
"ipAddressRange": "192.168.1.1/8",
"action": "Allow"
}
]
},
"dapr": {
"enabled": true,
"appPort": 3000,
"appProtocol": "http",
"httpReadBufferSize": 30
}
},
"template": {
"containers": [
{
"image": "repo/testcontainerApp0:v4",
"name": "testcontainerApp0",
"resources": {
"cpu": 0.2,
"memory": "100Mi"
},
"probes": [
{
"type": "Liveness",
"httpGet": {
"path": "/health",
"port": 8080,
"httpHeaders": [
{
"name": "Custom-Header",
"value": "Awesome"
}
]
},
"initialDelaySeconds": 3,
"periodSeconds": 3
}
]
}
],
"initContainers": [
{
"image": "repo/testcontainerApp0:v4",
"name": "testinitcontainerApp0",
"resources": {
"cpu": 0.2,
"memory": "100Mi"
},
"command": [
"/bin/sh"
],
"args": [
"-c",
"while true; do echo hello; sleep 10;done"
]
}
],
"scale": {
"minReplicas": 1,
"maxReplicas": 5,
"rules": [
{
"name": "httpscalingrule",
"http": {
"metadata": {
"concurrentRequests": "50"
}
}
}
]
}
},
"eventStreamEndpoint": "testEndpoint"
}
}
},
"202": {
"headers": {
"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-06-01-preview"
Expand Down
3 changes: 1 addition & 2 deletions ...r/Microsoft.App/preview/2022-06-01-preview/examples/ManagedEnvironments_GetAuthToken.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
"expires": "2022-07-14T19:22:50.3080223Z"
}
}
},
"404": {}
}
}
}
54 changes: 54 additions & 0 deletions ...-manager/Microsoft.App/preview/2022-06-01-preview/examples/ManagedEnvironments_Patch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,60 @@
}
},
"responses": {
"200": {
"body": {
"id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/examplerg/providers/Microsoft.App/managedEnvironments/testcontainerenv",
"name": "testcontainerenv",
"type": "Microsoft.App/managedEnvironments",
"location": "East US",
"sku": {
"name": "Premium"
},
"properties": {
"provisioningState": "Succeeded",
"deploymentErrors": null,
"defaultDomain": "testcontainerenv.k4apps.io",
"staticIp": "1.2.3.4",
"appLogsConfiguration": {
"logAnalyticsConfiguration": {
"customerId": "string"
}
},
"zoneRedundant": true,
"vnetConfiguration": {
"outboundSettings": {
"outBoundType": "UserDefinedRouting",
"virtualNetworkApplianceIp": "192.168.1.20"
}
},
"customDomainConfiguration": {
"customDomainVerificationId": "custom domain verification id",
"dnsSuffix": "www.my-name.com",
"subjectName": "CN=www.my-name.com",
"expirationDate": "2022-11-06T04:00:00Z",
"thumbprint": "CERTIFICATE_THUMBPRINT"
},
"eventStreamEndpoint": "testEndpoint",
"workloadProfiles": [
{
"workloadProfileType": "GeneralPurpose",
"minimumCount": 3,
"maximumCount": 12
},
{
"workloadProfileType": "MemoryOptimized",
"minimumCount": 3,
"maximumCount": 6
},
{
"workloadProfileType": "ComputeOptimized",
"minimumCount": 3,
"maximumCount": 6
}
]
}
}
},
"202": {
"headers": {
"azure-asyncoperation": "https://management.azure.com/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.App/locations/eastus/managedEnvironmentOperationResults/62e4d893-d233-4005-988e-a428d9f77076?api-version=2022-06-01-preview"
Expand Down
6 changes: 6 additions & 0 deletions specification/app/resource-manager/Microsoft.App/stable/2022-03-01/ContainerApps.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,6 +290,12 @@
}
],
"responses": {
"200": {
"description": "Ok.",
"schema": {
"$ref": "#/definitions/ContainerApp"
}
},
"202": {
"description": "Patch operation is in progress."
},
Expand Down
10 changes: 10 additions & 0 deletions ...fication/app/resource-manager/Microsoft.App/stable/2022-03-01/ContainerAppsRevisions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -571,6 +571,16 @@
"format": "int32",
"description": "The container restart count",
"type": "integer"
},
"logStreamEndpoint": {
"description": "Log Stream endpoint",
"type": "string",
"readOnly": true
},
"execEndpoint": {
"description": "Container exec endpoint",
"type": "string",
"readOnly": true
}
}
}
Expand Down
6 changes: 6 additions & 0 deletions specification/app/resource-manager/Microsoft.App/stable/2022-03-01/ManagedEnvironments.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,6 +289,12 @@
}
],
"responses": {
"200": {
"description": "Ok.",
"schema": {
"$ref": "#/definitions/ManagedEnvironment"
}
},
"202": {
"description": "Patch operation is in progress."
},
Expand Down
93 changes: 93 additions & 0 deletions ...on/app/resource-manager/Microsoft.App/stable/2022-03-01/examples/ContainerApps_Patch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,99 @@
"headers": {
"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-03-01"
}
},
"200": {
"headers": {},
"body": {
"id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/rg/providers/Microsoft.App/containerApps/testcontainerApp0",
"name": "testcontainerApp0",
"type": "Microsoft.App/containerApps",
"location": "East US",
"properties": {
"provisioningState": "Succeeded",
"managedEnvironmentId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/rg/providers/Microsoft.App/managedEnvironments/demokube",
"latestRevisionFqdn": "testcontainerApp0-pjxhsye.demokube-t24clv0g.eastus.containerApps.k4apps.io",
"configuration": {
"ingress": {
"fqdn": "testcontainerApp0.demokube-t24clv0g.eastus.containerApps.k4apps.io",
"external": true,
"targetPort": 3000,
"transport": "auto",
"customDomains": [
{
"name": "www.my-name.com",
"bindingType": "SniEnabled",
"certificateId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/rg/providers/Microsoft.App/managedEnvironments/demokube/certificates/my-certificate-for-my-name-dot-com"
},
{
"name": "www.my-other-name.com",
"bindingType": "SniEnabled",
"certificateId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/rg/providers/Microsoft.App/managedEnvironments/demokube/certificates/my-certificate-for-my-other-name-dot-com"
}
],
"traffic": [
{
"weight": 80,
"revisionName": "testcontainerApp0-ab1234"
},
{
"weight": 20,
"revisionName": "testcontainerApp0-ab4321",
"label": "staging"
}
]
},
"dapr": {
"enabled": true,
"appPort": 3000,
"appProtocol": "http"
}
},
"template": {
"containers": [
{
"image": "repo/testcontainerApp0:v4",
"name": "testcontainerApp0",
"resources": {
"cpu": 0.2,
"memory": "100Mi"
},
"probes": [
{
"type": "Liveness",
"httpGet": {
"path": "/health",
"port": 8080,
"httpHeaders": [
{
"name": "Custom-Header",
"value": "Awesome"
}
]
},
"initialDelaySeconds": 3,
"periodSeconds": 3
}
]
}
],
"scale": {
"minReplicas": 1,
"maxReplicas": 5,
"rules": [
{
"name": "httpscalingrule",
"http": {
"metadata": {
"concurrentRequests": "50"
}
}
}
]
}
}
}
}
}
}
}
20 changes: 20 additions & 0 deletions .../resource-manager/Microsoft.App/stable/2022-03-01/examples/ManagedEnvironments_Patch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,26 @@
}
},
"responses": {
"200": {
"body": {
"id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/examplerg/providers/Microsoft.App/managedEnvironments/testcontainerenv",
"name": "testcontainerenv",
"type": "Microsoft.App/managedEnvironments",
"location": "East US",
"properties": {
"provisioningState": "Succeeded",
"deploymentErrors": null,
"defaultDomain": "testcontainerenv.k4apps.io",
"staticIp": "1.2.3.4",
"appLogsConfiguration": {
"logAnalyticsConfiguration": {
"customerId": "string"
}
},
"zoneRedundant": true
}
}
},
"202": {
"headers": {
"azure-asyncoperation": "https://management.azure.com/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.App/locations/eastus/managedEnvironmentOperationResults/62e4d893-d233-4005-988e-a428d9f77076?api-version=2022-03-01"
Expand Down