Skip to content

Commit

Permalink
[AKS]: Remove 200/OK response from reset SP/AAD api (Azure#4948)
Browse files Browse the repository at this point in the history 
* add  operation for 2018-03-31 and 2018-08-01-preview

* correct example fileName

* add default response and 202, correct typo

* remove 200 response

* long running operation

* return 202 with no body

* forget to remove 202 body from 2018-08-01-preview api

* add 200 without schema
  • Loading branch information
@zqingqing1 @AnuTalluri
zqingqing1 authored and AnuTalluri committed Feb 6, 2019
1 parent 247d169 commit f333641
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 242 deletions.
56 changes: 1 addition & 55 deletions ....ContainerService/preview/2018-08-01-preview/examples/ManagedClustersResetAADProfile.json
View file
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
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
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
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
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
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

0 comments on commit f333641

Please sign in to comment.