Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Service Fabric Managed Clusters] Adding missing property ClusterUpgradeCadence #12858

Merged
merged 9 commits into from
Feb 19, 2021
Merged

[Service Fabric Managed Clusters] Adding missing property ClusterUpgradeCadence #12858

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
62a6808
adding missing property ClusterUpgradeCadence
Feb 4, 2021
a5210a0
change createdByType and lastModifiedAt to strings
Feb 5, 2021
8c8af70
remove duplicate operations path
Feb 8, 2021
9ebae93
fix sdk-net path typo
Feb 12, 2021
b6f0355
commit to rerun automation
Feb 14, 2021
1dffce8
remove x-ms-client-flatten for ServiceResource
Feb 15, 2021
0bb4e3b
Merge pull request #1 from a-santamaria/alsantam_manged2_servicefix
a-santamaria Feb 15, 2021
0502d27
remove after_scripts automation was failing
Feb 15, 2021
8fc3bc8
rename _Create to _CreateOrUpdate in apps
Feb 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions ...dClusters/preview/2021-01-01-preview/examples/ManagedClusterPutOperation_example_max.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,8 @@
"enableAutoOSUpgrade": true,
"applicationTypeVersionsCleanupPolicy": {
"maxUnusedVersionsToKeep": 3
}
},
"clusterUpgradeCadence": "Wave1"
}
}
},
Expand Down Expand Up @@ -268,7 +269,8 @@
"enableAutoOSUpgrade": true,
"applicationTypeVersionsCleanupPolicy": {
"maxUnusedVersionsToKeep": 3
}
},
"clusterUpgradeCadence": "Wave1"
}
}
}
Expand Down
77 changes: 2 additions & 75 deletions ...Microsoft.ServiceFabricManagedClusters/preview/2021-01-01-preview/managedapplication.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,42 +34,6 @@
}
],
"paths": {
"/providers/Microsoft.ServiceFabric/operations": {
"get": {
"tags": [
"Operations"
],
"summary": "Lists all of the available Service Fabric resource provider API operations.",
"description": "Get the list of available Service Fabric resource provider API operations.",
"operationId": "Operations_List",
"parameters": [
{
"name": "api-version",
"in": "query",
"description": "The version of the Service Fabric resource provider API",
"required": true,
"type": "string"
}
],
"responses": {
"200": {
"description": "OK. The request has succeeded.",
"schema": {
"$ref": "#/definitions/OperationListResult"
}
},
"default": {
"description": "Error response describing why the operation failed.",
"schema": {
"$ref": "#/definitions/ErrorModel"
}
}
},
"x-ms-pageable": {
"nextLinkName": "nextLink"
}
}
},
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ServiceFabric/managedclusters/{clusterName}/applicationTypes/{applicationTypeName}": {
"get": {
"tags": [
Expand Down Expand Up @@ -2602,23 +2566,6 @@
},
"description": "The error details."
},
"OperationListResult": {
"properties": {
"value": {
"type": "array",
"description": "List of operations supported by the Service Fabric resource provider.",
"items": {
"$ref": "#/definitions/OperationResult"
}
},
"nextLink": {
"type": "string",
"description": "URL to get the next set of operation list results if there are any.",
"readOnly": true
}
},
"description": "Describes the result of the request to list Service Fabric resource provider operations."
},
"OperationResult": {
"properties": {
"name": {
Expand Down Expand Up @@ -2655,17 +2602,7 @@
},
"createdByType": {
"type": "string",
"description": "The type of identity that created the resource.",
"enum": [
"User",
"Application",
"ManagedIdentity",
"Key"
],
"x-ms-enum": {
"name": "createdByType",
"modelAsString": true
}
"description": "The type of identity that created the resource."
},
"createdAt": {
"type": "string",
Expand All @@ -2678,17 +2615,7 @@
},
"lastModifiedByType": {
"type": "string",
"description": "The type of identity that last modified the resource.",
"enum": [
"User",
"Application",
"ManagedIdentity",
"Key"
],
"x-ms-enum": {
"name": "createdByType",
"modelAsString": true
}
"description": "The type of identity that last modified the resource."
},
"lastModifiedAt": {
"type": "string",
Expand Down
55 changes: 33 additions & 22 deletions ...ger/Microsoft.ServiceFabricManagedClusters/preview/2021-01-01-preview/managedcluster.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,6 +430,33 @@
},
"description": "Client certificate definition."
},
"ClusterUpgradeCadence": {
"type": "string",
"enum": [
"Wave0",
"Wave1",
"Wave2"
],
"x-ms-enum": {
"name": "clusterUpgradeCadence",
"modelAsString": true,
"values": [
{
"value": "Wave0",
"description": "Cluster upgrade starts immediately after a new version is rolled out. Recommended for Test/Dev clusters."
},
{
"value": "Wave1",
"description": "Cluster upgrade starts 7 days after a new version is rolled out. Recommended for Pre-prod clusters."
},
{
"value": "Wave2",
"description": "Cluster upgrade starts 14 days after a new version is rolled out. Recommended for Production clusters."
}
]
},
"description": "Indicates when new cluster runtime version upgrades will be applied after they are released. By default is Wave0."
},
"ClusterState": {
"type": "string",
"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 - Upgrading - Indicates that the cluster is being upgraded with the user provided configuration.\n - UpgradeFailed - Indicates that the last upgrade for the cluster has failed.\n - Ready - Indicates that the cluster is in a stable state.\n",
Expand Down Expand Up @@ -639,6 +666,10 @@
"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**."
},
"clusterUpgradeCadence": {
"$ref": "#/definitions/ClusterUpgradeCadence",
"description": "Indicates when new cluster runtime version upgrades will be applied after they are released. By default is Wave0."
},
"addonFeatures": {
"type": "array",
"items": {
Expand Down Expand Up @@ -981,17 +1012,7 @@
},
"createdByType": {
"type": "string",
"description": "The type of identity that created the resource.",
"enum": [
"User",
"Application",
"ManagedIdentity",
"Key"
],
"x-ms-enum": {
"name": "createdByType",
"modelAsString": true
}
"description": "The type of identity that created the resource."
},
"createdAt": {
"type": "string",
Expand All @@ -1004,17 +1025,7 @@
},
"lastModifiedByType": {
"type": "string",
"description": "The type of identity that last modified the resource.",
"enum": [
"User",
"Application",
"ManagedIdentity",
"Key"
],
"x-ms-enum": {
"name": "createdByType",
"modelAsString": true
}
"description": "The type of identity that last modified the resource."
},
"lastModifiedAt": {
"type": "string",
Expand Down
77 changes: 2 additions & 75 deletions ...e-manager/Microsoft.ServiceFabricManagedClusters/preview/2021-01-01-preview/nodetype.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,42 +34,6 @@
}
],
"paths": {
"/providers/Microsoft.ServiceFabric/operations": {
"get": {
"tags": [
"Operations"
],
"summary": "Lists all of the available Service Fabric resource provider API operations.",
"description": "Get the list of available Service Fabric resource provider API operations.",
"operationId": "Operations_List",
"parameters": [
{
"name": "api-version",
"in": "query",
"description": "The version of the Service Fabric resource provider API",
"required": true,
"type": "string"
}
],
"responses": {
"200": {
"description": "OK. The request has succeeded.",
"schema": {
"$ref": "#/definitions/OperationListResult"
}
},
"default": {
"description": "Error response describing why the operation failed.",
"schema": {
"$ref": "#/definitions/ErrorModel"
}
}
},
"x-ms-pageable": {
"nextLinkName": "nextLink"
}
}
},
"/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.ServiceFabric/managedClusters/{clusterName}/nodeTypes": {
"get": {
"operationId": "NodeTypes_ListByManagedClusters",
Expand Down Expand Up @@ -913,23 +877,6 @@
"Other"
]
},
"OperationListResult": {
"properties": {
"value": {
"type": "array",
"description": "List of operations supported by the Service Fabric resource provider.",
"items": {
"$ref": "#/definitions/OperationResult"
}
},
"nextLink": {
"type": "string",
"description": "URL to get the next set of operation list results if there are any.",
"readOnly": true
}
},
"description": "Describes the result of the request to list Service Fabric resource provider operations."
},
"OperationResult": {
"properties": {
"name": {
Expand Down Expand Up @@ -966,17 +913,7 @@
},
"createdByType": {
"type": "string",
"description": "The type of identity that created the resource.",
"enum": [
"User",
"Application",
"ManagedIdentity",
"Key"
],
"x-ms-enum": {
"name": "createdByType",
"modelAsString": true
}
"description": "The type of identity that created the resource."
},
"createdAt": {
"type": "string",
Expand All @@ -989,17 +926,7 @@
},
"lastModifiedByType": {
"type": "string",
"description": "The type of identity that last modified the resource.",
"enum": [
"User",
"Application",
"ManagedIdentity",
"Key"
],
"x-ms-enum": {
"name": "createdByType",
"modelAsString": true
}
"description": "The type of identity that last modified the resource."
},
"lastModifiedAt": {
"type": "string",
Expand Down