Skip to content

Commit

Permalink
Dev containerservice microsoft.container service 2020 07 01 (Azure#10348
Browse files Browse the repository at this point in the history
)

* Adds base for updating Microsoft.ContainerService from version stable/2020-06-01 to version 2020-07-01

* Updates readme

* Updates API version in new specs and examples

* Add licenseType in WindowsProfile for AKS (Azure#10050)

* Change podsecuritypolicy description from PREVIEW to DEPRECATING. (Azure#10175)

* [AKS] Use POST operation for node image version (Azure#10294)

Co-authored-by: Xiaofang Zhang <[email protected]>
Co-authored-by: Chou Hu <[email protected]>
Co-authored-by: Jun Sun <[email protected]>
  • Loading branch information
4 people authored Aug 19, 2020
1 parent 235a699 commit 7a8e546
Show file tree
Hide file tree
Showing 46 changed files with 5,225 additions and 14 deletions.
74 changes: 73 additions & 1 deletion cSpell.json
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,78 @@
"Ochestrator"
]
},
{
"filename": "**/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2019-02-01/managedClusters.json",
"words": [
"azpodpolicy"
]
},
{
"filename": "**/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2019-04-01/managedClusters.json",
"words": [
"azpodpolicy"
]
},
{
"filename": "**/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2019-06-01/managedClusters.json",
"words": [
"azpodpolicy"
]
},
{
"filename": "**/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2019-08-01/managedClusters.json",
"words": [
"azpodpolicy"
]
},
{
"filename": "**/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2019-10-01/managedClusters.json",
"words": [
"azpodpolicy"
]
},
{
"filename": "**/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2019-11-01/managedClusters.json",
"words": [
"azpodpolicy"
]
},
{
"filename": "**/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2020-01-01/managedClusters.json",
"words": [
"azpodpolicy"
]
},
{
"filename": "**/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2020-02-01/managedClusters.json",
"words": [
"azpodpolicy"
]
},
{
"filename": "**/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2020-03-01/managedClusters.json",
"words": [
"azpodpolicy"
]
},
{
"filename": "**/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2020-04-01/managedClusters.json",
"words": [
"azpodpolicy"
]
},
{
"filename": "**/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2020-06-01/managedClusters.json",
"words": [
"azpodpolicy"
]
},
{
"filename": "**/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2020-07-01/managedClusters.json",
"words": [
"azpodpolicy"
]
},
{
"filename": "**/specification/containerregistry/data-plane/Microsoft.ContainerRegistry/preview/2018-08-10/containerregistry.json",
"words": [
Expand Down Expand Up @@ -637,4 +709,4 @@
]
}
]
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -1746,7 +1746,7 @@
},
"enablePodSecurityPolicy": {
"type": "boolean",
"description": "(PREVIEW) Whether to enable Kubernetes Pod security policy."
"description": "(DEPRECATING) Whether to enable Kubernetes pod security policy (preview). This feature is set for removal on October 15th, 2020. Learn more at aka.ms/aks/azpodpolicy."
},
"networkProfile": {
"$ref": "#/definitions/ContainerServiceNetworkProfile",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1639,7 +1639,7 @@
},
"enablePodSecurityPolicy": {
"type": "boolean",
"description": "(PREVIEW) Whether to enable Kubernetes Pod security policy."
"description": "(DEPRECATING) Whether to enable Kubernetes pod security policy (preview). This feature is set for removal on October 15th, 2020. Learn more at aka.ms/aks/azpodpolicy."
},
"networkProfile": {
"$ref": "#/definitions/ContainerServiceNetworkProfile",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1741,7 +1741,7 @@
},
"enablePodSecurityPolicy": {
"type": "boolean",
"description": "(PREVIEW) Whether to enable Kubernetes Pod security policy."
"description": "(DEPRECATING) Whether to enable Kubernetes pod security policy (preview). This feature is set for removal on October 15th, 2020. Learn more at aka.ms/aks/azpodpolicy."
},
"networkProfile": {
"$ref": "#/definitions/ContainerServiceNetworkProfile",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1847,7 +1847,7 @@
},
"enablePodSecurityPolicy": {
"type": "boolean",
"description": "(PREVIEW) Whether to enable Kubernetes Pod security policy."
"description": "(DEPRECATING) Whether to enable Kubernetes pod security policy (preview). This feature is set for removal on October 15th, 2020. Learn more at aka.ms/aks/azpodpolicy."
},
"networkProfile": {
"$ref": "#/definitions/ContainerServiceNetworkProfile",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1895,7 +1895,7 @@
},
"enablePodSecurityPolicy": {
"type": "boolean",
"description": "(PREVIEW) Whether to enable Kubernetes Pod security policy."
"description": "(DEPRECATING) Whether to enable Kubernetes pod security policy (preview). This feature is set for removal on October 15th, 2020. Learn more at aka.ms/aks/azpodpolicy."
},
"networkProfile": {
"$ref": "#/definitions/ContainerServiceNetworkProfile",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1938,7 +1938,7 @@
},
"enablePodSecurityPolicy": {
"type": "boolean",
"description": "(PREVIEW) Whether to enable Kubernetes Pod security policy."
"description": "(DEPRECATING) Whether to enable Kubernetes pod security policy (preview). This feature is set for removal on October 15th, 2020. Learn more at aka.ms/aks/azpodpolicy."
},
"networkProfile": {
"$ref": "#/definitions/ContainerServiceNetworkProfile",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1938,7 +1938,7 @@
},
"enablePodSecurityPolicy": {
"type": "boolean",
"description": "(PREVIEW) Whether to enable Kubernetes Pod security policy."
"description": "(DEPRECATING) Whether to enable Kubernetes pod security policy (preview). This feature is set for removal on October 15th, 2020. Learn more at aka.ms/aks/azpodpolicy."
},
"networkProfile": {
"$ref": "#/definitions/ContainerServiceNetworkProfile",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1957,7 +1957,7 @@
},
"enablePodSecurityPolicy": {
"type": "boolean",
"description": "(PREVIEW) Whether to enable Kubernetes Pod security policy."
"description": "(DEPRECATING) Whether to enable Kubernetes pod security policy (preview). This feature is set for removal on October 15th, 2020. Learn more at aka.ms/aks/azpodpolicy."
},
"networkProfile": {
"$ref": "#/definitions/ContainerServiceNetworkProfile",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1979,7 +1979,7 @@
},
"enablePodSecurityPolicy": {
"type": "boolean",
"description": "(PREVIEW) Whether to enable Kubernetes Pod security policy."
"description": "(DEPRECATING) Whether to enable Kubernetes pod security policy (preview). This feature is set for removal on October 15th, 2020. Learn more at aka.ms/aks/azpodpolicy."
},
"networkProfile": {
"$ref": "#/definitions/ContainerServiceNetworkProfile",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1997,7 +1997,7 @@
},
"enablePodSecurityPolicy": {
"type": "boolean",
"description": "(PREVIEW) Whether to enable Kubernetes Pod security policy."
"description": "(DEPRECATING) Whether to enable Kubernetes pod security policy (preview). This feature is set for removal on October 15th, 2020. Learn more at aka.ms/aks/azpodpolicy."
},
"networkProfile": {
"$ref": "#/definitions/ContainerServiceNetworkProfile",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2209,7 +2209,7 @@
},
"enablePodSecurityPolicy": {
"type": "boolean",
"description": "(PREVIEW) Whether to enable Kubernetes Pod security policy."
"description": "(DEPRECATING) Whether to enable Kubernetes pod security policy (preview). This feature is set for removal on October 15th, 2020. Learn more at aka.ms/aks/azpodpolicy."
},
"networkProfile": {
"$ref": "#/definitions/ContainerServiceNetworkProfile",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
{
"parameters": {
"api-version": "2020-07-01",
"subscriptionId": "subid1",
"resourceGroupName": "rg1",
"resourceName": "clustername1",
"agentPoolName": "agentpool1",
"parameters": {
"properties": {
"orchestratorVersion": "",
"count": 3,
"vmSize": "Standard_DS2_v2",
"osType": "Linux",
"proximityPlacementGroupID": "/subscriptions/subid1/resourcegroups/rg1/providers//Microsoft.Compute/proximityPlacementGroups/ppg1"
}
}
},
"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,
"vmSize": "Standard_DS2_v2",
"maxPods": 110,
"osType": "Linux",
"proximityPlacementGroupID": "/subscriptions/subid1/resourcegroups/rg1/providers//Microsoft.Compute/proximityPlacementGroups/ppg1"
}
}
},
"201": {
"body": {
"id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/managedClusters/clustername1/agentPools/agentpool1",
"type": "Microsoft.ContainerService/managedClusters/agentPools",
"name": "agentpool1",
"properties": {
"provisioningState": "Creating",
"orchestratorVersion": "1.9.6",
"count": 3,
"vmSize": "Standard_DS2_v2",
"maxPods": 110,
"osType": "Linux",
"proximityPlacementGroupID": "/subscriptions/subid1/resourcegroups/rg1/providers//Microsoft.Compute/proximityPlacementGroups/ppg1"
}
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
{
"parameters": {
"api-version": "2020-07-01",
"subscriptionId": "subid1",
"resourceGroupName": "rg1",
"resourceName": "clustername1",
"agentPoolName": "agentpool1",
"parameters": {
"properties": {
"orchestratorVersion": "",
"count": 3,
"vmSize": "Standard_DS1_v2",
"osType": "Linux",
"tags": {
"name1": "val1"
},
"nodeLabels": {
"key1": "val1"
},
"nodeTaints": [
"Key1=Value1:NoSchedule"
],
"scaleSetPriority": "Spot",
"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,
"vmSize": "Standard_DS1_v2",
"maxPods": 110,
"osType": "Linux",
"tags": {
"name1": "val1"
},
"nodeLabels": {
"key1": "val1"
},
"nodeTaints": [
"Key1=Value1:NoSchedule"
],
"scaleSetPriority": "Spot",
"scaleSetEvictionPolicy": "Delete",
"spotMaxPrice": -1
}
}
},
"201": {
"body": {
"id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/managedClusters/clustername1/agentPools/agentpool1",
"type": "Microsoft.ContainerService/managedClusters/agentPools",
"name": "agentpool1",
"properties": {
"provisioningState": "Creating",
"orchestratorVersion": "1.9.6",
"count": 3,
"vmSize": "Standard_DS1_v2",
"maxPods": 110,
"osType": "Linux",
"tags": {
"name1": "val1"
},
"nodeLabels": {
"key1": "val1"
},
"nodeTaints": [
"Key1=Value1:NoSchedule"
],
"scaleSetPriority": "Spot",
"scaleSetEvictionPolicy": "Delete",
"spotMaxPrice": -1
}
}
}
}
}
Loading

0 comments on commit 7a8e546

Please sign in to comment.