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

including orchestratorVersion and provisioning state for agent pool #5156

Merged
merged 5 commits into from
Feb 13, 2019
Merged

including orchestratorVersion and provisioning state for agent pool #5156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
45a3476
including orchestratorVersion and provisioning state for agent pool
Feb 5, 2019
6441051
fixing the readme.go.md
Feb 5, 2019
71571f4
merge with the availability zone change
Feb 12, 2019
2225c06
including enablePodSecurityPoliy properties for managedcluster and up…
Feb 12, 2019
c839610
fixing the example for enablePodSecurityPolicy
Feb 13, 2019
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
17 changes: 12 additions & 5 deletions ...r/Microsoft.ContainerService/stable/2019-02-01/examples/ManagedClustersCreate_Update.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@
},
"addonProfiles": {
},
"enableRBAC": false
"enableRBAC": true,
"enablePodSecurityPolicy": true
xizha162 marked this conversation as resolved.
Show resolved Hide resolved
}
}
},
Expand All @@ -62,7 +63,9 @@
"count": 3,
"vmSize": "Standard_DS1_v2",
"maxPods": 110,
"osType": "Linux"
"osType": "Linux",
"provisioningState": "Succeeded",
"orchestratorVersion": "1.9.6"
}
],
"linuxProfile": {
Expand All @@ -79,7 +82,8 @@
"clientId": "clientid"
},
"nodeResourceGroup": "MC_rg1_clustername1_location1",
"enableRBAC": false,
"enableRBAC": true,
"enablePodSecurityPolicy": true,
"fqdn": "dnsprefix1-abcd1234.hcp.eastus.azmk8s.io",
"networkProfile": {
"networkPlugin": "kubenet",
Expand Down Expand Up @@ -111,7 +115,9 @@
"count": 3,
"vmSize": "Standard_DS1_v2",
"maxPods": 110,
"osType": "Linux"
"osType": "Linux",
"provisioningState": "Creating",
"orchestratorVersion": "1.9.6"
}
],
"linuxProfile": {
Expand All @@ -128,7 +134,8 @@
"clientId": "clientid"
},
"nodeResourceGroup": "MC_rg1_clustername1_location1",
"enableRBAC": false,
"enableRBAC": true,
"enablePodSecurityPolicy": true,
"networkProfile": {
"networkPlugin": "kubenet",
"podCidr": "10.244.0.0/16",
Expand Down
9 changes: 8 additions & 1 deletion ...rce-manager/Microsoft.ContainerService/stable/2019-02-01/examples/ManagedClustersGet.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,14 @@
"count": 3,
"vmSize": "Standard_DS1_v2",
"maxPods": 110,
"osType": "Linux"
"osType": "Linux",
"provisioningState": "Succeeded",
"orchestratorVersion": "1.9.6",
"availabilityZones": [
"1",
"2",
"3"
]
}
],
"linuxProfile": {
Expand Down
4 changes: 3 additions & 1 deletion ...ce-manager/Microsoft.ContainerService/stable/2019-02-01/examples/ManagedClustersList.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,9 @@
"count": 3,
"vmSize": "Standard_DS1_v2",
"maxPods": 110,
"osType": "Linux"
"osType": "Linux",
"provisioningState": "Succeeded",
"orchestratorVersion": "1.9.6"
}
],
"linuxProfile": {
Expand Down
4 changes: 3 additions & 1 deletion ...osoft.ContainerService/stable/2019-02-01/examples/ManagedClustersListByResourceGroup.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,9 @@
"count": 3,
"vmSize": "Standard_DS1_v2",
"maxPods": 110,
"osType": "Linux"
"osType": "Linux",
"provisioningState": "Succeeded",
"orchestratorVersion": "1.9.6"
}
],
"linuxProfile": {
Expand Down
4 changes: 3 additions & 1 deletion ...ager/Microsoft.ContainerService/stable/2019-02-01/examples/ManagedClustersUpdateTags.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,9 @@
"count": 3,
"vmSize": "Standard_DS1_v2",
"maxPods": 110,
"osType": "Linux"
"osType": "Linux",
"provisioningState": "Succeeded",
"orchestratorVersion": "1.9.6"
}
],
"linuxProfile": {
Expand Down
96 changes: 89 additions & 7 deletions ...ervice/resource-manager/Microsoft.ContainerService/stable/2019-02-01/managedClusters.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -754,6 +754,27 @@
],
"x-ms-azure-resource": true
},
"SubResource": {
"properties": {
"id": {
"readOnly": true,
"type": "string",
"description": "Resource ID."
},
"name": {
xizha162 marked this conversation as resolved.
Show resolved Hide resolved
"readOnly": true,
"type": "string",
"description": "The name of the resource that is unique within a resource group. This name can be used to access the resource."
},
"type": {
"readOnly": true,
"type": "string",
"description": "Resource type"
}
},
"description": "Reference to another subresource.",
"x-ms-azure-resource": true
},
"TagsObject": {
"properties": {
"tags": {
Expand Down Expand Up @@ -1043,12 +1064,8 @@
],
"description": "Profile for the container service master."
},
"ManagedClusterAgentPoolProfile": {
"ManagedClusterAgentPoolProfileProperties": {
"properties": {
"name": {
"type": "string",
"description": "Unique name of the agent pool profile in the context of the subscription and resource group."
},
"count": {
"type": "integer",
"format": "int32",
Expand Down Expand Up @@ -1096,6 +1113,15 @@
"$ref": "#/definitions/AgentPoolType",
"description": "AgentPoolType represents types of an agent pool"
},
"orchestratorVersion": {
"type": "string",
"description": "Version of orchestrator specified when creating the managed cluster."
},
"provisioningState": {
"readOnly": true,
"type": "string",
"description": "The current deployment or provisioning state, which only appears in the response."
},
"availabilityZones": {
"type": "array",
"items": {
Expand All @@ -1105,10 +1131,28 @@
}
},
"required": [
"name",
"vmSize",
"count"
],
"description": "Properties for the container service agent pool profile."
},
"ManagedClusterAgentPoolProfile": {
"allOf": [
{
"$ref": "#/definitions/ManagedClusterAgentPoolProfileProperties"
},
{
"properties": {
"name": {
"type": "string",
"description": "Unique name of the agent pool profile in the context of the subscription and resource group."
}
}
}
],
"required": [
"name"
],
"description": "Profile for the container service agent pool."
},
"AgentPoolType": {
Expand All @@ -1123,6 +1167,40 @@
},
"description": "AgentPoolType represents types of an agent pool"
},
"AgentPoolListResult": {
"properties": {
"value": {
"type": "array",
"items": {
"$ref": "#/definitions/AgentPool"
},
"description": "The list of agent pools."
},
"nextLink": {
"type": "string",
"description": "The URL to get the next set of agent pool results.",
"readOnly": true
}
},
"description": "The response from the List Agent Pools operation."
},
"AgentPool": {
"allOf": [
{
"$ref": "#/definitions/SubResource"
xizha162 marked this conversation as resolved.
Show resolved Hide resolved
},
{
"properties": {
"properties": {
"description": "Properties of an agent pool.",
"$ref": "#/definitions/ManagedClusterAgentPoolProfileProperties",
"x-ms-client-flatten": true
}
}
}
],
"description": "Agent Pool."
},
"ContainerServiceWindowsProfile": {
"properties": {
"adminUsername": {
Expand Down Expand Up @@ -1353,6 +1431,10 @@
"type": "boolean",
"description": "Whether to enable Kubernetes Role-Based Access Control."
},
"enablePodSecurityPolicy": {
"type": "boolean",
"description": "Whether to enable Kubernetes Pod security policy."
},
"networkProfile": {
"$ref": "#/definitions/ContainerServiceNetworkProfile",
"description": "Profile of network configuration."
Expand Down Expand Up @@ -1634,4 +1716,4 @@
"x-ms-parameter-location": "client"
}
}
}
}
11 changes: 11 additions & 0 deletions specification/containerservice/resource-manager/readme.go.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ go:

``` yaml $(go) && $(multiapi)
batch:
- tag: package-2019-02
- tag: package-2018-09-30-preview
- tag: package-2018-08-preview
- tag: package-2018-03
Expand All @@ -20,6 +21,16 @@ batch:
- tag: package-2017-07
```

### Tag: package-2019-02 and go

These settings apply only when `--package-2019-02 --go` is specified on the command line.
Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.

``` yaml $(tag)=='package-2019-02' && $(go)
namespace: containerservice
output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2019-02-01/$(namespace)
```

### Tag: package-2018-09-30-preview and go

These settings apply only when `--package-2018-09-30-preview --go` is specified on the command line.
Expand Down
14 changes: 13 additions & 1 deletion specification/containerservice/resource-manager/readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,10 @@ These settings apply only when `--tag=package-2019-02` is specified on the comma

```yaml $(tag) == 'package-2019-02'
input-file:
- Microsoft.ContainerService/stable/2019-02-01/managedClusters.json
- Microsoft.ContainerService/preview/2018-09-30-preview/openShiftManagedClusters.json
- Microsoft.ContainerService/stable/2017-07-01/containerService.json
- Microsoft.ContainerService/stable/2019-02-01/managedClusters.json
- Microsoft.ContainerService/stable/2017-09-30/location.json
```
### Tag: package-2018-08-preview

Expand Down Expand Up @@ -111,6 +114,15 @@ input-file:
- Microsoft.ContainerService/stable/2017-07-01/containerService.json
```

### Tag: package-2019-02-only

These settings apply only when `--tag=package-2019-02-only` is specified on the command line.

``` yaml $(tag) == 'package-2019-02-only'
input-file:
- Microsoft.ContainerService/stable/2019-02-01/managedClusters.json
```

### Tag: package-2018-08-preview-only

These settings apply only when `--tag=package-2018-08-preview-only` is specified on the command line.
Expand Down
11 changes: 11 additions & 0 deletions 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,11 +18,22 @@ Generate all API versions currently shipped for this package

```yaml $(python) && $(multiapi)
batch:
- tag: package-2019-02-only
- tag: package-2018-09-preview-only
- tag: package-2018-08-preview-only
- tag: package-2018-03-only
- tag: package-2017-07-only-extended
```
### Tag: package-2019-02-only and python

These settings apply only when `--tag=package-2019-02-only --python` is specified on the command line.
Please also specify `--python-sdks-folder=<path to the root directory of your azure-sdk-for-python clone>`.

``` yaml $(tag) == 'package-2019-02-only' && $(python)
python:
namespace: azure.mgmt.containerservice.v2019_02_01_preview
output-folder: $(python-sdks-folder)/azure-mgmt-containerservice/azure/mgmt/containerservice/v2019_02_01_preview
```

### Tag: package-2018-09-preview-only and python

Expand Down