diff --git a/pkg/deploy/assets/gateway-production.json b/pkg/deploy/assets/gateway-production.json index 19f123da724..7c004646dbd 100644 --- a/pkg/deploy/assets/gateway-production.json +++ b/pkg/deploy/assets/gateway-production.json @@ -106,15 +106,6 @@ } }, "resources": [ - { - "sku": { - "name": "Standard_LRS" - }, - "location": "[resourceGroup().location]", - "name": "[substring(parameters('gatewayStorageAccountDomain'), 0, indexOf(parameters('gatewayStorageAccountDomain'), '.'))]", - "type": "Microsoft.Storage/storageAccounts", - "apiVersion": "2019-06-01" - }, { "sku": { "name": "Standard" diff --git a/pkg/deploy/assets/rp-production.json b/pkg/deploy/assets/rp-production.json index 26282772f7b..78474e71fdb 100644 --- a/pkg/deploy/assets/rp-production.json +++ b/pkg/deploy/assets/rp-production.json @@ -535,15 +535,6 @@ "[resourceId('Microsoft.Storage/storageAccounts', substring(parameters('storageAccountDomain'), 0, indexOf(parameters('storageAccountDomain'), '.')))]" ] }, - { - "sku": { - "name": "Standard_LRS" - }, - "location": "[resourceGroup().location]", - "name": "[substring(parameters('storageAccountDomain'), 0, indexOf(parameters('storageAccountDomain'), '.'))]", - "type": "Microsoft.Storage/storageAccounts", - "apiVersion": "2019-06-01" - }, { "properties": { "severity": 2, diff --git a/pkg/deploy/generator/resources_gateway.go b/pkg/deploy/generator/resources_gateway.go index 662df3de5a4..e6ca4db2913 100644 --- a/pkg/deploy/generator/resources_gateway.go +++ b/pkg/deploy/generator/resources_gateway.go @@ -419,7 +419,3 @@ func (g *generator) gatewayRBAC() []*arm.Resource { ), } } - -func (g *generator) gatewayStorageAccount() *arm.Resource { - return g.storageAccount("[substring(parameters('gatewayStorageAccountDomain'), 0, indexOf(parameters('gatewayStorageAccountDomain'), '.'))]", nil, nil) -} diff --git a/pkg/deploy/generator/resources_rp.go b/pkg/deploy/generator/resources_rp.go index 3d961e70dff..b5606470638 100644 --- a/pkg/deploy/generator/resources_rp.go +++ b/pkg/deploy/generator/resources_rp.go @@ -1559,7 +1559,3 @@ func (g *generator) rpVersionStorageAccount() []*arm.Resource { }, } } - -func (g *generator) rpStorageAccount() *arm.Resource { - return g.storageAccount("[substring(parameters('storageAccountDomain'), 0, indexOf(parameters('storageAccountDomain'), '.'))]", nil, nil) -} diff --git a/pkg/deploy/generator/templates_gateway.go b/pkg/deploy/generator/templates_gateway.go index 958aef22554..98c09062c83 100644 --- a/pkg/deploy/generator/templates_gateway.go +++ b/pkg/deploy/generator/templates_gateway.go @@ -84,7 +84,6 @@ func (g *generator) gatewayTemplate() *arm.Template { } t.Resources = append(t.Resources, - g.gatewayStorageAccount(), g.gatewayLB(), g.gatewayPLS(), g.gatewayVMSS(), diff --git a/pkg/deploy/generator/templates_rp.go b/pkg/deploy/generator/templates_rp.go index d5506af6441..744bb020092 100644 --- a/pkg/deploy/generator/templates_rp.go +++ b/pkg/deploy/generator/templates_rp.go @@ -168,7 +168,6 @@ func (g *generator) rpTemplate() *arm.Template { g.rpLB(), g.rpLBInternal(), g.rpVMSS(), - g.rpStorageAccount(), g.rpLBAlert(30.0, 2, "rp-availability-alert", "PT5M", "PT15M", "DipAvailability"), // triggers on all 3 RPs being down for 10min, can't be >=0.3 due to deploys going down to 32% at times. g.rpLBAlert(67.0, 3, "rp-degraded-alert", "PT15M", "PT6H", "DipAvailability"), // 1/3 backend down for 1h or 2/3 down for 3h in the last 6h g.rpLBAlert(33.0, 2, "rp-vnet-alert", "PT5M", "PT5M", "VipAvailability")) // this will trigger only if the Azure network infrastructure between the loadBalancers and VMs is down for 3.5min