From 6518b43d4eb7ee64246477d86c4f1f4a88659192 Mon Sep 17 00:00:00 2001 From: Richard Zhao Date: Sat, 26 Jun 2021 07:54:23 +0800 Subject: [PATCH 1/8] add a new compute type Kubernetes --- .../createOrUpdate/KubernetesCompute.json | 105 +++++++++++++++ .../Compute/get/KubernetesCompute.json | 54 ++++++++ .../2021-07-01/machineLearningServices.json | 123 ++++++++++++++++-- 3 files changed, 271 insertions(+), 11 deletions(-) create mode 100644 specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2021-07-01/examples/Compute/createOrUpdate/KubernetesCompute.json create mode 100644 specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2021-07-01/examples/Compute/get/KubernetesCompute.json diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2021-07-01/examples/Compute/createOrUpdate/KubernetesCompute.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2021-07-01/examples/Compute/createOrUpdate/KubernetesCompute.json new file mode 100644 index 000000000000..dcf98468b69c --- /dev/null +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2021-07-01/examples/Compute/createOrUpdate/KubernetesCompute.json @@ -0,0 +1,105 @@ +{ + "parameters": { + "subscriptionId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345", + "resourceGroupName": "testrg123", + "workspaceName": "workspaces123", + "computeName": "compute123", + "api-version": "2021-07-01", + "parameters": { + "location": "eastus", + "properties": { + "description": "some compute", + "resourceId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourcegroups/testrg123/providers/Microsoft.ContainerService/managedClusters/compute123-56826-c9b00420020b2", + "computeType": "AKS", + "properties": { + "agentCount": 4 + } + } + } + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/testrg123/providers/Microsoft.MachineLearningServices/workspaces/workspaces123/computes/compute123", + "type": "Microsoft.MachineLearningServices/workspaces/computes", + "name": "compute123", + "location": "eastus", + "properties": { + "description": "some compute", + "resourceId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourcegroups/testrg123/providers/Microsoft.ContainerService/managedClusters/compute123-56826-c9b00420020b2", + "computeType": "Kubernetes", + "provisioningState": "Updating", + "properties": { + "relayConnectionString": null, + "serviceBusConnectionString": null, + "extensionPrincipalId": null, + "extensionInstanceReleaseTrain": "preview", + "vcName": null, + "namespace": "default", + "defaultInstanceType": "defaultInstanceType", + "instanceTypes": { + "defaultInstanceType": { + "nodeSelector": null, + "resources": { + "requests": { + "cpu": "1", + "memory": "4Gi", + "nvidia.com/gpu": null + }, + "limits": { + "cpu": "1", + "memory": "4Gi", + "nvidia.com/gpu": null + } + } + } + } + } + } + } + }, + "201": { + "body": { + "id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/testrg123/providers/Microsoft.MachineLearningServices/workspaces/workspaces123/computes/compute123", + "type": "Microsoft.MachineLearningServices/workspaces/computes", + "name": "compute123", + "location": "eastus", + "properties": { + "description": "some compute", + "resourceId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourcegroups/testrg123/providers/Microsoft.ContainerService/managedClusters/compute123-56826-c9b00420020b2", + "computeType": "Kubernetes", + "provisioningState": "Updating", + "properties": { + "relayConnectionString": null, + "serviceBusConnectionString": null, + "extensionPrincipalId": null, + "extensionInstanceReleaseTrain": "preview", + "vcName": null, + "namespace": "default", + "defaultInstanceType": "defaultInstanceType", + "instanceTypes": { + "defaultInstanceType": { + "nodeSelector": null, + "resources": { + "requests": { + "cpu": "1", + "memory": "4Gi", + "nvidia.com/gpu": null + }, + "limits": { + "cpu": "1", + "memory": "4Gi", + "nvidia.com/gpu": null + } + } + } + } + } + } + }, + "headers": { + "Azure-AsyncOperation": "https://management.azure.com/subscriptions/...pathToOperationStatus..." + } + } + } +} diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2021-07-01/examples/Compute/get/KubernetesCompute.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2021-07-01/examples/Compute/get/KubernetesCompute.json new file mode 100644 index 000000000000..d8b62a42f387 --- /dev/null +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2021-07-01/examples/Compute/get/KubernetesCompute.json @@ -0,0 +1,54 @@ +{ + "parameters": { + "subscriptionId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345", + "resourceGroupName": "testrg123", + "workspaceName": "workspaces123", + "computeName": "compute123", + "api-version": "2021-07-01" + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/testrg123/providers/Microsoft.MachineLearningServices/workspaces/workspaces123/computes/compute123", + "type": "Microsoft.MachineLearningServices/workspaces/computes", + "name": "compute123", + "location": "eastus", + "properties": { + "createdOn": "2021-04-01T22:00:00.0000000+00:00", + "modifiedOn": "2021-04-01T22:00:00.0000000+00:00", + "description": "some compute", + "resourceId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourcegroups/testrg123/providers/Microsoft.ContainerService/managedClusters/compute123-56826-c9b00420020b2", + "computeType": "Kubernetes", + "provisioningState": "Succeeded", + "isAttachedCompute": true, + "properties": { + "relayConnectionString": null, + "serviceBusConnectionString": null, + "extensionPrincipalId": null, + "extensionInstanceReleaseTrain": "preview", + "vcName": null, + "namespace": "default", + "defaultInstanceType": "defaultInstanceType", + "instanceTypes": { + "defaultInstanceType": { + "nodeSelector": null, + "resources": { + "requests": { + "cpu": "1", + "memory": "4Gi", + "nvidia.com/gpu": null + }, + "limits": { + "cpu": "1", + "memory": "4Gi", + "nvidia.com/gpu": null + } + } + } + } + } + } + } + } + } +} diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2021-07-01/machineLearningServices.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2021-07-01/machineLearningServices.json index 405f397e1d84..52641276de37 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2021-07-01/machineLearningServices.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2021-07-01/machineLearningServices.json @@ -746,6 +746,9 @@ }, "Get an ComputeInstance": { "$ref": "./examples/Compute/get/ComputeInstance.json" + }, + "Get a Kubernetes Compute": { + "$ref": "./examples/Compute/get/KubernetesCompute.json" } }, "parameters": [ @@ -798,7 +801,7 @@ "Create an ComputeInstance Compute": { "$ref": "./examples/Compute/createOrUpdate/ComputeInstance.json" }, - "Create AKS Compute": { + "Create an AKS Compute": { "$ref": "./examples/Compute/createOrUpdate/BasicAKSCompute.json" }, "Create a DataFactory Compute": { @@ -807,8 +810,11 @@ "Update a AML Compute": { "$ref": "./examples/Compute/createOrUpdate/AmlCompute.json" }, - "Update a AKS Compute": { + "Update an AKS Compute": { "$ref": "./examples/Compute/createOrUpdate/AKSCompute.json" + }, + "Attach a Kubernetes Compute": { + "$ref": "./examples/Compute/createOrUpdate/KubernetesCompute.json" } }, "parameters": [ @@ -1466,7 +1472,7 @@ "tags": [ "ProxyOperations" ], - "operationId": "Workspaces_PrepareNotebook", + "operationId": "Notebooks_Prepare", "x-ms-long-running-operation": true, "x-ms-long-running-operation-options": { "final-state-via": "location" @@ -1555,7 +1561,7 @@ "tags": [ "ProxyOperations" ], - "operationId": "Workspaces_ListNotebookKeys", + "operationId": "Notebooks_ListKeys", "x-ms-examples": { "List Workspace Keys": { "$ref": "./examples/Notebook/listKeys.json" @@ -2090,11 +2096,6 @@ "type": "string", "readOnly": true }, - "storageHnsEnabled": { - "description": "If the storage associated with the workspace has HNS enabled.", - "type": "string", - "readOnly": true - }, "mlFlowTrackingUri": { "description": "The URI associated with this workspace that MLflow must point at to set up tracking.", "type": "string", @@ -3127,6 +3128,62 @@ ], "x-ms-discriminator-value": "AKS" }, + "Kubernetes": { + "description": "A Machine Learning compute based on Kubernetes Compute.", + "allOf": [ + { + "$ref": "#/definitions/Compute" + }, + { + "type": "object", + "properties": { + "properties": { + "type": "object", + "description": "Kubernetes properties", + "properties": { + "relayConnectionString": { + "description": "Relay connection string.", + "type": "string" + }, + "serviceBusConnectionString": { + "description": "ServiceBus connection string.", + "type": "string" + }, + "extensionPrincipalId": { + "description": "Extension principal-id.", + "type": "string" + }, + "extensionInstanceReleaseTrain": { + "description": "Extension instance release train.", + "type": "string" + }, + "vcName": { + "description": "VC name.", + "type": "string" + }, + "namespace": { + "description": "namespace", + "type": "string", + "default": "default" + }, + "defaultInstanceType": { + "description": "Default instance type", + "type": "string" + }, + "instanceTypes": { + "description": "Instance Type Schema", + "type": "object", + "additionalProperties":{ + "$ref": "#/definitions/InstanceTypeSchema" + } + } + } + } + } + } + ], + "x-ms-discriminator-value": "Kubernetes" + }, "AmlComputeProperties": { "type": "object", "description": "AML Compute properties", @@ -3972,6 +4029,7 @@ "description": "The type of compute", "enum": [ "AKS", + "Kubernetes", "AmlCompute", "ComputeInstance", "DataFactory", @@ -4752,7 +4810,7 @@ } } }, - "AKSProperties": { + "AksProperties": { "type": "object", "description": "AKS properties", "properties": { @@ -4799,12 +4857,55 @@ } } }, + "InstanceTypeSchema": { + "type": "object", + "description": "Instance type schema.", + "properties": { + "nodeSelector": { + "type": "object", + "description": "NodeSelector", + "additionalProperties": { + "type": "string" + } + }, + "resources": { + "type": "object", + "description": "Resource of an instance type", + "properties": { + "requests": { + "$ref": "#/definitions/InstanceResourceSchema" + }, + "limits": { + "$ref": "#/definitions/InstanceResourceSchema" + } + } + } + } + }, + "InstanceResourceSchema": { + "type": "object", + "description": "Instance resource schema.", + "properties":{ + "cpu": { + "type": "string", + "description": "CPU count" + }, + "memeory": { + "type": "string", + "description": "amount of memory" + }, + "nvidia.com/gpu": { + "type": "string", + "description": "GPU count" + } + } + }, "SynapseSparkPoolProperties": { "type": "object", "description": "Properties specific to Synapse Spark pools.", "properties": { "properties": { - "$ref": "#/definitions/AKSProperties" + "$ref": "#/definitions/AksProperties" } } } From 3d95758294f3bc8cbda30db1b3bf07a1f21aa439 Mon Sep 17 00:00:00 2001 From: Richard Zhao Date: Sat, 26 Jun 2021 08:03:26 +0800 Subject: [PATCH 2/8] Add a new compute type Kubernetes to MLC --- .../stable/2021-07-01/machineLearningServices.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2021-07-01/machineLearningServices.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2021-07-01/machineLearningServices.json index 52641276de37..f4aea4c7b7aa 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2021-07-01/machineLearningServices.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2021-07-01/machineLearningServices.json @@ -4810,7 +4810,7 @@ } } }, - "AksProperties": { + "AKSProperties": { "type": "object", "description": "AKS properties", "properties": { @@ -4865,7 +4865,7 @@ "type": "object", "description": "NodeSelector", "additionalProperties": { - "type": "string" + "type": "string" } }, "resources": { @@ -4905,7 +4905,7 @@ "description": "Properties specific to Synapse Spark pools.", "properties": { "properties": { - "$ref": "#/definitions/AksProperties" + "$ref": "#/definitions/AKSProperties" } } } From 221c45872e69d31c726727220c9d5281eccd34d3 Mon Sep 17 00:00:00 2001 From: Richard Zhao Date: Sat, 26 Jun 2021 08:22:27 +0800 Subject: [PATCH 3/8] merge manually --- .../stable/2021-07-01/machineLearningServices.json | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2021-07-01/machineLearningServices.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2021-07-01/machineLearningServices.json index f4aea4c7b7aa..f2b11cbeede5 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2021-07-01/machineLearningServices.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2021-07-01/machineLearningServices.json @@ -1472,7 +1472,7 @@ "tags": [ "ProxyOperations" ], - "operationId": "Notebooks_Prepare", + "operationId": "Workspaces_PrepareNotebook", "x-ms-long-running-operation": true, "x-ms-long-running-operation-options": { "final-state-via": "location" @@ -1561,7 +1561,7 @@ "tags": [ "ProxyOperations" ], - "operationId": "Notebooks_ListKeys", + "operationId": "Workspaces_ListNotebookKeys", "x-ms-examples": { "List Workspace Keys": { "$ref": "./examples/Notebook/listKeys.json" @@ -2096,6 +2096,11 @@ "type": "string", "readOnly": true }, + "storageHnsEnabled": { + "description": "If the storage associated with the workspace has HNS enabled.", + "type": "string", + "readOnly": true + }, "mlFlowTrackingUri": { "description": "The URI associated with this workspace that MLflow must point at to set up tracking.", "type": "string", From 37dd2c43853f201c901f122cc34be1400c9084af Mon Sep 17 00:00:00 2001 From: Richard Zhao Date: Mon, 28 Jun 2021 11:42:19 +0800 Subject: [PATCH 4/8] refactor --- .../2021-07-01/machineLearningServices.json | 86 ++++++++++--------- 1 file changed, 46 insertions(+), 40 deletions(-) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2021-07-01/machineLearningServices.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2021-07-01/machineLearningServices.json index f2b11cbeede5..44bccc220efe 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2021-07-01/machineLearningServices.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2021-07-01/machineLearningServices.json @@ -3143,52 +3143,57 @@ "type": "object", "properties": { "properties": { - "type": "object", - "description": "Kubernetes properties", - "properties": { - "relayConnectionString": { - "description": "Relay connection string.", - "type": "string" - }, - "serviceBusConnectionString": { - "description": "ServiceBus connection string.", - "type": "string" - }, - "extensionPrincipalId": { - "description": "Extension principal-id.", - "type": "string" - }, - "extensionInstanceReleaseTrain": { - "description": "Extension instance release train.", - "type": "string" - }, - "vcName": { - "description": "VC name.", - "type": "string" - }, - "namespace": { - "description": "namespace", - "type": "string", - "default": "default" - }, - "defaultInstanceType": { - "description": "Default instance type", - "type": "string" - }, - "instanceTypes": { - "description": "Instance Type Schema", - "type": "object", - "additionalProperties":{ - "$ref": "#/definitions/InstanceTypeSchema" - } - } - } + "$ref": "#/definitions/KubernetesProperties" } } } ], "x-ms-discriminator-value": "Kubernetes" }, + + "KubernetesProperties": { + "type": "object", + "description": "Kubernetes properties", + "properties": { + "relayConnectionString": { + "description": "Relay connection string.", + "type": "string" + }, + "serviceBusConnectionString": { + "description": "ServiceBus connection string.", + "type": "string" + }, + "extensionPrincipalId": { + "description": "Extension principal-id.", + "type": "string" + }, + "extensionInstanceReleaseTrain": { + "description": "Extension instance release train.", + "type": "string" + }, + "vcName": { + "description": "VC name.", + "type": "string" + }, + "namespace": { + "description": "namespace", + "type": "string", + "default": "default" + }, + "defaultInstanceType": { + "description": "Default instance type", + "type": "string" + }, + "instanceTypes": { + "description": "Instance Type Schema", + "type": "object", + "additionalProperties":{ + "$ref": "#/definitions/InstanceTypeSchema" + } + } + } + }, + "AmlComputeProperties": { "type": "object", "description": "AML Compute properties", @@ -4916,3 +4921,4 @@ } } } + From 7f03d692e27b90fe338d3218b5334a29871945d8 Mon Sep 17 00:00:00 2001 From: Richard Zhao Date: Mon, 28 Jun 2021 13:54:53 +0800 Subject: [PATCH 5/8] fix a naming issue with AKSProperties --- .../stable/2021-07-01/machineLearningServices.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2021-07-01/machineLearningServices.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2021-07-01/machineLearningServices.json index 44bccc220efe..6047bf7fd156 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2021-07-01/machineLearningServices.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2021-07-01/machineLearningServices.json @@ -4820,7 +4820,7 @@ } } }, - "AKSProperties": { + "SynapseAKSProperties": { "type": "object", "description": "AKS properties", "properties": { @@ -4915,7 +4915,7 @@ "description": "Properties specific to Synapse Spark pools.", "properties": { "properties": { - "$ref": "#/definitions/AKSProperties" + "$ref": "#/definitions/SynapseAKSProperties" } } } From a5b020f52fee668e40be2a4190183a63ee99723c Mon Sep 17 00:00:00 2001 From: Richard Zhao Date: Mon, 28 Jun 2021 16:02:12 +0800 Subject: [PATCH 6/8] fix a typo --- .../stable/2021-07-01/machineLearningServices.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2021-07-01/machineLearningServices.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2021-07-01/machineLearningServices.json index 6047bf7fd156..1d32922de6e6 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2021-07-01/machineLearningServices.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2021-07-01/machineLearningServices.json @@ -4900,7 +4900,7 @@ "type": "string", "description": "CPU count" }, - "memeory": { + "memory": { "type": "string", "description": "amount of memory" }, From 2d7d6ff99ca3685ba116231d9f8740d31eaac90b Mon Sep 17 00:00:00 2001 From: Richard Zhao Date: Tue, 29 Jun 2021 10:18:49 +0800 Subject: [PATCH 7/8] update the sample requests --- .../createOrUpdate/KubernetesCompute.json | 30 +++++++++++++++---- .../Compute/get/KubernetesCompute.json | 2 +- 2 files changed, 25 insertions(+), 7 deletions(-) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2021-07-01/examples/Compute/createOrUpdate/KubernetesCompute.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2021-07-01/examples/Compute/createOrUpdate/KubernetesCompute.json index dcf98468b69c..e35127100405 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2021-07-01/examples/Compute/createOrUpdate/KubernetesCompute.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2021-07-01/examples/Compute/createOrUpdate/KubernetesCompute.json @@ -10,9 +10,27 @@ "properties": { "description": "some compute", "resourceId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourcegroups/testrg123/providers/Microsoft.ContainerService/managedClusters/compute123-56826-c9b00420020b2", - "computeType": "AKS", + "computeType": "Kubernetes", "properties": { - "agentCount": 4 + "namespace": "default", + "defaultInstanceType": "defaultInstanceType", + "instanceTypes": { + "defaultInstanceType": { + "nodeSelector": null, + "resources": { + "requests": { + "cpu": "1", + "memory": "4Gi", + "nvidia.com/gpu": null + }, + "limits": { + "cpu": "1", + "memory": "4Gi", + "nvidia.com/gpu": null + } + } + } + } } } } @@ -28,12 +46,12 @@ "description": "some compute", "resourceId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourcegroups/testrg123/providers/Microsoft.ContainerService/managedClusters/compute123-56826-c9b00420020b2", "computeType": "Kubernetes", - "provisioningState": "Updating", + "provisioningState": "Creating", "properties": { "relayConnectionString": null, "serviceBusConnectionString": null, "extensionPrincipalId": null, - "extensionInstanceReleaseTrain": "preview", + "extensionInstanceReleaseTrain": "stable", "vcName": null, "namespace": "default", "defaultInstanceType": "defaultInstanceType", @@ -68,12 +86,12 @@ "description": "some compute", "resourceId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourcegroups/testrg123/providers/Microsoft.ContainerService/managedClusters/compute123-56826-c9b00420020b2", "computeType": "Kubernetes", - "provisioningState": "Updating", + "provisioningState": "Creating", "properties": { "relayConnectionString": null, "serviceBusConnectionString": null, "extensionPrincipalId": null, - "extensionInstanceReleaseTrain": "preview", + "extensionInstanceReleaseTrain": "stable", "vcName": null, "namespace": "default", "defaultInstanceType": "defaultInstanceType", diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2021-07-01/examples/Compute/get/KubernetesCompute.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2021-07-01/examples/Compute/get/KubernetesCompute.json index d8b62a42f387..99945bbe8870 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2021-07-01/examples/Compute/get/KubernetesCompute.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2021-07-01/examples/Compute/get/KubernetesCompute.json @@ -25,7 +25,7 @@ "relayConnectionString": null, "serviceBusConnectionString": null, "extensionPrincipalId": null, - "extensionInstanceReleaseTrain": "preview", + "extensionInstanceReleaseTrain": "stable", "vcName": null, "namespace": "default", "defaultInstanceType": "defaultInstanceType", From 5f19503926cb2d1a101cea6eb0002387d516050c Mon Sep 17 00:00:00 2001 From: Richard Zhao Date: Tue, 29 Jun 2021 11:22:07 +0800 Subject: [PATCH 8/8] update descriptions --- .../stable/2021-07-01/machineLearningServices.json | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2021-07-01/machineLearningServices.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2021-07-01/machineLearningServices.json index 1d32922de6e6..67612025d29f 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2021-07-01/machineLearningServices.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2021-07-01/machineLearningServices.json @@ -4870,6 +4870,7 @@ "InstanceTypeSchema": { "type": "object", "description": "Instance type schema.", + "additionalProperties": false, "properties": { "nodeSelector": { "type": "object", @@ -4880,7 +4881,8 @@ }, "resources": { "type": "object", - "description": "Resource of an instance type", + "additionalProperties": false, + "description": "Resource requests/limits for this instance type", "properties": { "requests": { "$ref": "#/definitions/InstanceResourceSchema" @@ -4894,19 +4896,19 @@ }, "InstanceResourceSchema": { "type": "object", - "description": "Instance resource schema.", + "description": "Resource requests/limits for this instance type", "properties":{ "cpu": { "type": "string", - "description": "CPU count" + "description": "Number of vCPUs requested for this instance type" }, "memory": { "type": "string", - "description": "amount of memory" + "description": "Memory size requested for this instance type" }, "nvidia.com/gpu": { "type": "string", - "description": "GPU count" + "description": "Number of Nvidia GPU cards requested for this instance_type" } } },