diff --git a/specification/servicefabricmanagedclusters/resource-manager/Microsoft.ServiceFabricManagedClusters/stable/2021-05-01/examples/ManagedClusterVersionGetByEnvironment_example.json b/specification/servicefabricmanagedclusters/resource-manager/Microsoft.ServiceFabricManagedClusters/stable/2021-05-01/examples/ManagedClusterVersionGetByEnvironment_example.json index 20232f3d74ef..13c9b22baa0f 100644 --- a/specification/servicefabricmanagedclusters/resource-manager/Microsoft.ServiceFabricManagedClusters/stable/2021-05-01/examples/ManagedClusterVersionGetByEnvironment_example.json +++ b/specification/servicefabricmanagedclusters/resource-manager/Microsoft.ServiceFabricManagedClusters/stable/2021-05-01/examples/ManagedClusterVersionGetByEnvironment_example.json @@ -16,7 +16,7 @@ "properties": { "supportExpiryUtc": "2021-11-30T00:00:00", "osType": "Windows", - "codeVersion": "7.2.477.9590" + "clusterCodeVersion": "7.2.477.9590" } } } diff --git a/specification/servicefabricmanagedclusters/resource-manager/Microsoft.ServiceFabricManagedClusters/stable/2021-05-01/examples/ManagedClusterVersionGet_example.json b/specification/servicefabricmanagedclusters/resource-manager/Microsoft.ServiceFabricManagedClusters/stable/2021-05-01/examples/ManagedClusterVersionGet_example.json index 48e2bf502dd4..ff7d16d5a38f 100644 --- a/specification/servicefabricmanagedclusters/resource-manager/Microsoft.ServiceFabricManagedClusters/stable/2021-05-01/examples/ManagedClusterVersionGet_example.json +++ b/specification/servicefabricmanagedclusters/resource-manager/Microsoft.ServiceFabricManagedClusters/stable/2021-05-01/examples/ManagedClusterVersionGet_example.json @@ -15,7 +15,7 @@ "properties": { "supportExpiryUtc": "2021-11-30T00:00:00", "osType": "Windows", - "codeVersion": "7.2.477.9590" + "clusterCodeVersion": "7.2.477.9590" } } } diff --git a/specification/servicefabricmanagedclusters/resource-manager/Microsoft.ServiceFabricManagedClusters/stable/2021-05-01/examples/ManagedClusterVersionListByEnvironment.json b/specification/servicefabricmanagedclusters/resource-manager/Microsoft.ServiceFabricManagedClusters/stable/2021-05-01/examples/ManagedClusterVersionListByEnvironment.json index 3d38a8740f3c..6fcc8310cd52 100644 --- a/specification/servicefabricmanagedclusters/resource-manager/Microsoft.ServiceFabricManagedClusters/stable/2021-05-01/examples/ManagedClusterVersionListByEnvironment.json +++ b/specification/servicefabricmanagedclusters/resource-manager/Microsoft.ServiceFabricManagedClusters/stable/2021-05-01/examples/ManagedClusterVersionListByEnvironment.json @@ -8,30 +8,28 @@ "responses": { "200": { "headers": {}, - "body": { - "value": [ - { - "id": "subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.ServiceFabric/locations/eastus/environments/Windows/managedClusterVersions/7.2.457.9590", - "name": "7.2.457.9590", - "type": "Microsoft.ServiceFabric/locations/environments/managedClusterVersions", - "properties": { - "supportExpiryUtc": "2021-11-30T00:00:00", - "osType": "Windows", - "codeVersion": "7.2.457.9590" - } - }, - { - "id": "subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.ServiceFabric/locations/eastus/environments/Windows/managedClusterVersions/7.2.477.9590", - "name": "7.2.477.9590", - "type": "Microsoft.ServiceFabric/locations/environments/managedClusterVersions", - "properties": { - "supportExpiryUtc": "2021-11-30T00:00:00", - "osType": "Windows", - "codeVersion": "7.2.477.9590" - } + "body": [ + { + "id": "subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.ServiceFabric/locations/eastus/environments/Windows/managedClusterVersions/7.2.457.9590", + "name": "7.2.457.9590", + "type": "Microsoft.ServiceFabric/locations/environments/managedClusterVersions", + "properties": { + "supportExpiryUtc": "2021-11-30T00:00:00", + "osType": "Windows", + "clusterCodeVersion": "7.2.457.9590" } - ] - } + }, + { + "id": "subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.ServiceFabric/locations/eastus/environments/Windows/managedClusterVersions/7.2.477.9590", + "name": "7.2.477.9590", + "type": "Microsoft.ServiceFabric/locations/environments/managedClusterVersions", + "properties": { + "supportExpiryUtc": "2021-11-30T00:00:00", + "osType": "Windows", + "clusterCodeVersion": "7.2.477.9590" + } + } + ] } } } diff --git a/specification/servicefabricmanagedclusters/resource-manager/Microsoft.ServiceFabricManagedClusters/stable/2021-05-01/examples/ManagedClusterVersionList_example.json b/specification/servicefabricmanagedclusters/resource-manager/Microsoft.ServiceFabricManagedClusters/stable/2021-05-01/examples/ManagedClusterVersionList_example.json index 07fcac3366cd..b932c30c2cce 100644 --- a/specification/servicefabricmanagedclusters/resource-manager/Microsoft.ServiceFabricManagedClusters/stable/2021-05-01/examples/ManagedClusterVersionList_example.json +++ b/specification/servicefabricmanagedclusters/resource-manager/Microsoft.ServiceFabricManagedClusters/stable/2021-05-01/examples/ManagedClusterVersionList_example.json @@ -7,30 +7,28 @@ "responses": { "200": { "headers": {}, - "body": { - "value": [ - { - "id": "subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.ServiceFabric/locations/eastus/environments/Windows/managedClusterVersions/7.2.457.9590", - "name": "7.2.457.9590", - "type": "Microsoft.ServiceFabric/locations/environments/managedClusterVersions", - "properties": { - "supportExpiryUtc": "2021-11-30T00:00:00", - "osType": "Windows", - "codeVersion": "7.2.457.9590" - } - }, - { - "id": "subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.ServiceFabric/locations/eastus/environments/Windows/managedClusterVersions/7.2.477.9590", - "name": "7.2.477.9590", - "type": "Microsoft.ServiceFabric/locations/environments/managedClusterVersions", - "properties": { - "supportExpiryUtc": "2021-11-30T00:00:00", - "osType": "Windows", - "codeVersion": "7.2.477.9590" - } + "body": [ + { + "id": "subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.ServiceFabric/locations/eastus/environments/Windows/managedClusterVersions/7.2.457.9590", + "name": "7.2.457.9590", + "type": "Microsoft.ServiceFabric/locations/environments/managedClusterVersions", + "properties": { + "supportExpiryUtc": "2021-11-30T00:00:00", + "osType": "Windows", + "clusterCodeVersion": "7.2.457.9590" } - ] - } + }, + { + "id": "subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.ServiceFabric/locations/eastus/environments/Windows/managedClusterVersions/7.2.477.9590", + "name": "7.2.477.9590", + "type": "Microsoft.ServiceFabric/locations/environments/managedClusterVersions", + "properties": { + "supportExpiryUtc": "2021-11-30T00:00:00", + "osType": "Windows", + "clusterCodeVersion": "7.2.477.9590" + } + } + ] } } } diff --git a/specification/servicefabricmanagedclusters/resource-manager/Microsoft.ServiceFabricManagedClusters/stable/2021-05-01/examples/NodeTypePutOperation_example_max.json b/specification/servicefabricmanagedclusters/resource-manager/Microsoft.ServiceFabricManagedClusters/stable/2021-05-01/examples/NodeTypePutOperation_example_max.json index 9dc6f8e50e67..86d1e467e84e 100644 --- a/specification/servicefabricmanagedclusters/resource-manager/Microsoft.ServiceFabricManagedClusters/stable/2021-05-01/examples/NodeTypePutOperation_example_max.json +++ b/specification/servicefabricmanagedclusters/resource-manager/Microsoft.ServiceFabricManagedClusters/stable/2021-05-01/examples/NodeTypePutOperation_example_max.json @@ -25,6 +25,7 @@ "vmImageVersion": "latest", "vmInstanceCount": 10, "isStateless": true, + "multiplePlacementGroups": true, "vmSecrets": [ { "sourceVault": { @@ -90,6 +91,7 @@ "vmImageVersion": "latest", "vmInstanceCount": 10, "isStateless": true, + "multiplePlacementGroups": true, "vmSecrets": [ { "sourceVault": { @@ -149,6 +151,7 @@ "vmImageVersion": "latest", "vmInstanceCount": 10, "isStateless": true, + "multiplePlacementGroups": true, "vmSecrets": [ { "sourceVault": { diff --git a/specification/servicefabricmanagedclusters/resource-manager/Microsoft.ServiceFabricManagedClusters/stable/2021-05-01/managedapplication.json b/specification/servicefabricmanagedclusters/resource-manager/Microsoft.ServiceFabricManagedClusters/stable/2021-05-01/managedapplication.json index 287b1c8a0c92..2830c7f97ac6 100644 --- a/specification/servicefabricmanagedclusters/resource-manager/Microsoft.ServiceFabricManagedClusters/stable/2021-05-01/managedapplication.json +++ b/specification/servicefabricmanagedclusters/resource-manager/Microsoft.ServiceFabricManagedClusters/stable/2021-05-01/managedapplication.json @@ -1459,7 +1459,8 @@ "metricName", "lowerLoadThreshold", "upperLoadThreshold", - "scaleInterval" + "scaleInterval", + "useOnlyPrimaryLoad" ], "properties": { "metricName": { @@ -1479,6 +1480,10 @@ "scaleInterval": { "type": "string", "description": "The period in seconds on which a decision is made whether to scale or not. This property should come in ISO 8601 format \"hh:mm:ss\"." + }, + "useOnlyPrimaryLoad": { + "type": "boolean", + "description": "Flag determines whether only the load of primary replica should be considered for scaling. If set to true, then trigger will only consider the load of primary replicas of stateful service. If set to false, trigger will consider load of all replicas. This parameter cannot be set to true for stateless service." } } }, @@ -1570,7 +1575,7 @@ ], "x-ms-enum": { "name": "MoveCost", - "modelAsString": true, + "modelAsString": false, "values": [ { "value": "Zero", @@ -1675,7 +1680,7 @@ ], "x-ms-enum": { "name": "PartitionScheme", - "modelAsString": true, + "modelAsString": false, "values": [ { "value": "Singleton", @@ -1744,7 +1749,7 @@ ], "x-ms-enum": { "name": "RollingUpgradeMode", - "modelAsString": true, + "modelAsString": false, "values": [ { "value": "Monitored", @@ -1777,7 +1782,7 @@ ], "x-ms-enum": { "name": "FailureAction", - "modelAsString": true, + "modelAsString": false, "values": [ { "value": "Rollback", @@ -1887,7 +1892,7 @@ ], "x-ms-enum": { "name": "ServiceCorrelationScheme", - "modelAsString": true, + "modelAsString": false, "values": [ { "value": "AlignedAffinity", @@ -1909,7 +1914,7 @@ ], "x-ms-enum": { "name": "ServiceKind", - "modelAsString": true, + "modelAsString": false, "values": [ { "value": "Stateless", @@ -1972,7 +1977,7 @@ ], "x-ms-enum": { "name": "ServiceLoadMetricWeight", - "modelAsString": true, + "modelAsString": false, "values": [ { "value": "Zero", @@ -2067,7 +2072,7 @@ ], "x-ms-enum": { "name": "ServicePlacementPolicyType", - "modelAsString": true, + "modelAsString": false, "values": [ { "value": "InvalidDomain", @@ -2225,7 +2230,7 @@ ], "x-ms-enum": { "name": "ServicePackageActivationMode", - "modelAsString": true, + "modelAsString": false, "values": [ { "value": "SharedProcess", @@ -2273,7 +2278,7 @@ ], "x-ms-enum": { "name": "ServiceScalingMechanismKind", - "modelAsString": true, + "modelAsString": false, "values": [ { "value": "ScalePartitionInstanceCount", @@ -2295,7 +2300,7 @@ ], "x-ms-enum": { "name": "ServiceScalingTriggerKind", - "modelAsString": true, + "modelAsString": false, "values": [ { "value": "AveragePartitionLoad", @@ -2412,10 +2417,6 @@ "servicePlacementTimeLimit": { "type": "string", "description": "The duration for which replicas can stay InBuild before reporting that build is stuck, represented in ISO 8601 format \"hh:mm:ss\"." - }, - "dropSourceReplicaOnMove": { - "type": "boolean", - "description": "Indicates whether to drop source Secondary replica even if the target replica has not finished build. If desired behavior is to drop it as soon as possible the value of this property is true, if not it is false." } } }, diff --git a/specification/servicefabricmanagedclusters/resource-manager/Microsoft.ServiceFabricManagedClusters/stable/2021-05-01/managedcluster.json b/specification/servicefabricmanagedclusters/resource-manager/Microsoft.ServiceFabricManagedClusters/stable/2021-05-01/managedcluster.json index fa5e3640bff1..5baba85605cb 100644 --- a/specification/servicefabricmanagedclusters/resource-manager/Microsoft.ServiceFabricManagedClusters/stable/2021-05-01/managedcluster.json +++ b/specification/servicefabricmanagedclusters/resource-manager/Microsoft.ServiceFabricManagedClusters/stable/2021-05-01/managedcluster.json @@ -559,7 +559,7 @@ "description": "Number of unused versions per application type to keep." } }, - "description": "The policy used to clean up unused versions." + "description": "The policy used to clean up unused versions. When the policy is not specified explicitly, the default unused application versions to keep will be 3." }, "AzureActiveDirectory": { "properties": { @@ -615,7 +615,7 @@ ], "x-ms-enum": { "name": "ClusterState", - "modelAsString": true, + "modelAsString": false, "values": [ { "value": "WaitingForNodes", @@ -653,7 +653,7 @@ ], "x-ms-enum": { "name": "clusterUpgradeCadence", - "modelAsString": true, + "modelAsString": false, "values": [ { "value": "Wave0", @@ -681,7 +681,7 @@ "default": "Automatic", "x-ms-enum": { "name": "ClusterUpgradeMode", - "modelAsString": true, + "modelAsString": false, "values": [ { "value": "Automatic", @@ -779,13 +779,9 @@ } }, "ManagedClusterCodeVersionListResult": { - "properties": { - "value": { - "type": "array", - "items": { - "$ref": "#/definitions/ManagedClusterCodeVersionResult" - } - } + "type": "array", + "items": { + "$ref": "#/definitions/ManagedClusterCodeVersionResult" }, "description": "The list results of the Service Fabric runtime versions." }, @@ -974,7 +970,7 @@ }, "ManagedClusterVersionDetails": { "properties": { - "codeVersion": { + "clusterCodeVersion": { "type": "string", "description": "The Service Fabric runtime version of the cluster." }, @@ -1105,11 +1101,25 @@ }, "SkuName": { "type": "string", - "description": "Sku Name. Basic requires a minimum of 3 nodes and Standard a minimum of 5. Basic only allows 1 node type.", + "description": "Sku Name.", "enum": [ "Basic", "Standard" - ] + ], + "x-ms-enum": { + "name": "SkuName", + "modelAsString": true, + "values": [ + { + "value": "Basic", + "description": "Basic requires a minimum of 3 nodes and allows only 1 node type." + }, + { + "value": "Standard", + "description": "Requires a minimum of 5 nodes and allows 1 or more node type." + } + ] + } }, "AvailableOperationDisplay": { "properties": { @@ -1168,7 +1178,11 @@ "Deleting", "Deleted", "Other" - ] + ], + "x-ms-enum": { + "name": "ManagedResourceProvisioningState", + "modelAsString": false + } }, "OperationListResult": { "properties": { diff --git a/specification/servicefabricmanagedclusters/resource-manager/Microsoft.ServiceFabricManagedClusters/stable/2021-05-01/nodetype.json b/specification/servicefabricmanagedclusters/resource-manager/Microsoft.ServiceFabricManagedClusters/stable/2021-05-01/nodetype.json index 21e87f9dc6d5..92213f446e3e 100644 --- a/specification/servicefabricmanagedclusters/resource-manager/Microsoft.ServiceFabricManagedClusters/stable/2021-05-01/nodetype.json +++ b/specification/servicefabricmanagedclusters/resource-manager/Microsoft.ServiceFabricManagedClusters/stable/2021-05-01/nodetype.json @@ -491,7 +491,7 @@ "default": "StandardSSD_LRS", "x-ms-enum": { "name": "DiskType", - "modelAsString": true, + "modelAsString": false, "values": [ { "value": "Standard_LRS", @@ -671,6 +671,11 @@ "description": "Indicates if the node type can only host Stateless workloads.", "default": false }, + "multiplePlacementGroups": { + "type": "boolean", + "description": "Indicates if scale set associated with the node type can be composed of multiple placement groups.", + "default": false + }, "provisioningState": { "$ref": "#/definitions/ManagedResourceProvisioningState", "readOnly": true, @@ -911,7 +916,11 @@ "Deleting", "Deleted", "Other" - ] + ], + "x-ms-enum": { + "name": "ManagedResourceProvisioningState", + "modelAsString": false + } }, "OperationResult": { "properties": {