Skip to content

Commit

Permalink
re-apply the changes to making the count field optional to fix regres…
Browse files Browse the repository at this point in the history 
…sion when duplicating API versions
  • Loading branch information
@marwanad
marwanad committed May 27, 2020
1 parent aad8a36 commit 603e5fe
Show file tree
Hide file tree
Showing 10 changed files with 385 additions and 40 deletions.
73 changes: 73 additions & 0 deletions ...urce-manager/Microsoft.ContainerService/stable/2019-11-01/examples/AgentPools_Update.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
{
"parameters": {
"api-version": "2019-11-01",
"subscriptionId": "subid1",
"resourceGroupName": "rg1",
"resourceName": "clustername1",
"agentPoolName": "agentpool1",
"parameters": {
"properties": {
"orchestratorVersion": "",
"count": 3,
"enableAutoScaling": true,
"minCount": 2,
"maxCount": 2,
"vmSize": "Standard_DS1_v2",
"osType": "Linux",
"nodeTaints": [
"Key1=Value1:NoSchedule"
],
"scaleSetPriority": "Low",
"scaleSetEvictionPolicy": "Delete"
}
}
},
"responses": {
"200": {
"body": {
"id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/managedClusters/clustername1/agentPools/agentpool1",
"type": "Microsoft.ContainerService/managedClusters/agentPools",
"name": "agentpool1",
"properties": {
"provisioningState": "Succeeded",
"orchestratorVersion": "1.9.6",
"count": 3,
"enableAutoScaling": true,
"minCount": 2,
"maxCount": 2,
"vmSize": "Standard_DS1_v2",
"maxPods": 110,
"osType": "Linux",
"nodeTaints": [
"Key1=Value1:NoSchedule"
],
"scaleSetPriority": "Low",
"scaleSetEvictionPolicy": "Delete"
}
}
},
"201": {
"body": {
"id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/managedClusters/clustername1/agentPools/agentpool1",
"type": "Microsoft.ContainerService/managedClusters/agentPools",
"name": "agentpool1",
"properties": {
"provisioningState": "Updating",
"orchestratorVersion": "1.9.6",
"count": 3,
"enableAutoScaling": true,
"minCount": 2,
"maxCount": 2,
"vmSize": "Standard_DS1_v2",
"maxPods": 110,
"osType": "Linux",
"nodeTaints": [
"Key1=Value1:NoSchedule"
],
"scaleSetPriority": "Low",
"scaleSetEvictionPolicy": "Delete"
}
}
}
}
}
12 changes: 4 additions & 8 deletions ...ervice/resource-manager/Microsoft.ContainerService/stable/2019-11-01/managedClusters.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -719,6 +719,9 @@
"x-ms-examples": {
"Create/Update Agent Pool": {
"$ref": "./examples/AgentPoolsCreate_Update.json"
},
"Update Agent Pool": {
"$ref": "./examples/AgentPools_Update.json"
}
}
},
Expand Down Expand Up @@ -1423,10 +1426,7 @@
"count": {
"type": "integer",
"format": "int32",
"maximum": 100,
"minimum": 1,
"description": "Number of agents (VMs) to host docker containers. Allowed values must be in the range of 1 to 100 (inclusive). The default value is 1. ",
"default": 1
"description": "Number of agents (VMs) to host docker containers. Allowed values must be in the range of 1 to 100 (inclusive). The default value is 1."
},
"vmSize": {
"$ref": "#/definitions/ContainerServiceVMSize",
Expand Down Expand Up @@ -1517,10 +1517,6 @@
"description": "Taints added to new nodes during node pool create and scale. For example, key=value:NoSchedule."
}
},
"required": [
"vmSize",
"count"
],
"description": "Properties for the container service agent pool profile."
},
"ManagedClusterAgentPoolProfile": {
Expand Down
73 changes: 73 additions & 0 deletions ...urce-manager/Microsoft.ContainerService/stable/2020-01-01/examples/AgentPools_Update.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
{
"parameters": {
"api-version": "2020-01-01",
"subscriptionId": "subid1",
"resourceGroupName": "rg1",
"resourceName": "clustername1",
"agentPoolName": "agentpool1",
"parameters": {
"properties": {
"orchestratorVersion": "",
"count": 3,
"enableAutoScaling": true,
"minCount": 2,
"maxCount": 2,
"vmSize": "Standard_DS1_v2",
"osType": "Linux",
"nodeTaints": [
"Key1=Value1:NoSchedule"
],
"scaleSetPriority": "Low",
"scaleSetEvictionPolicy": "Delete"
}
}
},
"responses": {
"200": {
"body": {
"id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/managedClusters/clustername1/agentPools/agentpool1",
"type": "Microsoft.ContainerService/managedClusters/agentPools",
"name": "agentpool1",
"properties": {
"provisioningState": "Succeeded",
"orchestratorVersion": "1.9.6",
"count": 3,
"enableAutoScaling": true,
"minCount": 2,
"maxCount": 2,
"vmSize": "Standard_DS1_v2",
"maxPods": 110,
"osType": "Linux",
"nodeTaints": [
"Key1=Value1:NoSchedule"
],
"scaleSetPriority": "Low",
"scaleSetEvictionPolicy": "Delete"
}
}
},
"201": {
"body": {
"id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/managedClusters/clustername1/agentPools/agentpool1",
"type": "Microsoft.ContainerService/managedClusters/agentPools",
"name": "agentpool1",
"properties": {
"provisioningState": "Updating",
"orchestratorVersion": "1.9.6",
"count": 3,
"enableAutoScaling": true,
"minCount": 2,
"maxCount": 2,
"vmSize": "Standard_DS1_v2",
"maxPods": 110,
"osType": "Linux",
"nodeTaints": [
"Key1=Value1:NoSchedule"
],
"scaleSetPriority": "Low",
"scaleSetEvictionPolicy": "Delete"
}
}
}
}
}
12 changes: 4 additions & 8 deletions ...ervice/resource-manager/Microsoft.ContainerService/stable/2020-01-01/managedClusters.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -719,6 +719,9 @@
"x-ms-examples": {
"Create/Update Agent Pool": {
"$ref": "./examples/AgentPoolsCreate_Update.json"
},
"Update Agent Pool": {
"$ref": "./examples/AgentPools_Update.json"
}
}
},
Expand Down Expand Up @@ -1423,10 +1426,7 @@
"count": {
"type": "integer",
"format": "int32",
"maximum": 100,
"minimum": 1,
"description": "Number of agents (VMs) to host docker containers. Allowed values must be in the range of 1 to 100 (inclusive). The default value is 1. ",
"default": 1
"description": "Number of agents (VMs) to host docker containers. Allowed values must be in the range of 1 to 100 (inclusive). The default value is 1."
},
"vmSize": {
"$ref": "#/definitions/ContainerServiceVMSize",
Expand Down Expand Up @@ -1517,10 +1517,6 @@
"description": "Taints added to new nodes during node pool create and scale. For example, key=value:NoSchedule."
}
},
"required": [
"vmSize",
"count"
],
"description": "Properties for the container service agent pool profile."
},
"ManagedClusterAgentPoolProfile": {
Expand Down
73 changes: 73 additions & 0 deletions ...urce-manager/Microsoft.ContainerService/stable/2020-02-01/examples/AgentPools_Update.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
{
"parameters": {
"api-version": "2020-02-01",
"subscriptionId": "subid1",
"resourceGroupName": "rg1",
"resourceName": "clustername1",
"agentPoolName": "agentpool1",
"parameters": {
"properties": {
"orchestratorVersion": "",
"count": 3,
"enableAutoScaling": true,
"minCount": 2,
"maxCount": 2,
"vmSize": "Standard_DS1_v2",
"osType": "Linux",
"nodeTaints": [
"Key1=Value1:NoSchedule"
],
"scaleSetPriority": "Low",
"scaleSetEvictionPolicy": "Delete"
}
}
},
"responses": {
"200": {
"body": {
"id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/managedClusters/clustername1/agentPools/agentpool1",
"type": "Microsoft.ContainerService/managedClusters/agentPools",
"name": "agentpool1",
"properties": {
"provisioningState": "Succeeded",
"orchestratorVersion": "1.9.6",
"count": 3,
"enableAutoScaling": true,
"minCount": 2,
"maxCount": 2,
"vmSize": "Standard_DS1_v2",
"maxPods": 110,
"osType": "Linux",
"nodeTaints": [
"Key1=Value1:NoSchedule"
],
"scaleSetPriority": "Low",
"scaleSetEvictionPolicy": "Delete"
}
}
},
"201": {
"body": {
"id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/managedClusters/clustername1/agentPools/agentpool1",
"type": "Microsoft.ContainerService/managedClusters/agentPools",
"name": "agentpool1",
"properties": {
"provisioningState": "Updating",
"orchestratorVersion": "1.9.6",
"count": 3,
"enableAutoScaling": true,
"minCount": 2,
"maxCount": 2,
"vmSize": "Standard_DS1_v2",
"maxPods": 110,
"osType": "Linux",
"nodeTaints": [
"Key1=Value1:NoSchedule"
],
"scaleSetPriority": "Low",
"scaleSetEvictionPolicy": "Delete"
}
}
}
}
}
12 changes: 4 additions & 8 deletions ...ervice/resource-manager/Microsoft.ContainerService/stable/2020-02-01/managedClusters.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -720,6 +720,9 @@
"Create/Update Agent Pool": {
"$ref": "./examples/AgentPoolsCreate_Update.json"
},
"Update Agent Pool": {
"$ref": "./examples/AgentPools_Update.json"
},
"Create Spot Agent Pool": {
"$ref": "./examples/AgentPoolsCreate_Spot.json"
}
Expand Down Expand Up @@ -1426,10 +1429,7 @@
"count": {
"type": "integer",
"format": "int32",
"maximum": 100,
"minimum": 1,
"description": "Number of agents (VMs) to host docker containers. Allowed values must be in the range of 1 to 100 (inclusive). The default value is 1. ",
"default": 1
"description": "Number of agents (VMs) to host docker containers. Allowed values must be in the range of 1 to 100 (inclusive). The default value is 1."
},
"vmSize": {
"$ref": "#/definitions/ContainerServiceVMSize",
Expand Down Expand Up @@ -1524,10 +1524,6 @@
"description": "Taints added to new nodes during node pool create and scale. For example, key=value:NoSchedule."
}
},
"required": [
"vmSize",
"count"
],
"description": "Properties for the container service agent pool profile."
},
"ManagedClusterAgentPoolProfile": {
Expand Down
73 changes: 73 additions & 0 deletions ...urce-manager/Microsoft.ContainerService/stable/2020-03-01/examples/AgentPools_Update.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
{
"parameters": {
"api-version": "2020-03-01",
"subscriptionId": "subid1",
"resourceGroupName": "rg1",
"resourceName": "clustername1",
"agentPoolName": "agentpool1",
"parameters": {
"properties": {
"orchestratorVersion": "",
"count": 3,
"enableAutoScaling": true,
"minCount": 2,
"maxCount": 2,
"vmSize": "Standard_DS1_v2",
"osType": "Linux",
"nodeTaints": [
"Key1=Value1:NoSchedule"
],
"scaleSetPriority": "Low",
"scaleSetEvictionPolicy": "Delete"
}
}
},
"responses": {
"200": {
"body": {
"id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/managedClusters/clustername1/agentPools/agentpool1",
"type": "Microsoft.ContainerService/managedClusters/agentPools",
"name": "agentpool1",
"properties": {
"provisioningState": "Succeeded",
"orchestratorVersion": "1.9.6",
"count": 3,
"enableAutoScaling": true,
"minCount": 2,
"maxCount": 2,
"vmSize": "Standard_DS1_v2",
"maxPods": 110,
"osType": "Linux",
"nodeTaints": [
"Key1=Value1:NoSchedule"
],
"scaleSetPriority": "Low",
"scaleSetEvictionPolicy": "Delete"
}
}
},
"201": {
"body": {
"id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/managedClusters/clustername1/agentPools/agentpool1",
"type": "Microsoft.ContainerService/managedClusters/agentPools",
"name": "agentpool1",
"properties": {
"provisioningState": "Updating",
"orchestratorVersion": "1.9.6",
"count": 3,
"enableAutoScaling": true,
"minCount": 2,
"maxCount": 2,
"vmSize": "Standard_DS1_v2",
"maxPods": 110,
"osType": "Linux",
"nodeTaints": [
"Key1=Value1:NoSchedule"
],
"scaleSetPriority": "Low",
"scaleSetEvictionPolicy": "Delete"
}
}
}
}
}
Loading

0 comments on commit 603e5fe

Please sign in to comment.