adding serviceDnsName to service, instanceCloseDelayDuration to state…

…less service and ApplicationTypeVersionsCleanupPolicy to cluster
Azure · Apr 4, 2020 · 43767e3 · 43767e3
1 parent f83281b
commit 43767e3
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 5 deletions.
diff --git a/...bric/resource-manager/Microsoft.ServiceFabric/preview/2019-11-01-preview/application.json b/...bric/resource-manager/Microsoft.ServiceFabric/preview/2019-11-01-preview/application.json
@@ -1998,6 +1998,10 @@
               }
             ]
           }
+        },
+        "serviceDnsName": {
+          "type": "string",
+          "description": "Dns name used for the service. If this is specified, then the service can be accessed via its DNS name instead of service name."
         }
       }
     },
@@ -2161,6 +2165,10 @@
           "type": "integer",
           "minimum": -1,
           "description": "The instance count."
+        },
+        "instanceCloseDelayDuration": {
+          "type": "string",
+          "description": "Delay duration for RequestDrain feature to ensures that the endpoint advertised by the stateless instance is removed before the delay starts prior to closing the instance. This delay enables existing requests to drain gracefully before the instance actually goes down (https://docs.microsoft.com/en-us/azure/service-fabric/service-fabric-application-upgrade-advanced#avoid-connection-drops-during-stateless-service-planned-downtime-preview). It is first interpreted as a string representing an ISO 8601 duration. If that fails, then it is interpreted as a number representing the total number of milliseconds."
         }
       }
     },
@@ -2177,6 +2185,10 @@
           "type": "integer",
           "minimum": -1,
           "description": "The instance count."
+        },
+        "instanceCloseDelayDuration": {
+          "type": "string",
+          "description": "Delay duration for RequestDrain feature to ensures that the endpoint advertised by the stateless instance is removed before the delay starts prior to closing the instance. This delay enables existing requests to drain gracefully before the instance actually goes down (https://docs.microsoft.com/en-us/azure/service-fabric/service-fabric-application-upgrade-advanced#avoid-connection-drops-during-stateless-service-planned-downtime-preview). It is first interpreted as a string representing an ISO 8601 duration. If that fails, then it is interpreted as a number representing the total number of milliseconds."
         }
       }
     },

diff --git a/...cefabric/resource-manager/Microsoft.ServiceFabric/preview/2019-11-01-preview/cluster.json b/...cefabric/resource-manager/Microsoft.ServiceFabric/preview/2019-11-01-preview/cluster.json
@@ -510,6 +510,18 @@
         "ResourceMonitorService"
       ]
     },
+    "ApplicationTypeVersionsCleanupPolicy": {
+      "required": [
+        "maxUnusedVersionsToKeep"
+      ],
+      "properties": {
+        "maxUnusedVersionsToKeep": {
+          "type": "integer",
+          "minimum": 0,
+          "description": "Number of unused versions per application type to keep."
+        }
+      }
+    },
     "ApplicationDeltaHealthPolicy": {
       "type": "object",
       "description": "Defines a delta health policy used to evaluate the health of an application or one of its child entities when upgrading the cluster.\n",
@@ -882,6 +894,10 @@
           "$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"
         },
+        "applicationTypeVersionsCleanupPolicy": {
+          "$ref": "#/definitions/ApplicationTypeVersionsCleanupPolicy",
+          "description": "The policy used to clean up unused versions."
+        },
         "vmImage": {
           "type": "string",
           "description": "The VM image VMSS has been configured with. Generic names such as Windows or Linux can be used."
@@ -957,6 +973,10 @@
         "upgradeMode": {
           "$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"
+        },
+        "applicationTypeVersionsCleanupPolicy": {
+          "$ref": "#/definitions/ApplicationTypeVersionsCleanupPolicy",
+          "description": "The policy used to clean up unused versions."
         }
       },
       "description": "Describes the cluster resource properties that can be updated during PATCH operation."

diff --git a/...ft.ServiceFabric/preview/2019-11-01-preview/examples/ClusterPutOperation_example_max.json b/...ft.ServiceFabric/preview/2019-11-01-preview/examples/ClusterPutOperation_example_max.json
@@ -132,7 +132,10 @@
           "BackupRestoreService",
           "ResourceMonitorService"
         ],
-        "eventStoreServiceEnabled": true
+        "eventStoreServiceEnabled": true,
+        "applicationTypeVersionsCleanupPolicy": {
+          "maxUnusedVersionsToKeep": 2
+        }
       }
     }
   },
@@ -286,7 +289,10 @@
             "BackupRestoreService",
             "ResourceMonitorService"
           ],
-          "eventStoreServiceEnabled": true
+          "eventStoreServiceEnabled": true,
+          "applicationTypeVersionsCleanupPolicy": {
+            "maxUnusedVersionsToKeep": 2
+          }
         }
       }
     },
@@ -439,7 +445,10 @@
             "BackupRestoreService",
             "ResourceMonitorService"
           ],
-          "eventStoreServiceEnabled": true
+          "eventStoreServiceEnabled": true,
+          "applicationTypeVersionsCleanupPolicy": {
+            "maxUnusedVersionsToKeep": 2
+          }
         }
       }
     }

diff --git a/...ft.ServiceFabric/preview/2019-11-01-preview/examples/ServicePutOperation_example_max.json b/...ft.ServiceFabric/preview/2019-11-01-preview/examples/ServicePutOperation_example_max.json
@@ -29,7 +29,9 @@
         "servicePlacementPolicies": [],
         "defaultMoveCost": "Medium",
         "instanceCount": 5,
-        "servicePackageActivationMode": "SharedProcess"
+        "instanceCloseDelayDuration": "00:00:30",
+        "servicePackageActivationMode": "SharedProcess",
+        "serviceDnsName": "my.service.dns"
       }
     }
   },
@@ -63,7 +65,9 @@
           "servicePlacementPolicies": [],
           "defaultMoveCost": "Medium",
           "instanceCount": 5,
-          "servicePackageActivationMode": "SharedProcess"
+          "instanceCloseDelayDuration": "00:00:30",
+          "servicePackageActivationMode": "SharedProcess",
+          "serviceDnsName": "my.service.dns"
         }
       }
     }