Skip to content

Commit be58944

Browse files
a-santamariaAlfredo Santamaria Gomez
a-santamaria
and
Alfredo Santamaria Gomez
authored
add ManagedCluster AddOnFeature, remove clusterUpgradeMode and clusterUpgradeDescription as they are not available yet (#12086)
Co-authored-by: Alfredo Santamaria Gomez <alsantam@microsoft.com>
1 parent f491437 commit be58944

File tree

8 files changed

+145
-599
lines changed

8 files changed

+145
-599
lines changed

‎specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/examples/ManagedClusterGetOperation_example.json‎

Lines changed: 1 addition & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -56,50 +56,7 @@
5656
}
5757
]
5858
}
59-
],
60-
"clusterUpgradeMode": "Manual",
61-
"clusterUpgradeDescription": {
62-
"forceRestart": false,
63-
"upgradeReplicaSetCheckTimeout": "00:10:00",
64-
"healthCheckWaitDuration": "00:00:30",
65-
"healthCheckStableDuration": "00:00:30",
66-
"healthCheckRetryTimeout": "00:05:00",
67-
"upgradeTimeout": "01:00:00",
68-
"upgradeDomainTimeout": "00:15:00",
69-
"healthPolicy": {
70-
"maxPercentUnhealthyNodes": 0,
71-
"maxPercentUnhealthyApplications": 0,
72-
"applicationHealthPolicies": {
73-
"fabric:/myApp1": {
74-
"defaultServiceTypeHealthPolicy": {
75-
"maxPercentUnhealthyServices": 0
76-
},
77-
"serviceTypeHealthPolicies": {
78-
"myServiceType1": {
79-
"maxPercentUnhealthyServices": 100
80-
}
81-
}
82-
}
83-
}
84-
},
85-
"deltaHealthPolicy": {
86-
"maxPercentDeltaUnhealthyNodes": 0,
87-
"maxPercentUpgradeDomainDeltaUnhealthyNodes": 0,
88-
"maxPercentDeltaUnhealthyApplications": 0,
89-
"applicationDeltaHealthPolicies": {
90-
"fabric:/myApp1": {
91-
"defaultServiceTypeDeltaHealthPolicy": {
92-
"maxPercentDeltaUnhealthyServices": 0
93-
},
94-
"serviceTypeDeltaHealthPolicies": {
95-
"myServiceType1": {
96-
"maxPercentDeltaUnhealthyServices": 0
97-
}
98-
}
99-
}
100-
}
101-
}
102-
}
59+
]
10360
}
10461
}
10562
}

‎specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/examples/ManagedClusterListByResourceGroupOperation_example.json‎

Lines changed: 2 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -38,26 +38,7 @@
3838
}
3939
]
4040
}
41-
],
42-
"clusterUpgradeDescription": {
43-
"forceRestart": false,
44-
"upgradeReplicaSetCheckTimeout": "10675199.02:48:05.4775807",
45-
"healthCheckWaitDuration": "00:05:00",
46-
"healthCheckStableDuration": "00:05:00",
47-
"healthCheckRetryTimeout": "00:45:00",
48-
"upgradeTimeout": "12:00:00",
49-
"upgradeDomainTimeout": "02:00:00",
50-
"healthPolicy": {
51-
"maxPercentUnhealthyNodes": 100,
52-
"maxPercentUnhealthyApplications": 100
53-
},
54-
"deltaHealthPolicy": {
55-
"maxPercentDeltaUnhealthyNodes": 0,
56-
"maxPercentUpgradeDomainDeltaUnhealthyNodes": 0,
57-
"maxPercentDeltaUnhealthyApplications": 0
58-
}
59-
},
60-
"clusterUpgradeMode": "Automatic"
41+
]
6142
}
6243
},
6344
{
@@ -89,26 +70,7 @@
8970
}
9071
]
9172
}
92-
],
93-
"clusterUpgradeDescription": {
94-
"forceRestart": false,
95-
"upgradeReplicaSetCheckTimeout": "10675199.02:48:05.4775807",
96-
"healthCheckWaitDuration": "00:05:00",
97-
"healthCheckStableDuration": "00:05:00",
98-
"healthCheckRetryTimeout": "00:45:00",
99-
"upgradeTimeout": "12:00:00",
100-
"upgradeDomainTimeout": "02:00:00",
101-
"healthPolicy": {
102-
"maxPercentUnhealthyNodes": 100,
103-
"maxPercentUnhealthyApplications": 100
104-
},
105-
"deltaHealthPolicy": {
106-
"maxPercentDeltaUnhealthyNodes": 0,
107-
"maxPercentUpgradeDomainDeltaUnhealthyNodes": 0,
108-
"maxPercentDeltaUnhealthyApplications": 0
109-
}
110-
},
111-
"clusterUpgradeMode": "Automatic"
73+
]
11274
}
11375
}
11476
],

