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] add new 2018-03-31 API #3131

Merged
merged 16 commits into from
Jun 1, 2018
Merged

[AKS] add new 2018-03-31 API #3131

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
2badcbe
[AKS] add new 2018-03-31 API
mboersma May 18, 2018
996e848
Add custom VNET model definition.
JunSun17 May 18, 2018
935b190
Add regex validations and x-ms-enum defs for VNET params
mboersma May 20, 2018
c89af1f
Add IP address regex and defaults for CIDR fields
mboersma May 20, 2018
69f12b6
Add addonProfile
mboersma May 20, 2018
9b81d6c
Add enableRBAC boolean to ManagedClusterProperties
mboersma May 21, 2018
36a6287
Add AADProfile to ManagedClusterProperties
mboersma May 22, 2018
8a37ff5
Add ARM operations API
mboersma May 22, 2018
069fe69
Rename an example file to start with a capital letter
mboersma May 25, 2018
2104f85
Reconcile two definitions of OSType enum.
mboersma May 25, 2018
e365e10
Rename to ManagedClusterAgentPoolProfile.
mboersma May 25, 2018
3047e9e
Py version
lmazuel May 25, 2018
cc94d98
Revert "Reconcile two definitions of OSType enum."
mboersma May 25, 2018
8a8e4b8
Reconcile two definitions of OSType enum.
mboersma May 26, 2018
d61dfda
Incorporated review comments
mboersma May 30, 2018
aec0206
Fixed examples errors pointed out by oav tool
mboersma May 31, 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
6 changes: 3 additions & 3 deletions ...vices/resource-manager/Microsoft.ContainerService/stable/2017-07-01/containerService.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -678,14 +678,14 @@
"description": "VNet SubnetID specifies the vnet's subnet identifier. If you specify either master VNet Subnet, or agent VNet Subnet, you need to specify both. And they have to be in the same VNet."
},
"osType": {
"type": "string",
"default": "Linux",
"$ref": "#/definitions/OSType",
"enum": [
"Linux",
"Windows"
],
"x-ms-enum": {
"name": "OSType"
"name": "ContainerServiceOSTypes",
"modelAsString": true
},
"description": "OsType to be used to specify os type. Choose from Linux and Windows. Default to Linux."
}
Expand Down
112 changes: 112 additions & 0 deletions ...r/Microsoft.ContainerService/stable/2018-03-31/examples/ManagedClustersCreate_Update.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,112 @@
{
"parameters": {
"api-version": "2018-03-31",
"subscriptionId": "subid1",
"resourceGroupName": "rg1",
"resourceName": "clustername1",
"parameters": {
"location": "location1",
"properties": {
"dnsPrefix": "dnsprefix1",
"agentPoolProfiles": [
{
"count": 1,
"name": "agentpool1",
"vmSize": "Standard_D2_v2"
}
],
"kubernetesVersion": "1.7.7"
}
}
},
"responses": {
"200": {
"body": {
"id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/managedClusters/clustername1",
"location": "location1",
"name": "mycluster1",
"properties": {
"agentPoolProfiles": [
{
"count": 1,
"dnsPrefix": "agentpool1dnsPrefix",
"fqdn": "agentpool1fqdn",
"name": "agentpool1",
"osType": "Linux",
"ports": [
1
],
"storageProfile": "ManagedDisks",
"vmSize": "Standard_D2_v2"
}
],
"dnsPrefix": "dnsprefix1",
"fqdn": "dnsprefix1-123456.abc.location1.azmk8s.io",
"kubernetesVersion": "1.7.7",
"linuxProfile": {
"adminUsername": "azureuser",
"ssh": {
"publicKeys": [
{
"keyData": "keydata"
}
]
}
},
"provisioningState": "Succeeded",
"servicePrincipalProfile": {
"clientId": "clientid",
"keyVaultSecretRef": null,
"secret": "secret"
}
},
"tags": "managedcluster",
"type": "Microsoft.ContainerService/ManagedClusters"
}
},
"201": {
"body": {
"id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/managedClusters/clustername1",
"location": "location1",
"name": "mycluster1",
"properties": {
"agentPoolProfiles": [
{
"count": 1,
"dnsPrefix": "agentpool1dnsPrefix",
"fqdn": "agentpool1fqdn",
"name": "agentpool1",
"osType": "Linux",
"ports": [
1
],
"storageProfile": "ManagedDisks",
"vmSize": "Standard_D2_v2"
}
],
"dnsPrefix": "dnsprefix1",
"fqdn": "dnsprefix1-123456.abc.location1.azmk8s.io",
"kubernetesVersion": "1.7.7",
"linuxProfile": {
"adminUsername": "azureuser",
"ssh": {
"publicKeys": [
{
"keyData": "keydata"
}
]
}
},
"provisioningState": "Succeeded",
"servicePrincipalProfile": {
"clientId": "clientid",
"keyVaultSecretRef": null,
"secret": "secret"
}
},
"tags": "managedcluster",
"type": "Microsoft.ContainerService/ManagedClusters"
}
}
}
}
12 changes: 12 additions & 0 deletions ...-manager/Microsoft.ContainerService/stable/2018-03-31/examples/ManagedClustersDelete.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"parameters": {
"api-version": "2018-03-31",
"subscriptionId": "subid1",
"resourceGroupName": "rg1",
"resourceName": "clustername1"
},
"responses": {
"202": {},
"204": {}
}
}
54 changes: 54 additions & 0 deletions ...rce-manager/Microsoft.ContainerService/stable/2018-03-31/examples/ManagedClustersGet.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
{
"parameters": {
"api-version": "2018-03-31",
"subscriptionId": "subid1",
"resourceGroupName": "rg1",
"resourceName": "clustername1"
},
"responses": {
"200": {
"body": {
"id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/managedClusters/clustername1",
"location": "location1",
"name": "mycluster1",
"properties": {
"agentPoolProfiles": [
{
"count": 1,
"dnsPrefix": "agentpool1dnsPrefix",
"fqdn": "agentpool1fqdn",
"name": "agentpool1",
"osType": "Linux",
"ports": [
1
],
"storageProfile": "ManagedDisks",
"vmSize": "Standard_D2_v2"
}
],
"dnsPrefix": "dnsprefix1",
"fqdn": "dnsprefix1-123456.abc.location1.azmk8s.io",
"kubernetesVersion": "1.7.7",
"linuxProfile": {
"adminUsername": "azureuser",
"ssh": {
"publicKeys": [
{
"keyData": "keydata"
}
]
}
},
"provisioningState": "Succeeded",
"servicePrincipalProfile": {
"clientId": "clientid",
"keyVaultSecretRef": null,
"secret": "secret"
}
},
"tags": "managed-cluster",
"type": "Microsoft.ContainerService/ManagedClusters"
}
}
}
}
22 changes: 22 additions & 0 deletions ...icrosoft.ContainerService/stable/2018-03-31/examples/ManagedClustersGetAccessProfile.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"parameters": {
"api-version": "2018-03-31",
"subscriptionId": "subid1",
"resourceGroupName": "rg1",
"resourceName": "clustername1",
"roleName": "clusterUser"
},
"responses": {
"200": {
"body": {
"id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/managedClusters/clustername1/accessProfiles/clusterUser",
"location": "location1",
"name": "clusterUser",
"properties": {
"kubeConfig": "kubeConfig1"
},
"type": "Microsoft.ContainerService/ManagedClusters/AccessProfiles"
}
}
}
}
37 changes: 37 additions & 0 deletions ...crosoft.ContainerService/stable/2018-03-31/examples/ManagedClustersGetUpgradeProfile.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
{
"parameters": {
"api-version": "2018-03-31",
"subscriptionId": "subid1",
"resourceGroupName": "rg1",
"resourceName": "clustername1"
},
"responses": {
"200": {
"body": {
"id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/managedClusters/clustername1/upgradeprofiles/default",
"name": "default",
"properties": {
"agentPoolProfiles": [
{
"kubernetesVersion": "1.7.7",
"name": "agent",
"osType": "Linux",
"upgrades": [
"1.8.1"
]
}
],
"controlPlaneProfile": {
"kubernetesVersion": "1.7.7",
"name": "master",
"osType": "Linux",
"upgrades": [
"1.8.1"
]
}
},
"type": "Microsoft.ContainerService/managedClusters/upgradeprofiles"
}
}
}
}
56 changes: 56 additions & 0 deletions ...ce-manager/Microsoft.ContainerService/stable/2018-03-31/examples/ManagedClustersList.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
{
"parameters": {
"api-version": "2018-03-31",
"subscriptionId": "subid1"
},
"responses": {
"200": {
"body": {
"value": [
{
"id": "/subscriptions/subid1/providers/Microsoft.ContainerService/managedClusters",
"location": "location1",
"name": "mycluster1",
"properties": {
"agentPoolProfiles": [
{
"count": 1,
"dnsPrefix": "agentpool1dnsPrefix",
"fqdn": "agentpool1fqdn",
"name": "agentpool1",
"osType": "Linux",
"ports": [
1
],
"storageProfile": "ManagedDisks",
"vmSize": "Standard_D2_v2"
}
],
"dnsPrefix": "dnsprefix1",
"fqdn": "dnsprefix1-123456.abc.location1.azmk8s.io",
"kubernetesVersion": "1.7.7",
"linuxProfile": {
"adminUsername": "azureuser",
"ssh": {
"publicKeys": [
{
"keyData": "keydata"
}
]
}
},
"provisioningState": "Succeeded",
"servicePrincipalProfile": {
"clientId": "clientid",
"keyVaultSecretRef": null,
"secret": "secret"
}
},
"tags": "managed-cluster",
"type": "Microsoft.ContainerService/ManagedClusters"
}
]
}
}
}
}
57 changes: 57 additions & 0 deletions ...osoft.ContainerService/stable/2018-03-31/examples/ManagedClustersListByResourceGroup.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
{
"parameters": {
"api-version": "2018-03-31",
"subscriptionId": "subid1",
"resourceGroupName": "rg1"
},
"responses": {
"200": {
"body": {
"value": [
{
"id": "/subscriptions/subid1/resourceGroups/rg1/providers/Microsoft.ContainerService/managedClusters",
"location": "location1",
"name": "mycluster1",
"properties": {
"agentPoolProfiles": [
{
"count": 1,
"dnsPrefix": "agentpool1dnsPrefix",
"fqdn": "agentpool1fqdn",
"name": "agentpool1",
"osType": "Linux",
"ports": [
1
],
"storageProfile": "ManagedDisks",
"vmSize": "Standard_D2_v2"
}
],
"dnsPrefix": "dnsprefix1",
"fqdn": "dnsprefix1-123456.abc.location1.azmk8s.io",
"kubernetesVersion": "1.7.7",
"linuxProfile": {
"adminUsername": "azureuser",
"ssh": {
"publicKeys": [
{
"keyData": "keydata"
}
]
}
},
"provisioningState": "Succeeded",
"servicePrincipalProfile": {
"clientId": "clientid",
"keyVaultSecretRef": null,
"secret": "secret"
}
},
"tags": "managed-cluster",
"type": "Microsoft.ContainerService/ManagedClusters"
}
]
}
}
}
}
Loading