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]: SP/AAD update operation for 2018-03-31 and 2018-08-01-preview #4937

Merged
merged 3 commits into from
Dec 19, 2018
Merged

[AKS]: SP/AAD update operation for 2018-03-31 and 2018-08-01-preview #4937

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 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
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
74 changes: 74 additions & 0 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
@@ -0,0 +1,74 @@
{
"parameters": {
"api-version": "2018-08-01-preview",
"subscriptionId": "subid1",
"resourceGroupName": "rg1",
"resourceName": "clustername1",
"parameters": {
"aadProfile": {
"clientAppID": "clientappid",
"serverAppID": "serverappid",
"serverAppSecret": "serverappsecret",
"tenantID": "tenantid"
}
}
},
"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"
}
}
}
}
}
}

67 changes: 67 additions & 0 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
@@ -0,0 +1,67 @@
{
"parameters": {
"api-version": "2018-08-01-preview",
"subscriptionId": "subid1",
"resourceGroupName": "rg1",
"resourceName": "clustername1",
"parameters": {
"servicePrincipalProfile": {
"clientId": "clientid",
"secret": "secret"
}
}
},
"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"
}
}
}
}
}
}

169 changes: 169 additions & 0 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 @@ -521,6 +521,140 @@
}
}
}
},
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedClusters/{resourceName}/resetServicePrincipalProfile":{
"post":{
"tags": [
"ManagedClusters"
],
"operationId": "ManagedClusters_ResetServicePrincipalProfile",
"summary": "Reset Service Principal Profile of a managed cluster.",
"description": "Update the service principal Profile for a managed cluster.",
"parameters":[
{
"$ref": "#/parameters/ApiVersionParameter"
},
{
"$ref": "#/parameters/SubscriptionIdParameter"
},
{
"name": "resourceGroupName",
"in": "path",
"required": true,
"type": "string",
"description": "The name of the resource group."
},
{
"name": "resourceName",
"in": "path",
"required": true,
"type": "string",
"description": "The name of the managed cluster resource."
},
{
"name": "parameters",
"in": "body",
"required": true,
"schema": {
"$ref": "#/definitions/ManagedClusterServicePrincipalProfile"
},
"description": "Parameters supplied to the Reset Service Principal Profile operation for a Managed Cluster."
}
],
"responses": {
"200": {
zqingqing1 marked this conversation as resolved.
Show resolved Hide resolved
"description": "OK",
"schema": {
"$ref": "#/definitions/ManagedCluster"
}
},
"202": {
"description": "Accepted",
"schema": {
"$ref": "#/definitions/ManagedCluster"
}
},
"default": {
"description": "Error response describing why the operation failed. If the cluster doesn't exist, 404 (Not found) is returned.",
"schema": {
"$ref": "#/definitions/CloudError"
}
}
},
"x-ms-long-running-operation": true,
"x-ms-examples": {
"Reset Service Principal Profile": {
"$ref": "./examples/ManagedClustersResetServicePrincipalProfile.json"
}
}
}
},
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedClusters/{resourceName}/resetAADProfile":{
"post":{
"tags": [
"ManagedClusters"
],
"operationId": "ManagedClusters_ResetAADProfile",
"summary": "Reset AAD Profile of a managed cluster.",
"description": "Update the AAD Profile for a managed cluster.",
"parameters":[
{
"$ref": "#/parameters/ApiVersionParameter"
},
{
"$ref": "#/parameters/SubscriptionIdParameter"
},
{
"name": "resourceGroupName",
"in": "path",
"required": true,
"type": "string",
"description": "The name of the resource group."
},
{
"name": "resourceName",
"in": "path",
"required": true,
"type": "string",
"description": "The name of the managed cluster resource."
},
{
"name": "parameters",
"in": "body",
"required": true,
"schema": {
"$ref": "#/definitions/ManagedClusterAADProfile"
},
"description": "Parameters supplied to the Reset AAD Profile operation for a Managed Cluster."
}
],
"responses": {
"200": {
"description": "OK",
"schema": {
"$ref": "#/definitions/ManagedCluster"
}
},
"202": {
"description": "Accepted",
"schema": {
"$ref": "#/definitions/ManagedCluster"
}
},
"default": {
"description": "Error response describing why the operation failed. If the cluster doesn't exist, 404 (Not found) is returned.",
"schema": {
"$ref": "#/definitions/CloudError"
}
}
},
"x-ms-long-running-operation": true,
"x-ms-examples": {
"Reset Service Principal Profile": {
"$ref": "./examples/ManagedClustersResetAADProfile.json"
}
}
}
}
},
"definitions": {
Expand Down Expand Up @@ -1438,6 +1572,41 @@
}
},
"description": "The credential result response."
},
"CloudError": {
"x-ms-external": true,
"properties": {
"error": {
"$ref": "#/definitions/CloudErrorBody",
"description": "Details about the error."
}
},
"description": "An error response from the Container service."
},
"CloudErrorBody": {
"x-ms-external": true,
"properties": {
"code": {
"type": "string",
"description": "An identifier for the error. Codes are invariant and are intended to be consumed programmatically."
},
"message": {
"type": "string",
"description": "A message describing the error, intended to be suitable for display in a user interface."
},
"target": {
"type": "string",
"description": "The target of the particular error. For example, the name of the property in error."
},
"details": {
"type": "array",
"items": {
"$ref": "#/definitions/CloudErrorBody"
},
"description": "A list of additional details about the error."
}
},
"description": "An error response from the Container service."
}
},
"parameters": {
Expand Down
Loading