Skip to content

add agentpool mode property #8534

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

Merged
ArcturusZhang merged 2 commits into from
Mar 9, 2020
Merged

add agentpool mode property #8534

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8602cbd
add agentpool mode property
Feb 27, 2020
2d7c986
Merge remote-tracking branch 'upstream/dev-containerservice-Microsoft…
Mar 3, 2020
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
9 changes: 6 additions & 3 deletions ...anager/Microsoft.ContainerService/stable/2020-03-01/examples/AgentPoolsCreate_Update.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@
"Key1=Value1:NoSchedule"
],
"scaleSetPriority": "Low",
"scaleSetEvictionPolicy": "Delete"
"scaleSetEvictionPolicy": "Delete",
"mode": "User"
}
}
},
Expand All @@ -48,7 +49,8 @@
"Key1=Value1:NoSchedule"
],
"scaleSetPriority": "Low",
"scaleSetEvictionPolicy": "Delete"
"scaleSetEvictionPolicy": "Delete",
"mode": "User"
}
}
},
Expand All @@ -74,7 +76,8 @@
"Key1=Value1:NoSchedule"
],
"scaleSetPriority": "Low",
"scaleSetEvictionPolicy": "Delete"
"scaleSetEvictionPolicy": "Delete",
"mode": "User"
}
}
}
Expand Down
9 changes: 6 additions & 3 deletions ...r/Microsoft.ContainerService/stable/2020-03-01/examples/ManagedClustersCreate_Update.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@
"2",
"3"
],
"enableNodePublicIP": true
"enableNodePublicIP": true,
"mode": "System"
}
],
"linuxProfile": {
Expand Down Expand Up @@ -101,7 +102,8 @@
"2",
"3"
],
"enableNodePublicIP": true
"enableNodePublicIP": true,
"mode": "System"
}
],
"linuxProfile": {
Expand Down Expand Up @@ -186,7 +188,8 @@
"2",
"3"
],
"enableNodePublicIP": true
"enableNodePublicIP": true,
"mode": "System"
}
],
"linuxProfile": {
Expand Down
20 changes: 18 additions & 2 deletions ...ervice/resource-manager/Microsoft.ContainerService/stable/2020-03-01/managedClusters.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1427,8 +1427,8 @@
"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. ",
"minimum": 0,
"description": "Number of agents (VMs) to host docker containers. Allowed values must be in the range of 0 to 100 (inclusive). The default value is 1. ",
"default": 1
},
"vmSize": {
Expand Down Expand Up @@ -1470,6 +1470,10 @@
"$ref": "#/definitions/AgentPoolType",
"description": "AgentPoolType represents types of an agent pool"
},
"mode": {
"$ref": "#/definitions/AgentPoolMode",
"description": "AgentPoolMode represents mode of an agent pool"
},
"orchestratorVersion": {
"type": "string",
"description": "Version of orchestrator specified when creating the managed cluster."
Expand Down Expand Up @@ -1562,6 +1566,18 @@
},
"description": "AgentPoolType represents types of an agent pool."
},
"AgentPoolMode": {
"type": "string",
"enum": [
"System",
"User"
],
"x-ms-enum": {
"name": "AgentPoolMode",
"modelAsString": true
},
"description": "AgentPoolMode represents mode of an agent pool."
},
"AgentPoolListResult": {
"properties": {
"value": {
Expand Down
1 change: 1 addition & 0 deletions specification/containerservice/resource-manager/readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -490,6 +490,7 @@ input-file:
- $(this-folder)/Microsoft.ContainerService/stable/2019-04-30/openShiftManagedClusters.json
- $(this-folder)/Microsoft.ContainerService/stable/2017-07-01/containerService.json
- $(this-folder)/Microsoft.ContainerService/stable/2019-08-01/location.json
- $(this-folder)/Microsoft.ContainerService/stable/2020-03-01/managedClusters.json
- $(this-folder)/Microsoft.ContainerService/stable/2020-02-01/managedClusters.json
- $(this-folder)/Microsoft.ContainerService/stable/2020-01-01/managedClusters.json
- $(this-folder)/Microsoft.ContainerService/stable/2019-11-01/managedClusters.json
Expand Down
2 changes: 1 addition & 1 deletion specification/containerservice/resource-manager/readme.python.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Generate all API versions currently shipped for this package

```yaml $(python) && $(multiapi)
batch:
- tag: pacakge-2020-03-01-only
- tag: package-2020-03-01-only
- tag: package-2020-02-01-only
- tag: package-2020-01-01-only
- tag: package-2019-11-01-only
Expand Down