Merge pull request Azure#3 from dagald/bai1rp/dec18-curr

adding properties for aks vnet support
dagald · Nov 8, 2018 · 1d01828 · 1d01828
2 parents 81bb42a + 5185416
commit 1d01828
Showing 1 changed file with 34 additions and 0 deletions.
diff --git a/...-manager/Microsoft.MachineLearningServices/stable/2018-11-19/machineLearningServices.json b/...-manager/Microsoft.MachineLearningServices/stable/2018-11-19/machineLearningServices.json
@@ -1460,6 +1460,10 @@
                 "sslConfiguration": {
                   "description": "SSL configuration",
                   "$ref": "#/definitions/SslConfiguration"
+                },
+                "aksNetworkingConfiguration": {
+                  "description": "AKS networking configuration for vnet",
+                  "$ref": "#/definitions/AksNetworkingConfiguration"
                 }
               }
             }
@@ -1749,6 +1753,36 @@
         }
       }
     },
+    "AksNetworkingConfiguration": {
+      "type": "object",
+      "description": "Advance configuration for AKS networking",
+      "properties": {
+        "subnetId": {
+          "description": "Virtual network subnet resource ID the compute nodes belong to",
+          "type": "string"
+        },
+        "podCidr": {
+          "pattern": "^([0-9]{1,3}\\.){3}[0-9]{1,3}(\\/([0-9]|[1-2][0-9]|3[0-2]))?$",
+          "description": "A CIDR notation IP range from which to assign pod IPs when kubenet is used.",
+          "type": "string"
+        },
+        "serviceCidr": {
+          "pattern": "^([0-9]{1,3}\\.){3}[0-9]{1,3}(\\/([0-9]|[1-2][0-9]|3[0-2]))?$",
+          "description": "A CIDR notation IP range from which to assign service cluster IPs. It must not overlap with any Subnet IP ranges.",
+          "type": "string"
+        },
+        "dnsServiceIP": {
+          "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]?)$",
+          "description": "An IP address assigned to the Kubernetes DNS service. It must be within the Kubernetes service address range specified in serviceCidr.",
+          "type": "string"
+        },
+        "dockerBridgeCidr": {
+          "pattern": "^([0-9]{1,3}\\.){3}[0-9]{1,3}(\\/([0-9]|[1-2][0-9]|3[0-2]))?$",
+          "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.",
+          "type": "string"
+        }
+      }
+    },
     "ScaleSettings": {
       "type": "object",
       "description": "scale settings for AML Compute",