From b010bdbdb5650f1e40cbc19d8c44433beb37f7f5 Mon Sep 17 00:00:00 2001 From: Matt Boersma Date: Fri, 8 Jun 2018 13:49:09 -0600 Subject: [PATCH 1/3] [AKS] add nodeResourceGroup property --- .../stable/2018-03-31/managedClusters.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/specification/containerservices/resource-manager/Microsoft.ContainerService/stable/2018-03-31/managedClusters.json b/specification/containerservices/resource-manager/Microsoft.ContainerService/stable/2018-03-31/managedClusters.json index eb5128c63ff9..530d696ed6be 100644 --- a/specification/containerservices/resource-manager/Microsoft.ContainerService/stable/2018-03-31/managedClusters.json +++ b/specification/containerservices/resource-manager/Microsoft.ContainerService/stable/2018-03-31/managedClusters.json @@ -1066,6 +1066,11 @@ }, "description": "Profile of managed cluster add-on." }, + "nodeResourceGroup": { + "readOnly": true, + "type": "string", + "description": "Name of the resource group containing agent pool nodes." + }, "enableRBAC": { "type": "boolean", "description": "Whether to enable Kubernetes Role-Based Access Control." From ce654ee5a576560d201e5784096cccbd3f300a50 Mon Sep 17 00:00:00 2001 From: Matt Boersma Date: Fri, 8 Jun 2018 13:54:25 -0600 Subject: [PATCH 2/3] Increment python package version to 4.1.0 --- specification/containerservices/resource-manager/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/containerservices/resource-manager/readme.md b/specification/containerservices/resource-manager/readme.md index c54ca17dbe7e..6243df4b784a 100644 --- a/specification/containerservices/resource-manager/readme.md +++ b/specification/containerservices/resource-manager/readme.md @@ -208,7 +208,7 @@ python: payload-flattening-threshold: 2 namespace: azure.mgmt.containerservice package-name: azure-mgmt-containerservice - package-version: 4.0.0 + package-version: 4.1.0 clear-output-folder: true ``` ``` yaml $(python) && $(python-mode) == 'update' From 46063f49672944e407244d23940278d0b4b7dc60 Mon Sep 17 00:00:00 2001 From: Matt Boersma Date: Fri, 8 Jun 2018 15:34:40 -0600 Subject: [PATCH 3/3] Update example JSON with nodeResourceGroup --- .../ManagedClustersCreate_Update.json | 121 +++++++++++------- .../examples/ManagedClustersGet.json | 45 ++++--- .../examples/ManagedClustersList.json | 47 ++++--- .../ManagedClustersListByResourceGroup.json | 49 +++---- 4 files changed, 155 insertions(+), 107 deletions(-) diff --git a/specification/containerservices/resource-manager/Microsoft.ContainerService/stable/2018-03-31/examples/ManagedClustersCreate_Update.json b/specification/containerservices/resource-manager/Microsoft.ContainerService/stable/2018-03-31/examples/ManagedClustersCreate_Update.json index f4e9ca0c767b..7fa522c908d4 100644 --- a/specification/containerservices/resource-manager/Microsoft.ContainerService/stable/2018-03-31/examples/ManagedClustersCreate_Update.json +++ b/specification/containerservices/resource-manager/Microsoft.ContainerService/stable/2018-03-31/examples/ManagedClustersCreate_Update.json @@ -6,16 +6,40 @@ "resourceName": "clustername1", "parameters": { "location": "location1", + "tags": { + "tier": "production", + "archv2": "" + }, "properties": { + "kubernetesVersion": "", "dnsPrefix": "dnsprefix1", "agentPoolProfiles": [ { - "count": 1, - "name": "agentpool1", - "vmSize": "Standard_D2_v2" + "name": "nodepool1", + "count": 3, + "vmSize": "Standard_DS1_v2", + "dnsPrefix": "dnsprefix1", + "storageProfile": "ManagedDisks", + "osType": "Linux" } ], - "kubernetesVersion": "1.7.7" + "linuxProfile": { + "adminUsername": "azureuser", + "ssh": { + "publicKeys": [ + { + "keyData": "keydata" + } + ] + } + }, + "servicePrincipalProfile": { + "clientId": "clientid", + "secret": "secret" + }, + "addonProfiles": { + }, + "enableRBAC": false } } }, @@ -24,25 +48,26 @@ "body": { "id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/managedClusters/clustername1", "location": "location1", - "name": "mycluster1", + "name": "clustername1", + "tags": { + "archv2": "", + "tier": "production" + }, + "type": "Microsoft.ContainerService/ManagedClusters", "properties": { + "provisioningState": "Succeeded", + "kubernetesVersion": "1.9.6", + "dnsPrefix": "dnsprefix1", "agentPoolProfiles": [ { - "count": 1, - "dnsPrefix": "agentpool1dnsPrefix", - "fqdn": "agentpool1fqdn", - "name": "agentpool1", - "osType": "Linux", - "ports": [ - 1 - ], + "name": "nodepool1", + "count": 3, + "vmSize": "Standard_DS1_v2", "storageProfile": "ManagedDisks", - "vmSize": "Standard_D2_v2" + "maxPods": 110, + "osType": "Linux" } ], - "dnsPrefix": "dnsprefix1", - "fqdn": "dnsprefix1-123456.abc.location1.azmk8s.io", - "kubernetesVersion": "1.7.7", "linuxProfile": { "adminUsername": "azureuser", "ssh": { @@ -53,41 +78,46 @@ ] } }, - "provisioningState": "Succeeded", "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" } - }, - "tags": { - "stage": "production", - "archv2": "" - }, - "type": "Microsoft.ContainerService/ManagedClusters" + } } }, "201": { "body": { "id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/managedClusters/clustername1", "location": "location1", - "name": "mycluster1", + "name": "clustername1", + "tags": { + "archv2": "", + "tier": "production" + }, + "type": "Microsoft.ContainerService/ManagedClusters", "properties": { + "provisioningState": "Creating", + "kubernetesVersion": "1.9.6", + "dnsPrefix": "dnsprefix1", "agentPoolProfiles": [ { - "count": 1, - "dnsPrefix": "agentpool1dnsPrefix", - "fqdn": "agentpool1fqdn", - "name": "agentpool1", - "osType": "Linux", - "ports": [ - 1 - ], + "name": "nodepool1", + "count": 3, + "vmSize": "Standard_DS1_v2", "storageProfile": "ManagedDisks", - "vmSize": "Standard_D2_v2" + "maxPods": 110, + "osType": "Linux" } ], - "dnsPrefix": "dnsprefix1", - "fqdn": "dnsprefix1-123456.abc.location1.azmk8s.io", - "kubernetesVersion": "1.7.7", "linuxProfile": { "adminUsername": "azureuser", "ssh": { @@ -98,16 +128,19 @@ ] } }, - "provisioningState": "Succeeded", "servicePrincipalProfile": { "clientId": "clientid" + }, + "nodeResourceGroup": "MC_rg1_clustername1_location1", + "enableRBAC": false, + "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" } - }, - "tags": { - "stage": "production", - "archv2": "" - }, - "type": "Microsoft.ContainerService/ManagedClusters" + } } } } diff --git a/specification/containerservices/resource-manager/Microsoft.ContainerService/stable/2018-03-31/examples/ManagedClustersGet.json b/specification/containerservices/resource-manager/Microsoft.ContainerService/stable/2018-03-31/examples/ManagedClustersGet.json index 1d0b42b19092..27878d955d24 100644 --- a/specification/containerservices/resource-manager/Microsoft.ContainerService/stable/2018-03-31/examples/ManagedClustersGet.json +++ b/specification/containerservices/resource-manager/Microsoft.ContainerService/stable/2018-03-31/examples/ManagedClustersGet.json @@ -10,25 +10,27 @@ "body": { "id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/managedClusters/clustername1", "location": "location1", - "name": "mycluster1", + "name": "clustername1", + "tags": { + "archv2": "", + "tier": "production" + }, + "type": "Microsoft.ContainerService/ManagedClusters", "properties": { + "provisioningState": "Succeeded", + "kubernetesVersion": "1.9.6", + "dnsPrefix": "dnsprefix1", + "fqdn": "dnsprefix1-abcd1234.hcp.eastus.azmk8s.io", "agentPoolProfiles": [ { - "count": 1, - "dnsPrefix": "agentpool1dnsPrefix", - "fqdn": "agentpool1fqdn", - "name": "agentpool1", - "osType": "Linux", - "ports": [ - 1 - ], + "name": "nodepool1", + "count": 3, + "vmSize": "Standard_DS1_v2", "storageProfile": "ManagedDisks", - "vmSize": "Standard_D2_v2" + "maxPods": 110, + "osType": "Linux" } ], - "dnsPrefix": "dnsprefix1", - "fqdn": "dnsprefix1-123456.abc.location1.azmk8s.io", - "kubernetesVersion": "1.7.7", "linuxProfile": { "adminUsername": "azureuser", "ssh": { @@ -39,16 +41,19 @@ ] } }, - "provisioningState": "Succeeded", "servicePrincipalProfile": { "clientId": "clientid" + }, + "nodeResourceGroup": "MC_rg1_clustername1_location1", + "enableRBAC": false, + "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" } - }, - "tags": { - "stage": "production", - "archv2": "" - }, - "type": "Microsoft.ContainerService/ManagedClusters" + } } } } diff --git a/specification/containerservices/resource-manager/Microsoft.ContainerService/stable/2018-03-31/examples/ManagedClustersList.json b/specification/containerservices/resource-manager/Microsoft.ContainerService/stable/2018-03-31/examples/ManagedClustersList.json index 4642f88a308f..2006224c507e 100644 --- a/specification/containerservices/resource-manager/Microsoft.ContainerService/stable/2018-03-31/examples/ManagedClustersList.json +++ b/specification/containerservices/resource-manager/Microsoft.ContainerService/stable/2018-03-31/examples/ManagedClustersList.json @@ -10,45 +10,50 @@ { "id": "/subscriptions/subid1/providers/Microsoft.ContainerService/managedClusters", "location": "location1", - "name": "mycluster1", + "name": "clustername1", + "tags": { + "archv2": "", + "tier": "production" + }, + "type": "Microsoft.ContainerService/ManagedClusters", "properties": { + "provisioningState": "Succeeded", + "kubernetesVersion": "1.9.6", + "dnsPrefix": "dnsprefix1", + "fqdn": "dnsprefix1-abcd1234.hcp.eastus.azmk8s.io", "agentPoolProfiles": [ { - "count": 1, - "dnsPrefix": "agentpool1dnsPrefix", - "fqdn": "agentpool1fqdn", - "name": "agentpool1", - "osType": "Linux", - "ports": [ - 1 - ], + "name": "nodepool1", + "count": 3, + "vmSize": "Standard_DS1_v2", "storageProfile": "ManagedDisks", - "vmSize": "Standard_D2_v2" + "maxPods": 110, + "osType": "Linux" } ], - "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" + }, + "nodeResourceGroup": "MC_rg1_clustername1_location1", + "enableRBAC": false, + "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" } - }, - "tags": { - "stage": "production", - "archv2": "" - }, - "type": "Microsoft.ContainerService/ManagedClusters" + } } ] } diff --git a/specification/containerservices/resource-manager/Microsoft.ContainerService/stable/2018-03-31/examples/ManagedClustersListByResourceGroup.json b/specification/containerservices/resource-manager/Microsoft.ContainerService/stable/2018-03-31/examples/ManagedClustersListByResourceGroup.json index 3aa11580ea4d..4e905dcb35a9 100644 --- a/specification/containerservices/resource-manager/Microsoft.ContainerService/stable/2018-03-31/examples/ManagedClustersListByResourceGroup.json +++ b/specification/containerservices/resource-manager/Microsoft.ContainerService/stable/2018-03-31/examples/ManagedClustersListByResourceGroup.json @@ -9,47 +9,52 @@ "body": { "value": [ { - "id": "/subscriptions/subid1/resourceGroups/rg1/providers/Microsoft.ContainerService/managedClusters", + "id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/managedClusters", "location": "location1", - "name": "mycluster1", + "name": "clustername1", + "tags": { + "archv2": "", + "tier": "production" + }, + "type": "Microsoft.ContainerService/ManagedClusters", "properties": { + "provisioningState": "Succeeded", + "kubernetesVersion": "1.9.6", + "dnsPrefix": "dnsprefix1", + "fqdn": "dnsprefix1-abcd1234.hcp.eastus.azmk8s.io", "agentPoolProfiles": [ { - "count": 1, - "dnsPrefix": "agentpool1dnsPrefix", - "fqdn": "agentpool1fqdn", - "name": "agentpool1", - "osType": "Linux", - "ports": [ - 1 - ], + "name": "nodepool1", + "count": 3, + "vmSize": "Standard_DS1_v2", "storageProfile": "ManagedDisks", - "vmSize": "Standard_D2_v2" + "maxPods": 110, + "osType": "Linux" } ], - "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" + }, + "nodeResourceGroup": "MC_rg1_clustername1_location1", + "enableRBAC": false, + "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" } - }, - "tags": { - "stage": "production", - "archv2": "" - }, - "type": "Microsoft.ContainerService/ManagedClusters" + } } ] }