Skip to content

Commit 6fe4a6a

Browse files
iliu816VeryEarly
iliu816
and
VeryEarly
authored
[Az.ServiceFabric] Change from Basic to Standard SKUs for loadbalancers and public IP addresses for New-AzServiceFabricCluster and Add-AzServiceFabricNodeType (#28624)
Co-authored-by: Yabo Hu <[email protected]>
1 parent 1b48e22 commit 6fe4a6a

File tree

11 files changed

+1176
-2169
lines changed

11 files changed

+1176
-2169
lines changed

‎src/ServiceFabric/ServiceFabric.Test/Resources/template.json‎

Lines changed: 38 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,23 @@
152152
"vmNodeType0Size": {
153153
"type": "string",
154154
"defaultValue": "Standard_D2s_v3"
155+
},
156+
"durabilityLevel": {
157+
"type": "string",
158+
"allowedValues": [
159+
"Silver",
160+
"Gold"
161+
],
162+
"defaultValue": "Silver"
163+
},
164+
"reliabilityLevel": {
165+
"type": "string",
166+
"allowedValues": [
167+
"Silver",
168+
"Gold",
169+
"Platinum"
170+
],
171+
"defaultValue": "Silver"
155172
}
156173
},
157174
"variables": {
@@ -270,7 +287,10 @@
270287
"dnsSettings": {
271288
"domainNameLabel": "[variables('dnsName')]"
272289
},
273-
"publicIPAllocationMethod": "Dynamic"
290+
"publicIPAllocationMethod": "Static"
291+
},
292+
"sku": {
293+
"name": "Standard"
274294
},
275295
"tags": {
276296
"resourceType": "Service Fabric",
@@ -433,13 +453,16 @@
433453
}
434454
]
435455
},
456+
"sku": {
457+
"name": "Standard"
458+
},
436459
"tags": {
437460
"resourceType": "Service Fabric",
438461
"clusterName": "[parameters('clusterName')]"
439462
}
440463
},
441464
{
442-
"apiVersion": "2015-06-15",
465+
"apiVersion": "2017-06-01",
443466
"type": "Microsoft.Network/networkSecurityGroups",
444467
"name": "[concat('nsg', variables('subnet0Name'))]",
445468
"location": "[resourceGroup().location]",
@@ -456,8 +479,7 @@
456479
"protocol": "*",
457480
"sourceAddressPrefix": "VirtualNetwork",
458481
"sourcePortRange": "*"
459-
},
460-
"comments": "allow SMB traffic within the net, used by fabric to move packages around"
482+
}
461483
},
462484
{
463485
"name": "allowSvcFabCluser",
@@ -470,8 +492,7 @@
470492
"protocol": "*",
471493
"sourceAddressPrefix": "VirtualNetwork",
472494
"sourcePortRange": "*"
473-
},
474-
"comments": "allow ports within vnet that are used by the fabric to talk between nodes"
495+
}
475496
},
476497
{
477498
"name": "allowSvcFabEphemeral",
@@ -484,8 +505,7 @@
484505
"protocol": "*",
485506
"sourceAddressPrefix": "VirtualNetwork",
486507
"sourcePortRange": "*"
487-
},
488-
"comments": "allow fabric ephemeral ports within the vnet"
508+
}
489509
},
490510
{
491511
"name": "allowSvcFabPortal",
@@ -498,8 +518,7 @@
498518
"protocol": "*",
499519
"sourceAddressPrefix": "*",
500520
"sourcePortRange": "*"
501-
},
502-
"comments": "allow port used to access the fabric cluster web portal"
521+
}
503522
},
504523
{
505524
"name": "allowSvcFabClient",
@@ -512,8 +531,7 @@
512531
"protocol": "*",
513532
"sourceAddressPrefix": "*",
514533
"sourcePortRange": "*"
515-
},
516-
"comments": "allow port used by the fabric client (includes powershell)"
534+
}
517535
},
518536
{
519537
"name": "allowSvcFabApplication",
@@ -526,8 +544,7 @@
526544
"protocol": "*",
527545
"sourceAddressPrefix": "*",
528546
"sourcePortRange": "*"
529-
},
530-
"comments": "allow fabric application ports within the vnet"
547+
}
531548
},
532549
{
533550
"name": "blockAll",
@@ -540,8 +557,7 @@
540557
"protocol": "*",
541558
"sourceAddressPrefix": "*",
542559
"sourcePortRange": "*"
543-
},
544-
"comments": "block all traffic except what we've explicitly allowed"
560+
}
545561
},
546562
{
547563
"name": "allowVNetRDP",
@@ -554,8 +570,7 @@
554570
"protocol": "*",
555571
"sourceAddressPrefix": "*",
556572
"sourcePortRange": "*"
557-
},
558-
"comments": "allow RDP within the net"
573+
}
559574
},
560575
{
561576
"name": "allowAppPort1",
@@ -568,8 +583,7 @@
568583
"protocol": "*",
569584
"sourceAddressPrefix": "*",
570585
"sourcePortRange": "*"
571-
},
572-
"comments": "allow public application port 1"
586+
}
573587
},
574588
{
575589
"name": "allowAppPort2",
@@ -582,8 +596,7 @@
582596
"protocol": "*",
583597
"sourceAddressPrefix": "*",
584598
"sourcePortRange": "*"
585-
},
586-
"comments": "allow public application port 2"
599+
}
587600
}
588601
]
589602
},
@@ -638,7 +651,7 @@
638651
"clusterEndpoint": "[reference(parameters('clusterName')).clusterEndpoint]",
639652
"nodeTypeRef": "[variables('vmNodeType0Name')]",
640653
"dataPath": "D:\\SvcFab",
641-
"durabilityLevel": "Silver",
654+
"durabilityLevel": "[parameters('durabilityLevel')]",
642655
"enableParallelJobs": true,
643656
"nicPrefixOverride": "[variables('subnet0Prefix')]",
644657
"certificate": {
@@ -823,7 +836,7 @@
823836
"startPort": "[variables('nt0applicationStartPort')]"
824837
},
825838
"clientConnectionEndpointPort": "[variables('nt0fabricTcpGatewayPort')]",
826-
"durabilityLevel": "Silver",
839+
"durabilityLevel": "[parameters('durabilityLevel')]",
827840
"ephemeralPorts": {
828841
"endPort": "[variables('nt0ephemeralEndPort')]",
829842
"startPort": "[variables('nt0ephemeralStartPort')]"
@@ -834,7 +847,7 @@
834847
}
835848
],
836849
"provisioningState": "Default",
837-
"reliabilityLevel": "Silver",
850+
"reliabilityLevel": "[parameters('reliabilityLevel')]",
838851
"upgradeMode": "Automatic",
839852
"vmImage": "Windows"
840853
},

