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

[AKS]: Remove 200/OK response from reset SP/AAD api #4948

Merged
merged 10 commits into from
Jan 8, 2019
Merged

[AKS]: Remove 200/OK response from reset SP/AAD api #4948

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
45eb326
add operation for 2018-03-31 and 2018-08-01-preview
zqingqing1 Dec 18, 2018
705a889
correct example fileName
zqingqing1 Dec 18, 2018
739ebf4
add default response and 202, correct typo
zqingqing1 Dec 19, 2018
5879a7f
remove 200 response
zqingqing1 Dec 19, 2018
abbffc4
rebase
zqingqing1 Dec 19, 2018
68b822a
long running operation
zqingqing1 Dec 20, 2018
db34227
return 202 with no body
zqingqing1 Dec 20, 2018
b39369c
forget to remove 202 body from 2018-08-01-preview api
zqingqing1 Dec 20, 2018
9436137
add 200 without schema
zqingqing1 Jan 3, 2019
df0936f
resolve conflict
zqingqing1 Jan 7, 2019
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
56 changes: 1 addition & 55 deletions ....ContainerService/preview/2018-08-01-preview/examples/ManagedClustersResetAADProfile.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,61 +14,7 @@
}
},
"responses": {
"200": {
"body": {
"id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/managedClusters/clustername1",
"location": "location1",
"name": "clustername1",
"tags": {
"archv2": "",
"tier": "production"
},
"type": "Microsoft.ContainerService/ManagedClusters",
"properties": {
"provisioningState": "Succeeded",
"kubernetesVersion": "1.9.6",
"dnsPrefix": "dnsprefix1",
"agentPoolProfiles": [
{
"name": "nodepool1",
"count": 3,
"vmSize": "Standard_DS1_v2",
"storageProfile": "ManagedDisks",
"maxPods": 110,
"osType": "Linux"
}
],
"linuxProfile": {
"adminUsername": "azureuser",
"ssh": {
"publicKeys": [
{
"keyData": "keydata"
}
]
}
},
"servicePrincipalProfile": {
"clientId": "clientid"
},
"aadProfile": {
"clientAppID": "clientappid",
"serverAppID": "serverappid",
"tenantID": "tenantid"
},
"nodeResourceGroup": "MC_rg1_clustername1_location1",
"enableRBAC": false,
"fqdn": "dnsprefix1-abcd1234.hcp.eastus.azmk8s.io",
"networkProfile": {
"networkPlugin": "kubenet",
"podCidr": "10.244.0.0/16",
"serviceCidr": "10.0.0.0/16",
"dnsServiceIP": "10.0.0.10",
"dockerBridgeCidr": "172.17.0.1/16"
}
}
}
}
"202": {}
}
}

51 changes: 1 addition & 50 deletions ...vice/preview/2018-08-01-preview/examples/ManagedClustersResetServicePrincipalProfile.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,56 +12,7 @@
}
},
"responses": {
"200": {
"body": {
"id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/managedClusters/clustername1",
"location": "location1",
"name": "clustername1",
"tags": {
"archv2": "",
"tier": "production"
},
"type": "Microsoft.ContainerService/ManagedClusters",
"properties": {
"provisioningState": "Succeeded",
"kubernetesVersion": "1.9.6",
"dnsPrefix": "dnsprefix1",
"agentPoolProfiles": [
{
"name": "nodepool1",
"count": 3,
"vmSize": "Standard_DS1_v2",
"storageProfile": "ManagedDisks",
"maxPods": 110,
"osType": "Linux"
}
],
"linuxProfile": {
"adminUsername": "azureuser",
"ssh": {
"publicKeys": [
{
"keyData": "keydata"
}
]
}
},
"servicePrincipalProfile": {
"clientId": "clientid"
},
"nodeResourceGroup": "MC_rg1_clustername1_location1",
"enableRBAC": false,
"fqdn": "dnsprefix1-abcd1234.hcp.eastus.azmk8s.io",
"networkProfile": {
"networkPlugin": "kubenet",
"podCidr": "10.244.0.0/16",
"serviceCidr": "10.0.0.0/16",
"dnsServiceIP": "10.0.0.10",
"dockerBridgeCidr": "172.17.0.1/16"
}
}
}
}
"202": {}
}
}

