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

Support two apiversion for container service #4237

Merged
merged 20 commits into from
Oct 19, 2018
Merged

Support two apiversion for container service #4237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
aa46e23
add 2018-08-01-preview
zqingqing1 Aug 9, 2018
1911e06
modify readme to support 2 api version for python
zqingqing1 Aug 10, 2018
4e960ff
change back multp-api, use new api
zqingqing1 Aug 10, 2018
59ebe5d
remove accessprofile and getaccessprofile api, add autoscaler and vms…
zqingqing1 Aug 10, 2018
b58029b
format change to enum
zqingqing1 Aug 10, 2018
663fe8f
rebase and resolve conflict
zqingqing1 Oct 15, 2018
902f5cc
add osMC resource in the readme
zqingqing1 Oct 15, 2018
40c7700
modify the example json files
zqingqing1 Oct 17, 2018
3f9220b
add listcredential api back
zqingqing1 Oct 17, 2018
b2521f1
fix Go SDK codegen
jhendrixMSFT Oct 18, 2018
6d6a25b
correct typo and remove default for agentpooltype
zqingqing1 Oct 18, 2018
754efb7
Merge branch 'master' of https://github.com/Azure/azure-rest-api-spec…
zqingqing1 Oct 18, 2018
de4b057
Merge branch 'support-two-apiversion' of github.com:zqingqing1/azure-…
zqingqing1 Oct 18, 2018
feb703f
change default tag to 2018-09-30-preview
zqingqing1 Oct 18, 2018
c5208bc
fix Go SDK codegen for containerservices (#4296)
jhendrixMSFT Oct 19, 2018
5e3b5dc
Merge branch 'master' into support-two-apiversion
jhendrixMSFT Oct 19, 2018
a9a3457
try to put both api in the 2018-08-preview tag
zqingqing1 Oct 19, 2018
6b90bdf
Merge branch 'support-two-apiversion' of github.com:zqingqing1/azure-…
zqingqing1 Oct 19, 2018
ed2c19a
both api in same tag, not working, revert back
zqingqing1 Oct 19, 2018
6da165d
udpate tag to lastest version
zqingqing1 Oct 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
143 changes: 143 additions & 0 deletions ...ft.ContainerService/preview/2018-08-01-preview/examples/ManagedClustersCreate_Update.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,143 @@
{
"parameters": {
"api-version": "2018-08-01-preview",
"subscriptionId": "subid1",
"resourceGroupName": "rg1",
"resourceName": "clustername1",
"parameters": {
"location": "location1",
"tags": {
"tier": "production",
"archv2": ""
},
"properties": {
"kubernetesVersion": "",
"dnsPrefix": "dnsprefix1",
"agentPoolProfiles": [
{
"name": "nodepool1",
"count": 3,
"vmSize": "Standard_DS1_v2",
"osType": "Linux"
}
],
"linuxProfile": {
"adminUsername": "azureuser",
"ssh": {
"publicKeys": [
{
"keyData": "keydata"
}
]
}
},
"servicePrincipalProfile": {
"clientId": "clientid",
"secret": "secret"
},
"addonProfiles": {
},
"enableRBAC": false
}
}
},
"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",
"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"
}
}
}
},
"201": {
"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": "Creating",
"kubernetesVersion": "1.9.6",
"dnsPrefix": "dnsprefix1",
"agentPoolProfiles": [
{
"name": "nodepool1",
"count": 3,
"vmSize": "Standard_DS1_v2",
"maxPods": 110,
"osType": "Linux"
}
],
"linuxProfile": {
"adminUsername": "azureuser",
"ssh": {
"publicKeys": [
{
"keyData": "keydata"
}
]
}
},
"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"
}
}
}
}
}
}
12 changes: 12 additions & 0 deletions ...Microsoft.ContainerService/preview/2018-08-01-preview/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-08-01-preview",
"subscriptionId": "subid1",
"resourceGroupName": "rg1",
"resourceName": "clustername1"
},
"responses": {
"202": {},
"204": {}
}
}
59 changes: 59 additions & 0 deletions ...er/Microsoft.ContainerService/preview/2018-08-01-preview/examples/ManagedClustersGet.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
{
"parameters": {
"api-version": "2018-08-01-preview",
"subscriptionId": "subid1",
"resourceGroupName": "rg1",
"resourceName": "clustername1"
},
"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",
"fqdn": "dnsprefix1-abcd1234.hcp.eastus.azmk8s.io",
"agentPoolProfiles": [
{
"name": "nodepool1",
"count": 3,
"vmSize": "Standard_DS1_v2",
"maxPods": 110,
"osType": "Linux"
}
],
"linuxProfile": {
"adminUsername": "azureuser",
"ssh": {
"publicKeys": [
{
"keyData": "keydata"
}
]
}
},
"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"
}
}
}
}
}
}
22 changes: 22 additions & 0 deletions ...ContainerService/preview/2018-08-01-preview/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-08-01-preview",
"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 ...ontainerService/preview/2018-08-01-preview/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-08-01-preview",
"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"
}
}
}
}
61 changes: 61 additions & 0 deletions ...r/Microsoft.ContainerService/preview/2018-08-01-preview/examples/ManagedClustersList.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
{
"parameters": {
"api-version": "2018-08-01-preview",
"subscriptionId": "subid1"
},
"responses": {
"200": {
"body": {
"value": [
{
"id": "/subscriptions/subid1/providers/Microsoft.ContainerService/managedClusters",
"location": "location1",
"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": [
{
"name": "nodepool1",
"count": 3,
"vmSize": "Standard_DS1_v2",
"maxPods": 110,
"osType": "Linux"
}
],
"linuxProfile": {
"adminUsername": "azureuser",
"ssh": {
"publicKeys": [
{
"keyData": "keydata"
}
]
}
},
"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"
}
}
}
]
}
}
}
}
Loading