Skip to content

Commit 76e4398

Browse files
author
Tony Xu
committed
Update API spec for 2019-08-01
1 parent bc0cb9c commit 76e4398

File tree

3 files changed

+121
-7
lines changed

3 files changed

+121
-7
lines changed

specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2019-08-01/examples/ManagedClustersCreate_Update.json

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,12 @@
3939
}
4040
},
4141
"networkProfile": {
42-
"loadBalancerSku": "basic"
42+
"loadBalancerSku": "standard",
43+
"loadBalancerProfile": {
44+
"managedOutboundIPs": {
45+
"count": 2
46+
}
47+
}
4348
},
4449
"windowsProfile": {
4550
"adminUsername": "azureuser",
@@ -173,12 +178,25 @@
173178
"enableRBAC": true,
174179
"enablePodSecurityPolicy": true,
175180
"networkProfile": {
176-
"loadBalancerSku": "basic",
177181
"networkPlugin": "kubenet",
178182
"podCidr": "10.244.0.0/16",
179183
"serviceCidr": "10.0.0.0/16",
180184
"dnsServiceIP": "10.0.0.10",
181-
"dockerBridgeCidr": "172.17.0.1/16"
185+
"dockerBridgeCidr": "172.17.0.1/16",
186+
"loadBalancerSku": "standard",
187+
"loadBalancerProfile": {
188+
"managedOutboundIPs": {
189+
"count": 2
190+
},
191+
"effectiveOutboundIPs": [
192+
{
193+
"id": "/subscriptions/subid1/resourceGroups/MC_rg1/providers/Microsoft.Network/publicIPAddresses/mgdoutboundip1"
194+
},
195+
{
196+
"id": "/subscriptions/subid1/resourceGroups/MC_rg1/providers/Microsoft.Network/publicIPAddresses/mgdoutboundip2"
197+
}
198+
]
199+
}
182200
}
183201
}
184202
}

specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2019-08-01/examples/ManagedClustersGet.json

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,28 @@
5858
"podCidr": "10.244.0.0/16",
5959
"serviceCidr": "10.0.0.0/16",
6060
"dnsServiceIP": "10.0.0.10",
61-
"dockerBridgeCidr": "172.17.0.1/16"
61+
"dockerBridgeCidr": "172.17.0.1/16",
62+
"loadBalancerSku": "standard",
63+
"loadBalancerProfile": {
64+
"outboundIPs": {
65+
"publicIPs": [
66+
{
67+
"id": "/subscriptions/subid1/resourceGroups/rg1/providers/Microsoft.Network/publicIPAddresses/customeroutboundip1"
68+
},
69+
{
70+
"id": "/subscriptions/subid1/resourceGroups/rg1/providers/Microsoft.Network/publicIPAddresses/customeroutboundip2"
71+
}
72+
]
73+
},
74+
"effectiveOutboundIPs": [
75+
{
76+
"id": "/subscriptions/subid1/resourceGroups/MC_rg1/providers/Microsoft.Network/publicIPAddresses/mgdoutboundip1"
77+
},
78+
{
79+
"id": "/subscriptions/subid1/resourceGroups/MC_rg1/providers/Microsoft.Network/publicIPAddresses/mgdoutboundip2"
80+
}
81+
]
82+
}
6283
}
6384
}
6485
}

specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2019-08-01/managedClusters.json

Lines changed: 78 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1593,10 +1593,72 @@
15931593
"modelAsString": true
15941594
},
15951595
"description": "The load balancer sku for the managed cluster."
1596+
},
1597+
"loadBalancerProfile": {
1598+
"$ref": "#/definitions/ManagedClusterLoadBalancerProfile",
1599+
"description": "Profile of the cluster load balancer."
15961600
}
15971601
},
15981602
"description": "Profile of network configuration."
15991603
},
1604+
"ManagedClusterLoadBalancerProfile": {
1605+
"properties": {
1606+
"managedOutboundIPs": {
1607+
"properties": {
1608+
"count": {
1609+
"type": "integer",
1610+
"format": "int32",
1611+
"maximum": 100,
1612+
"minimum": 1,
1613+
"description": "Desired number of outbound IP created/managed by Azure for the cluster load balancer. Allowed values must be in the range of 1 to 100 (inclusive). The default value is 1. ",
1614+
"default": 1
1615+
}
1616+
},
1617+
"description": "Desired managed outbound IPs for the cluster load balancer."
1618+
},
1619+
"outboundIPPrefixes": {
1620+
"properties": {
1621+
"publicIPPrefixes": {
1622+
"type": "array",
1623+
"items": {
1624+
"$ref": "#/definitions/ResourceReference"
1625+
},
1626+
"description": "A list of public IP prefix resources."
1627+
}
1628+
},
1629+
"description": "Desired outbound IP Prefix resources for the cluster load balancer."
1630+
},
1631+
"outboundIPs": {
1632+
"properties": {
1633+
"publicIPs": {
1634+
"type": "array",
1635+
"items": {
1636+
"$ref": "#/definitions/ResourceReference"
1637+
},
1638+
"description": "A list of public IP resources."
1639+
}
1640+
},
1641+
"description": "Desired outbound IP resources for the cluster load balancer."
1642+
},
1643+
"effectiveOutboundIPs": {
1644+
"type": "array",
1645+
"items": {
1646+
"$ref": "#/definitions/ResourceReference"
1647+
},
1648+
"description": "The effective outbound IP resources of the cluster load balancer."
1649+
}
1650+
},
1651+
"description": "Profile of the managed cluster load balancer"
1652+
},
1653+
"ResourceReference": {
1654+
"properties": {
1655+
"id": {
1656+
"type": "string",
1657+
"description": "The fully qualified Azure resource id."
1658+
}
1659+
},
1660+
"description": "A reference to an Azure resource."
1661+
},
16001662
"ContainerServiceSshConfiguration": {
16011663
"properties": {
16021664
"publicKeys": {
@@ -1762,15 +1824,28 @@
17621824
"$ref": "#/definitions/ManagedClusterAADProfile",
17631825
"description": "Profile of Azure Active Directory configuration."
17641826
},
1765-
"apiServerAuthorizedIPRanges": {
1827+
"apiServerAccessProfile": {
1828+
"$ref": "#/definitions/ManagedClusterAPIServerAccessProfile",
1829+
"description": "Access profile for managed cluster API server."
1830+
}
1831+
},
1832+
"description": "Properties of the managed cluster."
1833+
},
1834+
"ManagedClusterAPIServerAccessProfile": {
1835+
"properties": {
1836+
"authorizedIPRanges": {
17661837
"type": "array",
17671838
"items": {
17681839
"type": "string"
17691840
},
1770-
"description": "(PREVIEW) Authorized IP Ranges to kubernetes API server."
1841+
"description": "Authorized IP Ranges to kubernetes API server."
1842+
},
1843+
"enablePrivateCluster": {
1844+
"type": "boolean",
1845+
"description": "Whether to create the cluster as a private cluster or not."
17711846
}
17721847
},
1773-
"description": "Properties of the managed cluster."
1848+
"description": "Access profile for managed cluster API server."
17741849
},
17751850
"ManagedClusterIdentity": {
17761851
"properties": {

0 commit comments

Comments
 (0)