Skip to content

Commit 1d01828

Browse files
authored
Merge pull request Azure#3 from dagald/bai1rp/dec18-curr
adding properties for aks vnet support
2 parents 81bb42a + 5185416 commit 1d01828

1 file changed

Lines changed: 34 additions & 0 deletions

File tree

specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2018-11-19/machineLearningServices.json

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1460,6 +1460,10 @@
14601460
"sslConfiguration": {
14611461
"description": "SSL configuration",
14621462
"$ref": "#/definitions/SslConfiguration"
1463+
},
1464+
"aksNetworkingConfiguration": {
1465+
"description": "AKS networking configuration for vnet",
1466+
"$ref": "#/definitions/AksNetworkingConfiguration"
14631467
}
14641468
}
14651469
}
@@ -1749,6 +1753,36 @@
17491753
}
17501754
}
17511755
},
1756+
"AksNetworkingConfiguration": {
1757+
"type": "object",
1758+
"description": "Advance configuration for AKS networking",
1759+
"properties": {
1760+
"subnetId": {
1761+
"description": "Virtual network subnet resource ID the compute nodes belong to",
1762+
"type": "string"
1763+
},
1764+
"podCidr": {
1765+
"pattern": "^([0-9]{1,3}\\.){3}[0-9]{1,3}(\\/([0-9]|[1-2][0-9]|3[0-2]))?$",
1766+
"description": "A CIDR notation IP range from which to assign pod IPs when kubenet is used.",
1767+
"type": "string"
1768+
},
1769+
"serviceCidr": {
1770+
"pattern": "^([0-9]{1,3}\\.){3}[0-9]{1,3}(\\/([0-9]|[1-2][0-9]|3[0-2]))?$",
1771+
"description": "A CIDR notation IP range from which to assign service cluster IPs. It must not overlap with any Subnet IP ranges.",
1772+
"type": "string"
1773+
},
1774+
"dnsServiceIP": {
1775+
"pattern": "^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$",
1776+
"description": "An IP address assigned to the Kubernetes DNS service. It must be within the Kubernetes service address range specified in serviceCidr.",
1777+
"type": "string"
1778+
},
1779+
"dockerBridgeCidr": {
1780+
"pattern": "^([0-9]{1,3}\\.){3}[0-9]{1,3}(\\/([0-9]|[1-2][0-9]|3[0-2]))?$",
1781+
"description": "A CIDR notation IP range assigned to the Docker bridge network. It must not overlap with any Subnet IP ranges or the Kubernetes service address range.",
1782+
"type": "string"
1783+
}
1784+
}
1785+
},
17521786
"ScaleSettings": {
17531787
"type": "object",
17541788
"description": "scale settings for AML Compute",

0 commit comments

Comments
 (0)