20 changes: 4 additions & 16 deletions ...source-manager/Microsoft.ContainerService/preview/2018-08-01-preview/managedClusters.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -573,16 +573,10 @@
],
"responses": {
"200": {
"description": "OK",
"schema": {
"$ref": "#/definitions/ManagedCluster"
}
"description": "OK"
},
"202": {
"description": "Accepted",
"schema": {
"$ref": "#/definitions/ManagedCluster"
}
"description": "Accepted"
},
"default": {
"description": "Error response describing why the operation failed. If the cluster doesn't exist, 404 (Not found) is returned.",
Expand Down Expand Up @@ -641,16 +635,10 @@
],
"responses": {
"200": {
"description": "OK",
"schema": {
"$ref": "#/definitions/ManagedCluster"
}
"description": "OK"
},
"202": {
"description": "Accepted",
"schema": {
"$ref": "#/definitions/ManagedCluster"
}
"description": "Accepted"
},
"default": {
"description": "Error response describing why the operation failed. If the cluster doesn't exist, 404 (Not found) is returned.",
Expand Down
56 changes: 1 addition & 55 deletions ...Microsoft.ContainerService/stable/2018-03-31/examples/ManagedClustersResetAADProfile.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,61 +14,7 @@
}
},
"responses": {
"200": {
"body": {
"id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/managedClusters/clustername1",
"location": "location1",
"name": "clustername1",
"tags": {
"archv2": "",
"tier": "production"
},
"type": "Microsoft.ContainerService/ManagedClusters",
"properties": {
"provisioningState": "Succeeded",
"kubernetesVersion": "1.9.6",
"dnsPrefix": "dnsprefix1",
"agentPoolProfiles": [
{
"name": "nodepool1",
"count": 3,
"vmSize": "Standard_DS1_v2",
"storageProfile": "ManagedDisks",
"maxPods": 110,
"osType": "Linux"
}
],
"linuxProfile": {
"adminUsername": "azureuser",
"ssh": {
"publicKeys": [
{
"keyData": "keydata"
}
]
}
},
"servicePrincipalProfile": {
"clientId": "clientid"
},
"aadProfile": {
"clientAppID": "clientappid",
"serverAppID": "serverappid",
"tenantID": "tenantid"
},
"nodeResourceGroup": "MC_rg1_clustername1_location1",
"enableRBAC": false,
"fqdn": "dnsprefix1-abcd1234.hcp.eastus.azmk8s.io",
"networkProfile": {
"networkPlugin": "kubenet",
"podCidr": "10.244.0.0/16",
"serviceCidr": "10.0.0.0/16",
"dnsServiceIP": "10.0.0.10",
"dockerBridgeCidr": "172.17.0.1/16"
}
}
}
}
"202": {}
}
}

51 changes: 1 addition & 50 deletions ...tainerService/stable/2018-03-31/examples/ManagedClustersResetServicePrincipalProfile.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,56 +12,7 @@
}
},
"responses": {
"200": {
"body": {
"id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/managedClusters/clustername1",
"location": "location1",
"name": "clustername1",
"tags": {
"archv2": "",
"tier": "production"
},
"type": "Microsoft.ContainerService/ManagedClusters",
"properties": {
"provisioningState": "Succeeded",
"kubernetesVersion": "1.9.6",
"dnsPrefix": "dnsprefix1",
"agentPoolProfiles": [
{
"name": "nodepool1",
"count": 3,
"vmSize": "Standard_DS1_v2",
"storageProfile": "ManagedDisks",
"maxPods": 110,
"osType": "Linux"
}
],
"linuxProfile": {
"adminUsername": "azureuser",
"ssh": {
"publicKeys": [
{
"keyData": "keydata"
}
]
}
},
"servicePrincipalProfile": {
"clientId": "clientid"
},
"nodeResourceGroup": "MC_rg1_clustername1_location1",
"enableRBAC": false,
"fqdn": "dnsprefix1-abcd1234.hcp.eastus.azmk8s.io",
"networkProfile": {
"networkPlugin": "kubenet",
"podCidr": "10.244.0.0/16",
"serviceCidr": "10.0.0.0/16",
"dnsServiceIP": "10.0.0.10",
"dockerBridgeCidr": "172.17.0.1/16"
}
}
}
}
"202": {}
}
}

20 changes: 4 additions & 16 deletions ...rvices/resource-manager/Microsoft.ContainerService/stable/2018-03-31/managedClusters.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -573,16 +573,10 @@
],
"responses": {
"200": {
"description": "OK",
"schema": {
"$ref": "#/definitions/ManagedCluster"
}
"description": "OK"
},
"202": {
"description": "Accepted",
"schema": {
"$ref": "#/definitions/ManagedCluster"
}
"description": "Accepted"
}
},
"x-ms-long-running-operation": true,
Expand Down Expand Up @@ -635,16 +629,10 @@
],
"responses": {
"200": {
"description": "OK",
"schema": {
"$ref": "#/definitions/ManagedCluster"
}
"description": "OK"
},
"202": {
"description": "Accepted",
"schema": {
"$ref": "#/definitions/ManagedCluster"
}
"description": "Accepted"
}
},
"x-ms-long-running-operation": true,
Expand Down