openshift/installer
1
0
Fork 0
mirror of https://github.com/openshift/installer.git synced 2026-02-05 15:47:14 +01:00
Code Issues Releases Activity

Merge pull request #9903 from openshift-cherrypick-robot/cherry-pick-9898-to-release-4.19

Browse Source 
[release-4.19] OCPBUGS-60666: Azure: change LB and pubic IP skus to Standard
This commit is contained in:
openshift-merge-bot[bot]
2025-08-25 22:28:02 +00:00
committed by GitHub
parent 2478a55e76 f82da9016a
commit 7df002dabd
4 changed files with 61 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
upi/azurestack/03_infra.json
View File

@@ -21,9 +21,12 @@
"masterLoadBalancerName" : "[concat(parameters('baseName'))]",
"masterLoadBalancerID" : "[resourceId('Microsoft.Network/loadBalancers', variables('masterLoadBalancerName'))]",
"masterAvailabilitySetName" : "[concat(parameters('baseName'), '-cluster')]",
"outboundPulicIpAddressName" : "[concat(parameters('baseName'), '-outbound-pip')]",
"outboundPulicIpAddressID" : "[resourceId('Microsoft.Network/publicIPAddresses', variables('outboundPulicIpAddressName'))]",
"outboundBackendPoolName" : "[concat(parameters('baseName'), '-outbound')]",
"internalLoadBalancerName" : "[concat(parameters('baseName'), '-internal')]",
"internalLoadBalancerID" : "[resourceId('Microsoft.Network/loadBalancers', variables('internalLoadBalancerName'))]",
"skuName": "Basic"
"skuName": "Standard"
},
"resources" : [
{
@@ -56,6 +59,21 @@
},
{
"apiVersion" : "2017-10-01",
"type" : "Microsoft.Network/publicIPAddresses",
"name" : "[variables('outboundPulicIpAddressName')]",
"location" : "[variables('location')]",
"sku": {
"name": "[variables('skuName')]"
},
"properties" : {
"publicIPAllocationMethod" : "Static",
"dnsSettings" : {
"domainNameLabel" : "[variables('outboundPulicIpAddressName')]"
}
}
},
{
"apiVersion" : "2018-06-01",
"type" : "Microsoft.Network/loadBalancers",
"name" : "[variables('masterLoadBalancerName')]",
"location" : "[variables('location')]",
@@ -74,11 +92,22 @@
"id" : "[variables('masterPublicIpAddressID')]"
}
}
},
{
"name" : "outbound-frontendEnd",
"properties" : {
"publicIPAddress" : {
"id" : "[variables('outboundPulicIpAddressID')]"
}
}
}
],
"backendAddressPools" : [
{
"name" : "[variables('masterLoadBalancerName')]"
},
{
"name" : "[variables('outboundBackendPoolName')]"
}
],
"loadBalancingRules" : [
@@ -102,6 +131,24 @@
}
}
],
"outboundRules": [
{
"name": "OutboundNATAllProtocols",
"properties": {
"backendAddressPool": {
"id": "[concat(variables('masterLoadBalancerID'), '/backendAddressPools/', variables('outboundBackendPoolName'))]"
},
"enableTcpReset": false,
"frontendIPConfigurations": [
{
"id": "[concat(variables('masterLoadBalancerID'), '/frontendIPConfigurations/outbound-frontendEnd')]"
}
],
"idleTimeoutInMinutes": 4,
"protocol": "All"
}
}
],
"probes" : [
{
"name" : "api-public-probe",

2
upi/azurestack/04_bootstrap.json
View File

@@ -56,7 +56,7 @@
"name" : "[variables('sshPublicIpAddressName')]",
"location" : "[variables('location')]",
"sku": {
"name": "Basic"
"name": "Standard"
},
"properties" : {
"publicIPAllocationMethod" : "Static",

4
upi/azurestack/05_masters.json
View File

@@ -48,6 +48,7 @@
"masterLoadBalancerName" : "[concat(parameters('baseName'))]",
"masterAvailabilitySetName" : "[concat(parameters('baseName'), '-cluster')]",
"internalLoadBalancerName" : "[concat(parameters('baseName'), '-internal')]",
"outboundBackendPoolName" : "[concat(parameters('baseName'), '-outbound')]",
"sshKeyPath" : "/home/core/.ssh/authorized_keys",
"clusterNsgName" : "[concat(parameters('baseName'), '-nsg')]",
"imageName" : "[parameters('baseName')]",
@@ -98,6 +99,9 @@
{
"id" : "[concat('/subscriptions/', subscription().subscriptionId, '/resourceGroups/', resourceGroup().name, '/providers/Microsoft.Network/loadBalancers/', variables('masterLoadBalancerName'), '/backendAddressPools/', variables('masterLoadBalancerName'))]"
},
{
"id" : "[concat('/subscriptions/', subscription().subscriptionId, '/resourceGroups/', resourceGroup().name, '/providers/Microsoft.Network/loadBalancers/', variables('masterLoadBalancerName'), '/backendAddressPools/', variables('outboundBackendPoolName'))]"
},
{
"id" : "[concat('/subscriptions/', subscription().subscriptionId, '/resourceGroups/', resourceGroup().name, '/providers/Microsoft.Network/loadBalancers/', variables('internalLoadBalancerName'), '/backendAddressPools/', variables('internalLoadBalancerName'))]"
}

10
upi/azurestack/06_workers.json
View File

@@ -47,7 +47,8 @@
"virtualNetworkID" : "[resourceId('Microsoft.Network/virtualNetworks', variables('virtualNetworkName'))]",
"nodeSubnetName" : "[concat(parameters('baseName'), '-worker-subnet')]",
"nodeSubnetRef" : "[concat(variables('virtualNetworkID'), '/subnets/', variables('nodeSubnetName'))]",
"infraLoadBalancerName" : "[parameters('baseName')]",
"masterLoadBalancerName" : "[concat(parameters('baseName'))]",
"outboundBackendPoolName" : "[concat(parameters('baseName'), '-outbound')]",
"sshKeyPath" : "/home/core/.ssh/authorized_keys",
"imageName" : "[parameters('baseName')]",
"masterAvailabilitySetName" : "[concat(parameters('baseName'), '-cluster')]",
@@ -93,7 +94,12 @@
"privateIPAllocationMethod" : "Dynamic",
"subnet" : {
"id" : "[variables('nodeSubnetRef')]"
}
},
"loadBalancerBackendAddressPools" : [
{
"id" : "[concat('/subscriptions/', subscription().subscriptionId, '/resourceGroups/', resourceGroup().name, '/providers/Microsoft.Network/loadBalancers/', variables('masterLoadBalancerName'), '/backendAddressPools/', variables('outboundBackendPoolName'))]"
}
]
}
}
]