From bd484850141b039eb3fc18ba082f9bb4b467d759 Mon Sep 17 00:00:00 2001 From: Alfredo Santamaria Gomez Date: Sun, 13 Dec 2020 14:36:17 -0800 Subject: [PATCH] add ManagedCluster AddOnFeature, remove clusterUpgradeMode and clusterUpgradeDescription as they are not available yet --- .../ManagedClusterGetOperation_example.json | 45 +---- ...rListByResourceGroupOperation_example.json | 42 +--- ...erListBySubscriptionOperation_example.json | 42 +--- .../ManagedClusterPatchOperation_example.json | 141 +------------ ...anagedClusterPutOperation_example_max.json | 189 ++---------------- ...anagedClusterPutOperation_example_min.json | 63 +----- .../2020-01-01-preview/managedcluster.json | 101 +++++----- .../preview/2020-01-01-preview/nodetype.json | 121 ++++++----- 8 files changed, 145 insertions(+), 599 deletions(-) diff --git a/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/examples/ManagedClusterGetOperation_example.json b/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/examples/ManagedClusterGetOperation_example.json index cfe0add5855e..cc9f1e0a8091 100644 --- a/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/examples/ManagedClusterGetOperation_example.json +++ b/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/examples/ManagedClusterGetOperation_example.json @@ -56,50 +56,7 @@ } ] } - ], - "clusterUpgradeMode": "Manual", - "clusterUpgradeDescription": { - "forceRestart": false, - "upgradeReplicaSetCheckTimeout": "00:10:00", - "healthCheckWaitDuration": "00:00:30", - "healthCheckStableDuration": "00:00:30", - "healthCheckRetryTimeout": "00:05:00", - "upgradeTimeout": "01:00:00", - "upgradeDomainTimeout": "00:15:00", - "healthPolicy": { - "maxPercentUnhealthyNodes": 0, - "maxPercentUnhealthyApplications": 0, - "applicationHealthPolicies": { - "fabric:/myApp1": { - "defaultServiceTypeHealthPolicy": { - "maxPercentUnhealthyServices": 0 - }, - "serviceTypeHealthPolicies": { - "myServiceType1": { - "maxPercentUnhealthyServices": 100 - } - } - } - } - }, - "deltaHealthPolicy": { - "maxPercentDeltaUnhealthyNodes": 0, - "maxPercentUpgradeDomainDeltaUnhealthyNodes": 0, - "maxPercentDeltaUnhealthyApplications": 0, - "applicationDeltaHealthPolicies": { - "fabric:/myApp1": { - "defaultServiceTypeDeltaHealthPolicy": { - "maxPercentDeltaUnhealthyServices": 0 - }, - "serviceTypeDeltaHealthPolicies": { - "myServiceType1": { - "maxPercentDeltaUnhealthyServices": 0 - } - } - } - } - } - } + ] } } } diff --git a/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/examples/ManagedClusterListByResourceGroupOperation_example.json b/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/examples/ManagedClusterListByResourceGroupOperation_example.json index a2a77127f87c..68cc8313be41 100644 --- a/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/examples/ManagedClusterListByResourceGroupOperation_example.json +++ b/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/examples/ManagedClusterListByResourceGroupOperation_example.json @@ -38,26 +38,7 @@ } ] } - ], - "clusterUpgradeDescription": { - "forceRestart": false, - "upgradeReplicaSetCheckTimeout": "10675199.02:48:05.4775807", - "healthCheckWaitDuration": "00:05:00", - "healthCheckStableDuration": "00:05:00", - "healthCheckRetryTimeout": "00:45:00", - "upgradeTimeout": "12:00:00", - "upgradeDomainTimeout": "02:00:00", - "healthPolicy": { - "maxPercentUnhealthyNodes": 100, - "maxPercentUnhealthyApplications": 100 - }, - "deltaHealthPolicy": { - "maxPercentDeltaUnhealthyNodes": 0, - "maxPercentUpgradeDomainDeltaUnhealthyNodes": 0, - "maxPercentDeltaUnhealthyApplications": 0 - } - }, - "clusterUpgradeMode": "Automatic" + ] } }, { @@ -89,26 +70,7 @@ } ] } - ], - "clusterUpgradeDescription": { - "forceRestart": false, - "upgradeReplicaSetCheckTimeout": "10675199.02:48:05.4775807", - "healthCheckWaitDuration": "00:05:00", - "healthCheckStableDuration": "00:05:00", - "healthCheckRetryTimeout": "00:45:00", - "upgradeTimeout": "12:00:00", - "upgradeDomainTimeout": "02:00:00", - "healthPolicy": { - "maxPercentUnhealthyNodes": 100, - "maxPercentUnhealthyApplications": 100 - }, - "deltaHealthPolicy": { - "maxPercentDeltaUnhealthyNodes": 0, - "maxPercentUpgradeDomainDeltaUnhealthyNodes": 0, - "maxPercentDeltaUnhealthyApplications": 0 - } - }, - "clusterUpgradeMode": "Automatic" + ] } } ], diff --git a/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/examples/ManagedClusterListBySubscriptionOperation_example.json b/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/examples/ManagedClusterListBySubscriptionOperation_example.json index 9537ff81fa6e..1d04c0f09406 100644 --- a/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/examples/ManagedClusterListBySubscriptionOperation_example.json +++ b/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/examples/ManagedClusterListBySubscriptionOperation_example.json @@ -37,26 +37,7 @@ } ] } - ], - "clusterUpgradeDescription": { - "forceRestart": false, - "upgradeReplicaSetCheckTimeout": "10675199.02:48:05.4775807", - "healthCheckWaitDuration": "00:05:00", - "healthCheckStableDuration": "00:05:00", - "healthCheckRetryTimeout": "00:45:00", - "upgradeTimeout": "12:00:00", - "upgradeDomainTimeout": "02:00:00", - "healthPolicy": { - "maxPercentUnhealthyNodes": 100, - "maxPercentUnhealthyApplications": 100 - }, - "deltaHealthPolicy": { - "maxPercentDeltaUnhealthyNodes": 0, - "maxPercentUpgradeDomainDeltaUnhealthyNodes": 0, - "maxPercentDeltaUnhealthyApplications": 0 - } - }, - "clusterUpgradeMode": "Automatic" + ] } }, { @@ -88,26 +69,7 @@ } ] } - ], - "clusterUpgradeDescription": { - "forceRestart": false, - "upgradeReplicaSetCheckTimeout": "10675199.02:48:05.4775807", - "healthCheckWaitDuration": "00:05:00", - "healthCheckStableDuration": "00:05:00", - "healthCheckRetryTimeout": "00:45:00", - "upgradeTimeout": "12:00:00", - "upgradeDomainTimeout": "02:00:00", - "healthPolicy": { - "maxPercentUnhealthyNodes": 100, - "maxPercentUnhealthyApplications": 100 - }, - "deltaHealthPolicy": { - "maxPercentDeltaUnhealthyNodes": 0, - "maxPercentUpgradeDomainDeltaUnhealthyNodes": 0, - "maxPercentDeltaUnhealthyApplications": 0 - } - }, - "clusterUpgradeMode": "Automatic" + ] } } ], diff --git a/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/examples/ManagedClusterPatchOperation_example.json b/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/examples/ManagedClusterPatchOperation_example.json index 02924f1656e1..a841c4a0ae5e 100644 --- a/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/examples/ManagedClusterPatchOperation_example.json +++ b/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/examples/ManagedClusterPatchOperation_example.json @@ -43,49 +43,11 @@ ] } ], - "clusterUpgradeDescription": { - "forceRestart": false, - "upgradeReplicaSetCheckTimeout": "00:10:00", - "healthCheckWaitDuration": "00:00:30", - "healthCheckStableDuration": "00:00:30", - "healthCheckRetryTimeout": "00:05:00", - "upgradeTimeout": "01:00:00", - "upgradeDomainTimeout": "00:15:00", - "healthPolicy": { - "maxPercentUnhealthyNodes": 0, - "maxPercentUnhealthyApplications": 0, - "applicationHealthPolicies": { - "fabric:/myApp1": { - "defaultServiceTypeHealthPolicy": { - "maxPercentUnhealthyServices": 0 - }, - "serviceTypeHealthPolicies": { - "myServiceType1": { - "maxPercentUnhealthyServices": 100 - } - } - } - } - }, - "deltaHealthPolicy": { - "maxPercentDeltaUnhealthyNodes": 0, - "maxPercentUpgradeDomainDeltaUnhealthyNodes": 0, - "maxPercentDeltaUnhealthyApplications": 0, - "applicationDeltaHealthPolicies": { - "fabric:/myApp1": { - "defaultServiceTypeDeltaHealthPolicy": { - "maxPercentDeltaUnhealthyServices": 0 - }, - "serviceTypeDeltaHealthPolicies": { - "myServiceType1": { - "maxPercentDeltaUnhealthyServices": 0 - } - } - } - } - } - }, - "clusterUpgradeMode": "Automatic" + "addonFeatures": [ + "DnsService", + "BackupRestoreService", + "ResourceMonitorService" + ] } } }, @@ -144,49 +106,11 @@ ] } ], - "clusterUpgradeDescription": { - "forceRestart": false, - "upgradeReplicaSetCheckTimeout": "00:10:00", - "healthCheckWaitDuration": "00:00:30", - "healthCheckStableDuration": "00:00:30", - "healthCheckRetryTimeout": "00:05:00", - "upgradeTimeout": "01:00:00", - "upgradeDomainTimeout": "00:15:00", - "healthPolicy": { - "maxPercentUnhealthyNodes": 0, - "maxPercentUnhealthyApplications": 0, - "applicationHealthPolicies": { - "fabric:/myApp1": { - "defaultServiceTypeHealthPolicy": { - "maxPercentUnhealthyServices": 0 - }, - "serviceTypeHealthPolicies": { - "myServiceType1": { - "maxPercentUnhealthyServices": 100 - } - } - } - } - }, - "deltaHealthPolicy": { - "maxPercentDeltaUnhealthyNodes": 0, - "maxPercentUpgradeDomainDeltaUnhealthyNodes": 0, - "maxPercentDeltaUnhealthyApplications": 0, - "applicationDeltaHealthPolicies": { - "fabric:/myApp1": { - "defaultServiceTypeDeltaHealthPolicy": { - "maxPercentDeltaUnhealthyServices": 0 - }, - "serviceTypeDeltaHealthPolicies": { - "myServiceType1": { - "maxPercentDeltaUnhealthyServices": 0 - } - } - } - } - } - }, - "clusterUpgradeMode": "Automatic" + "addonFeatures": [ + "DnsService", + "BackupRestoreService", + "ResourceMonitorService" + ] } } }, @@ -243,50 +167,7 @@ } ] } - ], - "clusterUpgradeDescription": { - "forceRestart": false, - "upgradeReplicaSetCheckTimeout": "00:10:00", - "healthCheckWaitDuration": "00:00:30", - "healthCheckStableDuration": "00:00:30", - "healthCheckRetryTimeout": "00:05:00", - "upgradeTimeout": "01:00:00", - "upgradeDomainTimeout": "00:15:00", - "healthPolicy": { - "maxPercentUnhealthyNodes": 0, - "maxPercentUnhealthyApplications": 0, - "applicationHealthPolicies": { - "fabric:/myApp1": { - "defaultServiceTypeHealthPolicy": { - "maxPercentUnhealthyServices": 0 - }, - "serviceTypeHealthPolicies": { - "myServiceType1": { - "maxPercentUnhealthyServices": 100 - } - } - } - } - }, - "deltaHealthPolicy": { - "maxPercentDeltaUnhealthyNodes": 0, - "maxPercentUpgradeDomainDeltaUnhealthyNodes": 0, - "maxPercentDeltaUnhealthyApplications": 0, - "applicationDeltaHealthPolicies": { - "fabric:/myApp1": { - "defaultServiceTypeDeltaHealthPolicy": { - "maxPercentDeltaUnhealthyServices": 0 - }, - "serviceTypeDeltaHealthPolicies": { - "myServiceType1": { - "maxPercentDeltaUnhealthyServices": 0 - } - } - } - } - } - }, - "clusterUpgradeMode": "Automatic" + ] } } } diff --git a/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/examples/ManagedClusterPutOperation_example_max.json b/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/examples/ManagedClusterPutOperation_example_max.json index 1f8f1f9fe8d9..283cfe9efa50 100644 --- a/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/examples/ManagedClusterPutOperation_example_max.json +++ b/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/examples/ManagedClusterPutOperation_example_max.json @@ -47,50 +47,7 @@ } ] } - ], - "clusterUpgradeDescription": { - "forceRestart": false, - "upgradeReplicaSetCheckTimeout": "00:10:00", - "healthCheckWaitDuration": "00:00:30", - "healthCheckStableDuration": "00:00:30", - "healthCheckRetryTimeout": "00:05:00", - "upgradeTimeout": "01:00:00", - "upgradeDomainTimeout": "00:15:00", - "healthPolicy": { - "maxPercentUnhealthyNodes": 0, - "maxPercentUnhealthyApplications": 0, - "applicationHealthPolicies": { - "fabric:/myApp1": { - "defaultServiceTypeHealthPolicy": { - "maxPercentUnhealthyServices": 0 - }, - "serviceTypeHealthPolicies": { - "myServiceType1": { - "maxPercentUnhealthyServices": 100 - } - } - } - } - }, - "deltaHealthPolicy": { - "maxPercentDeltaUnhealthyNodes": 0, - "maxPercentUpgradeDomainDeltaUnhealthyNodes": 0, - "maxPercentDeltaUnhealthyApplications": 0, - "applicationDeltaHealthPolicies": { - "fabric:/myApp1": { - "defaultServiceTypeDeltaHealthPolicy": { - "maxPercentDeltaUnhealthyServices": 0 - }, - "serviceTypeDeltaHealthPolicies": { - "myServiceType1": { - "maxPercentDeltaUnhealthyServices": 0 - } - } - } - } - } - }, - "clusterUpgradeMode": "Manual" + ] } } }, @@ -152,49 +109,11 @@ ] } ], - "clusterUpgradeDescription": { - "forceRestart": false, - "upgradeReplicaSetCheckTimeout": "00:10:00", - "healthCheckWaitDuration": "00:00:30", - "healthCheckStableDuration": "00:00:30", - "healthCheckRetryTimeout": "00:05:00", - "upgradeTimeout": "01:00:00", - "upgradeDomainTimeout": "00:15:00", - "healthPolicy": { - "maxPercentUnhealthyNodes": 0, - "maxPercentUnhealthyApplications": 0, - "applicationHealthPolicies": { - "fabric:/myApp1": { - "defaultServiceTypeHealthPolicy": { - "maxPercentUnhealthyServices": 0 - }, - "serviceTypeHealthPolicies": { - "myServiceType1": { - "maxPercentUnhealthyServices": 100 - } - } - } - } - }, - "deltaHealthPolicy": { - "maxPercentDeltaUnhealthyNodes": 0, - "maxPercentUpgradeDomainDeltaUnhealthyNodes": 0, - "maxPercentDeltaUnhealthyApplications": 0, - "applicationDeltaHealthPolicies": { - "fabric:/myApp1": { - "defaultServiceTypeDeltaHealthPolicy": { - "maxPercentDeltaUnhealthyServices": 0 - }, - "serviceTypeDeltaHealthPolicies": { - "myServiceType1": { - "maxPercentDeltaUnhealthyServices": 0 - } - } - } - } - } - }, - "clusterUpgradeMode": "Manual" + "addonFeatures": [ + "DnsService", + "BackupRestoreService", + "ResourceMonitorService" + ] } } }, @@ -255,49 +174,11 @@ ] } ], - "clusterUpgradeDescription": { - "forceRestart": false, - "upgradeReplicaSetCheckTimeout": "00:10:00", - "healthCheckWaitDuration": "00:00:30", - "healthCheckStableDuration": "00:00:30", - "healthCheckRetryTimeout": "00:05:00", - "upgradeTimeout": "01:00:00", - "upgradeDomainTimeout": "00:15:00", - "healthPolicy": { - "maxPercentUnhealthyNodes": 0, - "maxPercentUnhealthyApplications": 0, - "applicationHealthPolicies": { - "fabric:/myApp1": { - "defaultServiceTypeHealthPolicy": { - "maxPercentUnhealthyServices": 0 - }, - "serviceTypeHealthPolicies": { - "myServiceType1": { - "maxPercentUnhealthyServices": 100 - } - } - } - } - }, - "deltaHealthPolicy": { - "maxPercentDeltaUnhealthyNodes": 0, - "maxPercentUpgradeDomainDeltaUnhealthyNodes": 0, - "maxPercentDeltaUnhealthyApplications": 0, - "applicationDeltaHealthPolicies": { - "fabric:/myApp1": { - "defaultServiceTypeDeltaHealthPolicy": { - "maxPercentDeltaUnhealthyServices": 0 - }, - "serviceTypeDeltaHealthPolicies": { - "myServiceType1": { - "maxPercentDeltaUnhealthyServices": 0 - } - } - } - } - } - }, - "clusterUpgradeMode": "Manual" + "addonFeatures": [ + "DnsService", + "BackupRestoreService", + "ResourceMonitorService" + ] } } }, @@ -358,49 +239,11 @@ ] } ], - "clusterUpgradeDescription": { - "forceRestart": false, - "upgradeReplicaSetCheckTimeout": "00:10:00", - "healthCheckWaitDuration": "00:00:30", - "healthCheckStableDuration": "00:00:30", - "healthCheckRetryTimeout": "00:05:00", - "upgradeTimeout": "01:00:00", - "upgradeDomainTimeout": "00:15:00", - "healthPolicy": { - "maxPercentUnhealthyNodes": 0, - "maxPercentUnhealthyApplications": 0, - "applicationHealthPolicies": { - "fabric:/myApp1": { - "defaultServiceTypeHealthPolicy": { - "maxPercentUnhealthyServices": 0 - }, - "serviceTypeHealthPolicies": { - "myServiceType1": { - "maxPercentUnhealthyServices": 100 - } - } - } - } - }, - "deltaHealthPolicy": { - "maxPercentDeltaUnhealthyNodes": 0, - "maxPercentUpgradeDomainDeltaUnhealthyNodes": 0, - "maxPercentDeltaUnhealthyApplications": 0, - "applicationDeltaHealthPolicies": { - "fabric:/myApp1": { - "defaultServiceTypeDeltaHealthPolicy": { - "maxPercentDeltaUnhealthyServices": 0 - }, - "serviceTypeDeltaHealthPolicies": { - "myServiceType1": { - "maxPercentDeltaUnhealthyServices": 0 - } - } - } - } - } - }, - "clusterUpgradeMode": "Manual" + "addonFeatures": [ + "DnsService", + "BackupRestoreService", + "ResourceMonitorService" + ] } } } diff --git a/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/examples/ManagedClusterPutOperation_example_min.json b/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/examples/ManagedClusterPutOperation_example_min.json index eef0431e06cb..c2c6db44cbbc 100644 --- a/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/examples/ManagedClusterPutOperation_example_min.json +++ b/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/examples/ManagedClusterPutOperation_example_min.json @@ -63,26 +63,7 @@ } ] } - ], - "clusterUpgradeDescription": { - "forceRestart": false, - "upgradeReplicaSetCheckTimeout": "10675199.02:48:05.4775807", - "healthCheckWaitDuration": "00:05:00", - "healthCheckStableDuration": "00:05:00", - "healthCheckRetryTimeout": "00:45:00", - "upgradeTimeout": "12:00:00", - "upgradeDomainTimeout": "02:00:00", - "healthPolicy": { - "maxPercentUnhealthyNodes": 100, - "maxPercentUnhealthyApplications": 100 - }, - "deltaHealthPolicy": { - "maxPercentDeltaUnhealthyNodes": 0, - "maxPercentUpgradeDomainDeltaUnhealthyNodes": 0, - "maxPercentDeltaUnhealthyApplications": 0 - } - }, - "clusterUpgradeMode": "Automatic" + ] } } }, @@ -123,26 +104,7 @@ } ] } - ], - "clusterUpgradeDescription": { - "forceRestart": false, - "upgradeReplicaSetCheckTimeout": "10675199.02:48:05.4775807", - "healthCheckWaitDuration": "00:05:00", - "healthCheckStableDuration": "00:05:00", - "healthCheckRetryTimeout": "00:45:00", - "upgradeTimeout": "12:00:00", - "upgradeDomainTimeout": "02:00:00", - "healthPolicy": { - "maxPercentUnhealthyNodes": 100, - "maxPercentUnhealthyApplications": 100 - }, - "deltaHealthPolicy": { - "maxPercentDeltaUnhealthyNodes": 0, - "maxPercentUpgradeDomainDeltaUnhealthyNodes": 0, - "maxPercentDeltaUnhealthyApplications": 0 - } - }, - "clusterUpgradeMode": "Automatic" + ] } } }, @@ -183,26 +145,7 @@ } ] } - ], - "clusterUpgradeDescription": { - "forceRestart": false, - "upgradeReplicaSetCheckTimeout": "10675199.02:48:05.4775807", - "healthCheckWaitDuration": "00:05:00", - "healthCheckStableDuration": "00:05:00", - "healthCheckRetryTimeout": "00:45:00", - "upgradeTimeout": "12:00:00", - "upgradeDomainTimeout": "02:00:00", - "healthPolicy": { - "maxPercentUnhealthyNodes": 100, - "maxPercentUnhealthyApplications": 100 - }, - "deltaHealthPolicy": { - "maxPercentDeltaUnhealthyNodes": 0, - "maxPercentUpgradeDomainDeltaUnhealthyNodes": 0, - "maxPercentDeltaUnhealthyApplications": 0 - } - }, - "clusterUpgradeMode": "Automatic" + ] } } } diff --git a/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/managedcluster.json b/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/managedcluster.json index 45af9872d23f..51cc8e1a84d8 100644 --- a/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/managedcluster.json +++ b/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/managedcluster.json @@ -356,6 +356,11 @@ "type": "string" } ], + "x-ms-examples": { + "List available operations": { + "$ref": "./examples/Operations_example.json" + } + }, "responses": { "200": { "description": "OK. The request has succeeded.", @@ -424,6 +429,15 @@ } }, "definitions": { + "ManagedClusterAddOnFeature": { + "type": "string", + "description": "Available cluster add-on features", + "enum": [ + "DnsService", + "BackupRestoreService", + "ResourceMonitorService" + ] + }, "AzureActiveDirectory": { "properties": { "tenantId": { @@ -460,7 +474,7 @@ }, "issuerThumbprint": { "type": "string", - "description": "Issuer thumbprint for the certificate. Its only use CommonName is used." + "description": "Issuer thumbprint for the certificate. Only used together with CommonName." } }, "description": "Client Certificate definition." @@ -491,23 +505,6 @@ "Ready" ] }, - "ManagedClusterVersionDetails": { - "properties": { - "msiVersion": { - "type": "string", - "description": "The Service Fabric runtime version of the cluster." - }, - "supportExpiryUtc": { - "type": "string", - "description": "The date of expiry of support of the version." - }, - "osType": { - "$ref": "#/definitions/ClusterOsType", - "description": "Indicates the operating system of the cluster." - } - }, - "description": "The detail of the Service Fabric runtime version." - }, "LoadBalancingRule": { "required": [ "frontendPort", @@ -623,7 +620,7 @@ "clusterState": { "readOnly": true, "$ref": "#/definitions/ClusterState", - "description": "The current state of the cluster.\n\n - WaitingForNodes - Indicates that the cluster resource is created and the resource provider is waiting for Service Fabric VM extension to boot up and report to it.\n - Deploying - Indicates that the Service Fabric runtime is being installed on the VMs. Cluster resource will be in this state until the cluster boots up and system services are up.\n - BaselineUpgrade - Indicates that the cluster is upgrading to establishes the cluster version. This upgrade is automatically initiated when the cluster boots up for the first time.\n - UpdatingUserConfiguration - Indicates that the cluster is being upgraded with the user provided configuration.\n - UpdatingUserCertificate - Indicates that the cluster is being upgraded with the user provided certificate.\n - UpdatingInfrastructure - Indicates that the cluster is being upgraded with the latest Service Fabric runtime version. This happens only when the **upgradeMode** is set to 'Automatic'.\n - EnforcingClusterVersion - Indicates that cluster is on a different version than expected and the cluster is being upgraded to the expected version.\n - UpgradeServiceUnreachable - Indicates that the system service in the cluster is no longer polling the Resource Provider. Clusters in this state cannot be managed by the Resource Provider.\n - AutoScale - Indicates that the ReliabilityLevel of the cluster is being adjusted.\n - Ready - Indicates that the cluster is in a stable state.\n" + "description": "The current state of the cluster." }, "clusterCertificateThumbprint": { "type": "string", @@ -647,8 +644,8 @@ "description": "vm admin user name." }, "adminPassword": { - "x-ms-secret": true, "type": "string", + "x-ms-secret": true, "format": "password", "description": "vm admin user password." }, @@ -679,20 +676,19 @@ }, "provisioningState": { "$ref": "#/definitions/ManagedResourceProvisioningState", - "description": "The provisioning state of the managed cluster resource.", - "readOnly": true + "readOnly": true, + "description": "The provisioning state of the managed cluster resource." }, "clusterCodeVersion": { "type": "string", "description": "The Service Fabric runtime version of the cluster. This property can only by set the user when **upgradeMode** is set to 'Manual'. To get list of available Service Fabric versions for new clusters use [ClusterVersion API](./ClusterVersion.md). To get the list of available version for existing clusters use **availableClusterVersions**." }, - "clusterUpgradeMode": { - "$ref": "#/definitions/UpgradeMode", - "description": "The upgrade mode of the cluster when new Service Fabric runtime version is available.\n\n - Automatic - The cluster will be automatically upgraded to the latest Service Fabric runtime version as soon as it is available.\n - Manual - The cluster will not be automatically upgraded to the latest Service Fabric runtime version. The cluster is upgraded by setting the **clusterCodeVersion** property in the cluster resource.\n" - }, - "clusterUpgradeDescription": { - "$ref": "#/definitions/ClusterUpgradePolicy", - "description": "Describes the policy used when upgrading the cluster." + "addonFeatures": { + "type": "array", + "items": { + "$ref": "#/definitions/ManagedClusterAddOnFeature" + }, + "description": "client certificates for the cluster." } }, "description": "Describes the managed cluster resource properties." @@ -714,7 +710,7 @@ "items": { "$ref": "#/definitions/LoadBalancingRule" }, - "description": "Describes a load balancing rule." + "description": "Describes load balancing rules." }, "clients": { "type": "array", @@ -738,13 +734,12 @@ "type": "string", "description": "The Service Fabric runtime version of the cluster. This property can only by set the user when **upgradeMode** is set to 'Manual'. To get list of available Service Fabric versions for new clusters use [ClusterVersion API](./ClusterVersion.md). To get the list of available version for existing clusters use **availableClusterVersions**." }, - "clusterUpgradeMode": { - "$ref": "#/definitions/UpgradeMode", - "description": "The upgrade mode of the cluster when new Service Fabric runtime version is available.\n\n - Automatic - The cluster will be automatically upgraded to the latest Service Fabric runtime version as soon as it is available.\n - Manual - The cluster will not be automatically upgraded to the latest Service Fabric runtime version. The cluster is upgraded by setting the **clusterCodeVersion** property in the cluster resource.\n" - }, - "clusterUpgradeDescription": { - "$ref": "#/definitions/ClusterUpgradePolicy", - "description": "Describes the policy used when upgrading the cluster." + "addonFeatures": { + "type": "array", + "items": { + "$ref": "#/definitions/ManagedClusterAddOnFeature" + }, + "description": "client certificates for the cluster." } }, "description": "Describes the managed cluster resource properties." @@ -753,8 +748,7 @@ "properties": { "properties": { "x-ms-client-flatten": true, - "$ref": "#/definitions/ManagedClusterPropertiesUpdateParameters", - "description": "Describes the managed cluster resource properties." + "$ref": "#/definitions/ManagedClusterPropertiesUpdateParameters" }, "tags": { "type": "object", @@ -766,6 +760,23 @@ }, "description": "Managed cluster update request" }, + "ManagedClusterVersionDetails": { + "properties": { + "msiVersion": { + "type": "string", + "description": "The Service Fabric runtime version of the cluster." + }, + "supportExpiryUtc": { + "type": "string", + "description": "The date of expiry of support of the version." + }, + "osType": { + "$ref": "#/definitions/ClusterOsType", + "description": "Indicates the operating system of the cluster." + } + }, + "description": "The detail of the Service Fabric runtime version." + }, "Sku": { "required": [ "name" @@ -773,14 +784,14 @@ "properties": { "name": { "$ref": "#/definitions/SkuName", - "description": "Sku Name. Basic will have a minimum of 3 seed nodes and Standard a minimum of 5. Basic only allows 1 node type." + "description": "Sku Name." } }, "description": "Sku definition" }, "SkuName": { "type": "string", - "description": "Sku Name. Basic will hav a minimum of 3 seed nodes and Standard a minimum of 5. Basic only allows 1 node type.", + "description": "Sku Name. Basic will have a minimum of 3 seed nodes and Standard a minimum of 5. Basic only allows 1 node type.", "enum": [ "Basic", "Standard" @@ -1151,14 +1162,6 @@ } }, "description": "Describes a section in the fabric settings of the cluster." - }, - "UpgradeMode": { - "type": "string", - "description": "The upgrade mode of the cluster when new Service Fabric runtime version is available.\n\n - Automatic - The cluster will be automatically upgraded to the latest Service Fabric runtime version as soon as it is available.\n - Manual - The cluster will not be automatically upgraded to the latest Service Fabric runtime version. The cluster is upgraded by setting the **clusterCodeVersion** property in the cluster resource.\n", - "enum": [ - "Automatic", - "Manual" - ] } }, "parameters": { diff --git a/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/nodetype.json b/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/nodetype.json index 708998a6869e..c57c049f0f13 100644 --- a/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/nodetype.json +++ b/specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/nodetype.json @@ -51,11 +51,6 @@ "type": "string" } ], - "x-ms-examples": { - "List node type of the specified managed cluster": { - "$ref": "./examples/Operations_example.json" - } - }, "responses": { "200": { "description": "OK. The request has succeeded.", @@ -537,6 +532,38 @@ } }, "definitions": { + "ManagedProxyResource": { + "properties": { + "id": { + "type": "string", + "description": "Azure resource identifier.", + "readOnly": true + }, + "name": { + "type": "string", + "description": "Azure resource name.", + "readOnly": true + }, + "type": { + "type": "string", + "description": "Azure resource type.", + "readOnly": true + }, + "tags": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "description": "Azure resource tags.", + "x-ms-mutability": [ + "create", + "read" + ] + } + }, + "description": "The resource model definition for proxy-only resource.", + "x-ms-azure-resource": true + }, "NodeType": { "allOf": [ { @@ -656,8 +683,8 @@ }, "provisioningState": { "$ref": "#/definitions/ManagedResourceProvisioningState", - "description": "The provisioning state of the managed cluster resource.", - "readOnly": true + "readOnly": true, + "description": "The provisioning state of the managed cluster resource." } }, "description": "Describes a node type in the cluster, each node type represents sub set of nodes in the cluster." @@ -684,7 +711,7 @@ "vmInstanceCount": { "type": "integer", "format": "int32", - "description": "The number of nodes in the node type. This count should match the capacity property in the corresponding VirtualMachineScaleSet resource.", + "description": "The number of nodes in the node type.", "minimum": 1, "maximum": 2147483647 }, @@ -748,54 +775,6 @@ }, "description": "Node type update request" }, - "ManagedProxyResource": { - "properties": { - "id": { - "type": "string", - "description": "Azure resource identifier.", - "readOnly": true - }, - "name": { - "type": "string", - "description": "Azure resource name.", - "readOnly": true - }, - "type": { - "type": "string", - "description": "Azure resource type.", - "readOnly": true - }, - "tags": { - "type": "object", - "additionalProperties": { - "type": "string" - }, - "description": "Azure resource tags.", - "x-ms-mutability": [ - "create", - "read" - ] - } - }, - "description": "The resource model definition for proxy-only resource.", - "x-ms-azure-resource": true - }, - "ManagedResourceProvisioningState": { - "type": "string", - "description": "The provisioning state of the managed resource.", - "enum": [ - "None", - "Creating", - "Created", - "Updating", - "Succeeded", - "Failed", - "Canceled", - "Deleting", - "Deleted", - "Other" - ] - }, "SubResource": { "properties": { "id": { @@ -868,10 +847,6 @@ "typeHandlerVersion" ], "properties": { - "forceUpdateTag": { - "type": "string", - "description": "If a value is provided and is different from the previous value, the extension handler will be forced to update even if the extension configuration has not changed." - }, "publisher": { "type": "string", "description": "The name of the extension handler publisher." @@ -896,10 +871,9 @@ "type": "object", "description": "The extension can contain either protectedSettings or protectedSettingsFromKeyVault or no protected settings at all." }, - "provisioningState": { - "readOnly": true, + "forceUpdateTag": { "type": "string", - "description": "The provisioning state, which only appears in the response." + "description": "If a value is provided and is different from the previous value, the extension handler will be forced to update even if the extension configuration has not changed." }, "provisionAfterExtensions": { "type": "array", @@ -907,6 +881,11 @@ "type": "string" }, "description": "Collection of extension names after which this extension needs to be provisioned." + }, + "provisioningState": { + "readOnly": true, + "type": "string", + "description": "The provisioning state, which only appears in the response." } }, "description": "Describes the properties of a Virtual Machine Scale Set Extension." @@ -971,6 +950,22 @@ }, "description": "The error details." }, + "ManagedResourceProvisioningState": { + "type": "string", + "description": "The provisioning state of the managed resource.", + "enum": [ + "None", + "Creating", + "Created", + "Updating", + "Succeeded", + "Failed", + "Canceled", + "Deleting", + "Deleted", + "Other" + ] + }, "OperationListResult": { "properties": { "value": {