‎specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/examples/ManagedClusterListBySubscriptionOperation_example.json‎

Lines changed: 2 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -37,26 +37,7 @@
3737
}
3838
]
3939
}
40-
],
41-
"clusterUpgradeDescription": {
42-
"forceRestart": false,
43-
"upgradeReplicaSetCheckTimeout": "10675199.02:48:05.4775807",
44-
"healthCheckWaitDuration": "00:05:00",
45-
"healthCheckStableDuration": "00:05:00",
46-
"healthCheckRetryTimeout": "00:45:00",
47-
"upgradeTimeout": "12:00:00",
48-
"upgradeDomainTimeout": "02:00:00",
49-
"healthPolicy": {
50-
"maxPercentUnhealthyNodes": 100,
51-
"maxPercentUnhealthyApplications": 100
52-
},
53-
"deltaHealthPolicy": {
54-
"maxPercentDeltaUnhealthyNodes": 0,
55-
"maxPercentUpgradeDomainDeltaUnhealthyNodes": 0,
56-
"maxPercentDeltaUnhealthyApplications": 0
57-
}
58-
},
59-
"clusterUpgradeMode": "Automatic"
40+
]
6041
}
6142
},
6243
{
@@ -88,26 +69,7 @@
8869
}
8970
]
9071
}
91-
],
92-
"clusterUpgradeDescription": {
93-
"forceRestart": false,
94-
"upgradeReplicaSetCheckTimeout": "10675199.02:48:05.4775807",
95-
"healthCheckWaitDuration": "00:05:00",
96-
"healthCheckStableDuration": "00:05:00",
97-
"healthCheckRetryTimeout": "00:45:00",
98-
"upgradeTimeout": "12:00:00",
99-
"upgradeDomainTimeout": "02:00:00",
100-
"healthPolicy": {
101-
"maxPercentUnhealthyNodes": 100,
102-
"maxPercentUnhealthyApplications": 100
103-
},
104-
"deltaHealthPolicy": {
105-
"maxPercentDeltaUnhealthyNodes": 0,
106-
"maxPercentUpgradeDomainDeltaUnhealthyNodes": 0,
107-
"maxPercentDeltaUnhealthyApplications": 0
108-
}
109-
},
110-
"clusterUpgradeMode": "Automatic"
72+
]
11173
}
11274
}
11375
],

‎specification/servicefabric/resource-manager/Microsoft.ServiceFabric/preview/2020-01-01-preview/examples/ManagedClusterPatchOperation_example.json‎

