Skip to content

Add NSG rules, SKU, API version updates #10

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

Open
MillieOlsenMicrosoft wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add NSG rules, SKU, API version updates #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
129 changes: 124 additions & 5 deletions ServiceLoadTest/ServiceFabric/ClusterSetup/Azure/SixNodeD2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,11 +298,14 @@
},
"variables": {
"vmssApiVersion": "2016-03-30",
"lbApiVersion": "2015-06-15",
"vNetApiVersion": "2015-06-15",
"lbApiVersion": "2017-08-01",
"vNetApiVersion": "2017-08-01",
"storageApiVersion": "2016-01-01",
"publicIPApiVersion": "2015-06-15",
"publicIPApiVersion": "2017-08-01",
"nsgApiVersion": "2021-03-01",
"vnetID": "[resourceId('Microsoft.Network/virtualNetworks',parameters('virtualNetworkName'))]",
"subnet0Name": "Subnet-0",
"subnet1Name": "Subnet-1",
"subnet0Ref": "[concat(variables('vnetID'),'/subnets/',parameters('subnet0Name'))]",
"subnet1Ref": "[concat(variables('vnetID'),'/subnets/',parameters('subnet1Name'))]",
"lbID0": "[resourceId('Microsoft.Network/loadBalancers', concat('LB','-', parameters('clusterName'),'-',parameters('vmNodeType0Name')))]",
Expand Down Expand Up @@ -397,17 +400,130 @@
"resourceType": "Service Fabric",
"clusterName": "[parameters('clusterName')]"
}
},
{
"apiVersion": "2018-08-01",
"type": "Microsoft.Network/networkSecurityGroups",
"name": "[concat('nsg', variables('subnet0Name'))]",
"location": "[resourceGroup().location]",
"properties": {
"securityRules": [
{
"name": "AzurePortal",
"properties": {
"access": "Allow",
"sourceAddressPrefix": "ServiceFabric",
"sourcePortRange": "*",
"sourcePortRanges": [],
"destinationAddressPrefix": "*",
"destinationPortRange": "19080",
"destinationPortRanges": [],
"direction": "Inbound",
"priority": 3900,
"protocol": "Tcp",
"description": ""
}
},
{
"name": "Cluster",
"properties": {
"access": "Allow",
"sourceAddressPrefix": "VirtualNetwork",
"sourcePortRange": "*",
"sourcePortRanges": [],
"destinationAddressPrefix": "*",
"destinationPortRange": "",
"destinationPortRanges": [ "1025", "1026", "1027" ],
"direction": "Inbound",
"priority": 3930,
"protocol": "Tcp",
"description": ""
}
},
{
"name": "Ephemeral",
"properties": {
"access": "Allow",
"sourceAddressPrefix": "VirtualNetwork",
"sourcePortRange": "*",
"sourcePortRanges": [],
"destinationAddressPrefix": "*",
"destinationPortRange": "",
"destinationPortRanges": [ "49152", "65334" ],
"direction": "Inbound",
"priority": 3940,
"protocol": "Tcp",
"description": ""
}
},
{
"name": "Application",
"properties": {
"access": "Allow",
"sourceAddressPrefix": "VirtualNetwork",
"sourcePortRange": "*",
"sourcePortRanges": [],
"destinationAddressPrefix": "*",
"destinationPortRange": "",
"destinationPortRanges": [ "20000", "30000" ],
"direction": "Inbound",
"priority": 3950,
"protocol": "Tcp",
"description": ""
}
},
{
"name": "ResourceProvider",
"properties": {
"access": "Allow",
"sourceAddressPrefix": "*",
"sourcePortRange": "*",
"sourcePortRanges": [],
"destinationAddressPrefix": "ServiceFabric",
"destinationPortRange": "443",
"destinationPortRanges": [],
"direction": "Outbound",
"priority": 4010,
"protocol": "Tcp",
"description": ""
}
},
{
"name": "DownloadBinaries",
"properties": {
"access": "Allow",
"sourceAddressPrefix": "*",
"sourcePortRange": "*",
"sourcePortRanges": [],
"destinationAddressPrefix": "AzureFrontDoor.FirstParty",
"destinationPortRange": "",
"destinationPortRanges": [ "443" ],
"direction": "Outbound",
"priority": 4020,
"protocol": "Tcp",
"description": ""
}
}
]
},
"tags": {
"resourceType": "Service Fabric",
"clusterName": "[parameters('clusterName')]"
}
},
{
"apiVersion": "[variables('publicIPApiVersion')]",
"type": "Microsoft.Network/publicIPAddresses",
"name": "[concat(parameters('lbIPName'),'-','0')]",
"location": "[parameters('computeLocation')]",
"sku": {
"name": "Standard"
},
"properties": {
"dnsSettings": {
"domainNameLabel": "[parameters('dnsName')]"
},
"publicIPAllocationMethod": "Dynamic"
"publicIPAllocationMethod": "Static"
},
"tags": {
"resourceType": "Service Fabric",
Expand All @@ -422,6 +538,9 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/',concat(parameters('lbIPName'),'-','0'))]"
],
"sku": {
"name": "Standard"
},
"properties": {
"frontendIPConfigurations": [
{
Expand Down Expand Up @@ -757,7 +876,7 @@
"dnsSettings": {
"domainNameLabel": "[concat(parameters('dnsName'),'-','loadgen')]"
},
"publicIPAllocationMethod": "Dynamic"
"publicIPAllocationMethod": "Static"
},
"tags": {
"resourceType": "Service Fabric",
Expand Down
123 changes: 118 additions & 5 deletions ServiceLoadTest/ServiceFabric/ClusterSetup/Azure/ThreeNodeD2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,11 +298,14 @@
},
"variables": {
"vmssApiVersion": "2016-03-30",
"lbApiVersion": "2015-06-15",
"vNetApiVersion": "2015-06-15",
"lbApiVersion": "2017-08-01",
"vNetApiVersion": "2017-08-01",
"storageApiVersion": "2016-01-01",
"publicIPApiVersion": "2015-06-15",
"publicIPApiVersion": "2017-08-01",
"nsgApiVersion": "2021-03-01",
"vnetID": "[resourceId('Microsoft.Network/virtualNetworks',parameters('virtualNetworkName'))]",
"subnet0Name": "Subnet-0",
"subnet1Name": "Subnet-1",
"subnet0Ref": "[concat(variables('vnetID'),'/subnets/',parameters('subnet0Name'))]",
"subnet1Ref": "[concat(variables('vnetID'),'/subnets/',parameters('subnet1Name'))]",
"lbID0": "[resourceId('Microsoft.Network/loadBalancers', concat('LB','-', parameters('clusterName'),'-',parameters('vmNodeType0Name')))]",
Expand Down Expand Up @@ -398,6 +401,116 @@
"clusterName": "[parameters('clusterName')]"
}
},
{
"apiVersion": "2018-08-01",
"type": "Microsoft.Network/networkSecurityGroups",
"name": "[concat('nsg', variables('subnet0Name'))]",
"location": "[resourceGroup().location]",
"properties": {
"securityRules": [
{
"name": "AzurePortal",
"properties": {
"access": "Allow",
"sourceAddressPrefix": "ServiceFabric",
"sourcePortRange": "*",
"sourcePortRanges": [],
"destinationAddressPrefix": "*",
"destinationPortRange": "19080",
"destinationPortRanges": [],
"direction": "Inbound",
"priority": 3900,
"protocol": "Tcp",
"description": ""
}
},
{
"name": "Cluster",
"properties": {
"access": "Allow",
"sourceAddressPrefix": "VirtualNetwork",
"sourcePortRange": "*",
"sourcePortRanges": [],
"destinationAddressPrefix": "*",
"destinationPortRange": "",
"destinationPortRanges": [ "1025", "1026", "1027" ],
"direction": "Inbound",
"priority": 3930,
"protocol": "Tcp",
"description": ""
}
},
{
"name": "Ephemeral",
"properties": {
"access": "Allow",
"sourceAddressPrefix": "VirtualNetwork",
"sourcePortRange": "*",
"sourcePortRanges": [],
"destinationAddressPrefix": "*",
"destinationPortRange": "",
"destinationPortRanges": [ "49152", "65334" ],
"direction": "Inbound",
"priority": 3940,
"protocol": "Tcp",
"description": ""
}
},
{
"name": "Application",
"properties": {
"access": "Allow",
"sourceAddressPrefix": "VirtualNetwork",
"sourcePortRange": "*",
"sourcePortRanges": [],
"destinationAddressPrefix": "*",
"destinationPortRange": "",
"destinationPortRanges": [ "20000", "30000" ],
"direction": "Inbound",
"priority": 3950,
"protocol": "Tcp",
"description": ""
}
},
{
"name": "ResourceProvider",
"properties": {
"access": "Allow",
"sourceAddressPrefix": "*",
"sourcePortRange": "*",
"sourcePortRanges": [],
"destinationAddressPrefix": "ServiceFabric",
"destinationPortRange": "443",
"destinationPortRanges": [],
"direction": "Outbound",
"priority": 4010,
"protocol": "Tcp",
"description": ""
}
},
{
"name": "DownloadBinaries",
"properties": {
"access": "Allow",
"sourceAddressPrefix": "*",
"sourcePortRange": "*",
"sourcePortRanges": [],
"destinationAddressPrefix": "AzureFrontDoor.FirstParty",
"destinationPortRange": "",
"destinationPortRanges": [ "443" ],
"direction": "Outbound",
"priority": 4020,
"protocol": "Tcp",
"description": ""
}
}
]
},
"tags": {
"resourceType": "Service Fabric",
"clusterName": "[parameters('clusterName')]"
}
},
{
"apiVersion": "[variables('publicIPApiVersion')]",
"type": "Microsoft.Network/publicIPAddresses",
Expand All @@ -407,7 +520,7 @@
"dnsSettings": {
"domainNameLabel": "[parameters('dnsName')]"
},
"publicIPAllocationMethod": "Dynamic"
"publicIPAllocationMethod": "Static"
},
"tags": {
"resourceType": "Service Fabric",
Expand Down Expand Up @@ -757,7 +870,7 @@
"dnsSettings": {
"domainNameLabel": "[concat(parameters('dnsName'),'-','loadgen')]"
},
"publicIPAllocationMethod": "Dynamic"
"publicIPAllocationMethod": "Static"
},
"tags": {
"resourceType": "Service Fabric",
Expand Down
Loading