‎src/ServiceFabric/ServiceFabric.Test/Resources/templateCNCert.json‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,10 @@
276276
"dnsSettings": {
277277
"domainNameLabel": "[variables('dnsName')]"
278278
},
279-
"publicIPAllocationMethod": "Dynamic"
279+
"publicIPAllocationMethod": "Static"
280+
},
281+
"sku": {
282+
"name": "Standard"
280283
},
281284
"tags": {
282285
"resourceType": "Service Fabric",
@@ -291,6 +294,9 @@
291294
"dependsOn": [
292295
"[concat('Microsoft.Network/publicIPAddresses/',concat(variables('lbIPName'),'-',variables('vmNodeType0Name')))]"
293296
],
297+
"sku": {
298+
"name": "Standard"
299+
},
294300
"properties": {
295301
"frontendIPConfigurations": [
296302
{
@@ -445,7 +451,7 @@
445451
}
446452
},
447453
{
448-
"apiVersion": "2015-06-15",
454+
"apiVersion": "2017-06-01",
449455
"type": "Microsoft.Network/networkSecurityGroups",
450456
"name": "[concat('nsg', variables('subnet0Name'))]",
451457
"location": "[resourceGroup().location]",

‎src/ServiceFabric/ServiceFabric.Test/ScenarioTests/Common.ps1‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,24 +68,24 @@ function Get-NewCertName
6868
function Get-SecretUrl
6969
{
7070
# Thumbprint for this cert should be specified in TestServiceFabric.cs as well in ServiceFabricCmdletBase.TestThumbprint
71-
return "https://azurermsfkvtest.vault.azure.net:443/secrets/AzureRMSFTestCert2/6648a0d27b9044b0b437d0ccaca0204f"
71+
return "https://azurermsfkvtest.vault.azure.net:443/secrets/AzureRMSFTestCert2/9d32304d6b1044d58b00f989f8bce73e"
7272
}
7373

7474
function Get-InitialThumbprint
7575
{
76-
return "27F73AA239055A16C9EA809B985CC3170E4A7EAB"
76+
return "5472875FDA4D5578A3DAD037BBCE600015214C42"
7777
}
7878

7979
function Get-Thumbprint
8080
{
8181
# Change the thumbprint in the TestServiceFabric.cs file as well in ServiceFabricCmdletBase.TestThumbprint
82-
return "AFE6D1166D030CFDBAAEE74CA5A5F5256BE3FF49"
82+
return "4D59A08F0039D124316D89680F89024C9E5EC9C4"
8383
}
8484

8585
function Get-CertAppSecretUrl
8686
{
8787
# Thumbprint for this cert should be specified in TestServiceFabric.cs in ServiceFabricCmdletBase.TestThumbprintAppCert
88-
return "https://azurermsfkvtest.vault.azure.net:443/secrets/AzureRMSFTestCertApp/af9f8cce090449bc9646cf40257ab19a"
88+
return "https://azurermsfkvtest.vault.azure.net/secrets/AzureRMSFTestCertApp/af9f8cce090449bc9646cf40257ab19a"
8989
}
9090

9191
function Get-CertAppThumbprint

‎src/ServiceFabric/ServiceFabric.Test/ScenarioTests/TestServiceFabric.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public TestServiceFabric(ITestOutputHelper output) : base(output)
3232
ServiceFabricCmdletBase.RunningTest = true;
3333
ServiceFabricCmdletBase.NewCreatedKeyVaultWaitTimeInSec = 0;
3434
//change the thumbprint in the common.ps1 file as well
35-
ServiceFabricCmdletBase.TestThumbprint = "AFE6D1166D030CFDBAAEE74CA5A5F5256BE3FF49";
35+
ServiceFabricCmdletBase.TestThumbprint = "4D59A08F0039D124316D89680F89024C9E5EC9C4";
3636
ServiceFabricCmdletBase.TestCommonNameCACert = "azurermsfcntest.southcentralus.cloudapp.azure.com";
3737
ServiceFabricCmdletBase.TestCommonNameAppCert = "AzureRMSFTestCertApp";
3838
ServiceFabricCmdletBase.TestThumbprintAppCert = "D9BAB3CC41F5EA798DD086402C1A4EDADEB42B2A";

‎src/ServiceFabric/ServiceFabric.Test/SessionRecords/Microsoft.Azure.Commands.ServiceFabric.Test.ScenarioTests.TestServiceFabric/TestAddAzureRmServiceFabricNode.json‎

Lines changed: 4 additions & 4 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)