Lines changed: 11 additions & 130 deletions
Original file line numberDiff line numberDiff line change
@@ -43,49 +43,11 @@
4343
]
4444
}
4545
],
46-
"clusterUpgradeDescription": {
47-
"forceRestart": false,
48-
"upgradeReplicaSetCheckTimeout": "00:10:00",
49-
"healthCheckWaitDuration": "00:00:30",
50-
"healthCheckStableDuration": "00:00:30",
51-
"healthCheckRetryTimeout": "00:05:00",
52-
"upgradeTimeout": "01:00:00",
53-
"upgradeDomainTimeout": "00:15:00",
54-
"healthPolicy": {
55-
"maxPercentUnhealthyNodes": 0,
56-
"maxPercentUnhealthyApplications": 0,
57-
"applicationHealthPolicies": {
58-
"fabric:/myApp1": {
59-
"defaultServiceTypeHealthPolicy": {
60-
"maxPercentUnhealthyServices": 0
61-
},
62-
"serviceTypeHealthPolicies": {
63-
"myServiceType1": {
64-
"maxPercentUnhealthyServices": 100
65-
}
66-
}
67-
}
68-
}
69-
},
70-
"deltaHealthPolicy": {
71-
"maxPercentDeltaUnhealthyNodes": 0,
72-
"maxPercentUpgradeDomainDeltaUnhealthyNodes": 0,
73-
"maxPercentDeltaUnhealthyApplications": 0,
74-
"applicationDeltaHealthPolicies": {
75-
"fabric:/myApp1": {
76-
"defaultServiceTypeDeltaHealthPolicy": {
77-
"maxPercentDeltaUnhealthyServices": 0
78-
},
79-
"serviceTypeDeltaHealthPolicies": {
80-
"myServiceType1": {
81-
"maxPercentDeltaUnhealthyServices": 0
82-
}
83-
}
84-
}
85-
}
86-
}
87-
},
88-
"clusterUpgradeMode": "Automatic"
46+
"addonFeatures": [
47+
"DnsService",
48+
"BackupRestoreService",
49+
"ResourceMonitorService"
50+
]
8951
}
9052
}
9153
},
@@ -144,49 +106,11 @@
144106
]
145107
}
146108
],
147-
"clusterUpgradeDescription": {
148-
"forceRestart": false,
149-
"upgradeReplicaSetCheckTimeout": "00:10:00",
150-
"healthCheckWaitDuration": "00:00:30",
151-
"healthCheckStableDuration": "00:00:30",
152-
"healthCheckRetryTimeout": "00:05:00",
153-
"upgradeTimeout": "01:00:00",
154-
"upgradeDomainTimeout": "00:15:00",
155-
"healthPolicy": {
156-
"maxPercentUnhealthyNodes": 0,
157-
"maxPercentUnhealthyApplications": 0,
158-
"applicationHealthPolicies": {
159-
"fabric:/myApp1": {
160-
"defaultServiceTypeHealthPolicy": {
161-
"maxPercentUnhealthyServices": 0
162-
},
163-
"serviceTypeHealthPolicies": {
164-
"myServiceType1": {
165-
"maxPercentUnhealthyServices": 100
166-
}
167-
}
168-
}
169-
}
170-
},
171-
"deltaHealthPolicy": {
172-
"maxPercentDeltaUnhealthyNodes": 0,
173-
"maxPercentUpgradeDomainDeltaUnhealthyNodes": 0,
174-
"maxPercentDeltaUnhealthyApplications": 0,
175-
"applicationDeltaHealthPolicies": {
176-
"fabric:/myApp1": {
177-
"defaultServiceTypeDeltaHealthPolicy": {
178-
"maxPercentDeltaUnhealthyServices": 0
179-
},
180-
"serviceTypeDeltaHealthPolicies": {
181-
"myServiceType1": {
182-
"maxPercentDeltaUnhealthyServices": 0
183-
}
184-
}
185-
}
186-
}
187-
}
188-
},
189-
"clusterUpgradeMode": "Automatic"
109+
"addonFeatures": [
110+
"DnsService",
111+
"BackupRestoreService",
112+
"ResourceMonitorService"
113+
]
190114
}
191115
}
192116
},
@@ -243,50 +167,7 @@
243167
}
244168
]
245169
}
246-
],
247-
"clusterUpgradeDescription": {
248-
"forceRestart": false,
249-
"upgradeReplicaSetCheckTimeout": "00:10:00",
250-
"healthCheckWaitDuration": "00:00:30",
251-
"healthCheckStableDuration": "00:00:30",
252-
"healthCheckRetryTimeout": "00:05:00",
253-
"upgradeTimeout": "01:00:00",
254-
"upgradeDomainTimeout": "00:15:00",
255-
"healthPolicy": {
256-
"maxPercentUnhealthyNodes": 0,
257-
"maxPercentUnhealthyApplications": 0,
258-
"applicationHealthPolicies": {
259-
"fabric:/myApp1": {
260-
"defaultServiceTypeHealthPolicy": {
261-
"maxPercentUnhealthyServices": 0
262-
},
263-
"serviceTypeHealthPolicies": {
264-
"myServiceType1": {
265-
"maxPercentUnhealthyServices": 100
266-
}
267-
}
268-
}
269-
}
270-
},
271-
"deltaHealthPolicy": {
272-
"maxPercentDeltaUnhealthyNodes": 0,
273-
"maxPercentUpgradeDomainDeltaUnhealthyNodes": 0,
274-
"maxPercentDeltaUnhealthyApplications": 0,
275-
"applicationDeltaHealthPolicies": {
276-
"fabric:/myApp1": {
277-
"defaultServiceTypeDeltaHealthPolicy": {
278-
"maxPercentDeltaUnhealthyServices": 0
279-
},
280-
"serviceTypeDeltaHealthPolicies": {
281-
"myServiceType1": {
282-
"maxPercentDeltaUnhealthyServices": 0
283-
}
284-
}
285-
}
286-
}
287-
}
288-
},
289-
"clusterUpgradeMode": "Automatic"
170+
]
290171
}
291172
}
292173
}

0 commit comments

Comments
 (0)