diff --git a/specification/containerservice/Fleet.Management/examples/2023-08-15-preview/Fleets_CreateOrUpdate.json b/specification/containerservice/Fleet.Management/examples/2023-08-15-preview/Fleets_CreateOrUpdate.json index 28b4d865f226..48c12421b097 100644 --- a/specification/containerservice/Fleet.Management/examples/2023-08-15-preview/Fleets_CreateOrUpdate.json +++ b/specification/containerservice/Fleet.Management/examples/2023-08-15-preview/Fleets_CreateOrUpdate.json @@ -15,7 +15,9 @@ "properties": { "hubProfile": { "dnsPrefix": "dnsprefix1", - "vmSize": "Standard_DS1" + "agentProfile": { + "vmSize": "Standard_DS1" + } } } } @@ -51,7 +53,9 @@ "fqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", "portalFqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", "kubernetesVersion": "1.22.4", - "vmSize": "Standard_DS1" + "agentProfile": { + "vmSize": "Standard_DS1" + } }, "provisioningState": "Updating" } @@ -87,7 +91,9 @@ "fqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", "portalFqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", "kubernetesVersion": "1.22.4", - "vmSize": "Standard_DS1" + "agentProfile": { + "vmSize": "Standard_DS1" + } }, "provisioningState": "Creating" } diff --git a/specification/containerservice/Fleet.Management/examples/2023-08-15-preview/Fleets_Get.json b/specification/containerservice/Fleet.Management/examples/2023-08-15-preview/Fleets_Get.json index 228597be55a6..76846af0ee11 100644 --- a/specification/containerservice/Fleet.Management/examples/2023-08-15-preview/Fleets_Get.json +++ b/specification/containerservice/Fleet.Management/examples/2023-08-15-preview/Fleets_Get.json @@ -36,7 +36,9 @@ "fqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", "portalFqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", "kubernetesVersion": "1.22.4", - "vmSize": "Standard_DS1" + "agentProfile": { + "vmSize": "Standard_DS1" + } }, "provisioningState": "Succeeded" } diff --git a/specification/containerservice/Fleet.Management/examples/2023-08-15-preview/Fleets_ListByResourceGroup.json b/specification/containerservice/Fleet.Management/examples/2023-08-15-preview/Fleets_ListByResourceGroup.json index e4e37d610f02..dccf77273622 100644 --- a/specification/containerservice/Fleet.Management/examples/2023-08-15-preview/Fleets_ListByResourceGroup.json +++ b/specification/containerservice/Fleet.Management/examples/2023-08-15-preview/Fleets_ListByResourceGroup.json @@ -34,7 +34,9 @@ "fqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", "portalFqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", "kubernetesVersion": "1.22.4", - "vmSize": "Standard_DS1" + "agentProfile": { + "vmSize": "Standard_DS1" + } }, "provisioningState": "Succeeded" } diff --git a/specification/containerservice/Fleet.Management/examples/2023-08-15-preview/Fleets_ListBySub.json b/specification/containerservice/Fleet.Management/examples/2023-08-15-preview/Fleets_ListBySub.json index 757e3e45cd7b..7dcee17d809b 100644 --- a/specification/containerservice/Fleet.Management/examples/2023-08-15-preview/Fleets_ListBySub.json +++ b/specification/containerservice/Fleet.Management/examples/2023-08-15-preview/Fleets_ListBySub.json @@ -33,7 +33,9 @@ "fqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", "portalFqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", "kubernetesVersion": "1.22.4", - "vmSize": "Standard_DS1" + "agentProfile": { + "vmSize": "Standard_DS1" + } }, "provisioningState": "Succeeded" } diff --git a/specification/containerservice/Fleet.Management/examples/2023-08-15-preview/Fleets_PatchTags.json b/specification/containerservice/Fleet.Management/examples/2023-08-15-preview/Fleets_PatchTags.json index ed64c9677ebb..52f18e156b32 100644 --- a/specification/containerservice/Fleet.Management/examples/2023-08-15-preview/Fleets_PatchTags.json +++ b/specification/containerservice/Fleet.Management/examples/2023-08-15-preview/Fleets_PatchTags.json @@ -43,7 +43,9 @@ "fqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", "portalFqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", "kubernetesVersion": "1.22.4", - "vmSize": "Standard_DS1" + "agentProfile": { + "vmSize": "Standard_DS1" + } }, "provisioningState": "Succeeded" } diff --git a/specification/containerservice/Fleet.Management/fleet.tsp b/specification/containerservice/Fleet.Management/fleet.tsp index 229920943626..0205267721d1 100644 --- a/specification/containerservice/Fleet.Management/fleet.tsp +++ b/specification/containerservice/Fleet.Management/fleet.tsp @@ -83,11 +83,6 @@ model FleetHubProfile { @visibility("read") @doc("The Azure Portal FQDN of the Fleet hub.") portalFqdn?: string; - - @added(Versions.v2023_08_15_preview) - @doc("The virtual machine size of the Fleet hub.") - @visibility("read", "create") - vmSize?: string; } scalar SubnetResourceId @@ -118,6 +113,11 @@ model AgentProfile { @visibility("read", "create") @doc("The ID of the subnet which the Fleet hub node will join on startup. If this is not specified, a vnet and subnet will be generated and used.") subnetId?: SubnetResourceId; + + @added(Versions.v2023_08_15_preview) + @doc("The virtual machine size of the Fleet hub.") + @visibility("read", "create") + vmSize?: string; } @lroStatus diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_CreateOrUpdate.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_CreateOrUpdate.json index 28b4d865f226..48c12421b097 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_CreateOrUpdate.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_CreateOrUpdate.json @@ -15,7 +15,9 @@ "properties": { "hubProfile": { "dnsPrefix": "dnsprefix1", - "vmSize": "Standard_DS1" + "agentProfile": { + "vmSize": "Standard_DS1" + } } } } @@ -51,7 +53,9 @@ "fqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", "portalFqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", "kubernetesVersion": "1.22.4", - "vmSize": "Standard_DS1" + "agentProfile": { + "vmSize": "Standard_DS1" + } }, "provisioningState": "Updating" } @@ -87,7 +91,9 @@ "fqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", "portalFqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", "kubernetesVersion": "1.22.4", - "vmSize": "Standard_DS1" + "agentProfile": { + "vmSize": "Standard_DS1" + } }, "provisioningState": "Creating" } diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_Get.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_Get.json index 228597be55a6..76846af0ee11 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_Get.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_Get.json @@ -36,7 +36,9 @@ "fqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", "portalFqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", "kubernetesVersion": "1.22.4", - "vmSize": "Standard_DS1" + "agentProfile": { + "vmSize": "Standard_DS1" + } }, "provisioningState": "Succeeded" } diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_ListByResourceGroup.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_ListByResourceGroup.json index e4e37d610f02..dccf77273622 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_ListByResourceGroup.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_ListByResourceGroup.json @@ -34,7 +34,9 @@ "fqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", "portalFqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", "kubernetesVersion": "1.22.4", - "vmSize": "Standard_DS1" + "agentProfile": { + "vmSize": "Standard_DS1" + } }, "provisioningState": "Succeeded" } diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_ListBySub.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_ListBySub.json index 757e3e45cd7b..7dcee17d809b 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_ListBySub.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_ListBySub.json @@ -33,7 +33,9 @@ "fqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", "portalFqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", "kubernetesVersion": "1.22.4", - "vmSize": "Standard_DS1" + "agentProfile": { + "vmSize": "Standard_DS1" + } }, "provisioningState": "Succeeded" } diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_PatchTags.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_PatchTags.json index ed64c9677ebb..52f18e156b32 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_PatchTags.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_PatchTags.json @@ -43,7 +43,9 @@ "fqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", "portalFqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", "kubernetesVersion": "1.22.4", - "vmSize": "Standard_DS1" + "agentProfile": { + "vmSize": "Standard_DS1" + } }, "provisioningState": "Succeeded" } diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/fleets.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/fleets.json index 3971d9fa7567..c43c26eeec96 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/fleets.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/fleets.json @@ -1699,6 +1699,14 @@ "read", "create" ] + }, + "vmSize": { + "type": "string", + "description": "The virtual machine size of the Fleet hub.", + "x-ms-mutability": [ + "read", + "create" + ] } } }, @@ -1822,14 +1830,6 @@ "type": "string", "description": "The Azure Portal FQDN of the Fleet hub.", "readOnly": true - }, - "vmSize": { - "type": "string", - "description": "The virtual machine size of the Fleet hub.", - "x-ms-mutability": [ - "read", - "create" - ] } } },