From f5478863db103455746ff23f1f395c11dafa2d55 Mon Sep 17 00:00:00 2001 From: Nont Date: Wed, 12 Jun 2024 21:13:14 -0500 Subject: [PATCH] Remove no longer needed parameters --- pkg/deploy/assets/gateway-production.json | 3 +-- pkg/deploy/assets/rp-production.json | 3 +-- pkg/deploy/generator/resources_gateway.go | 1 - pkg/deploy/generator/resources_rp.go | 1 - 4 files changed, 2 insertions(+), 6 deletions(-) diff --git a/pkg/deploy/assets/gateway-production.json b/pkg/deploy/assets/gateway-production.json index e44521f9205..08c026fd130 100644 --- a/pkg/deploy/assets/gateway-production.json +++ b/pkg/deploy/assets/gateway-production.json @@ -314,8 +314,7 @@ "tags": {}, "apiVersion": "2020-12-01", "dependsOn": [ - "[resourceId('Microsoft.Network/loadBalancers', 'gateway-lb-internal')]", - "[resourceId('Microsoft.Storage/storageAccounts', substring(parameters('gatewayStorageAccountDomain'), 0, indexOf(parameters('gatewayStorageAccountDomain'), '.')))]" + "[resourceId('Microsoft.Network/loadBalancers', 'gateway-lb-internal')]" ] }, { diff --git a/pkg/deploy/assets/rp-production.json b/pkg/deploy/assets/rp-production.json index 79eff786add..c3b73849f4f 100644 --- a/pkg/deploy/assets/rp-production.json +++ b/pkg/deploy/assets/rp-production.json @@ -465,8 +465,7 @@ "apiVersion": "2020-12-01", "dependsOn": [ "[resourceId('Microsoft.Authorization/roleAssignments', guid(resourceGroup().id, parameters('rpServicePrincipalId'), 'RP / Reader'))]", - "[resourceId('Microsoft.Network/loadBalancers', 'rp-lb')]", - "[resourceId('Microsoft.Storage/storageAccounts', substring(parameters('storageAccountDomain'), 0, indexOf(parameters('storageAccountDomain'), '.')))]" + "[resourceId('Microsoft.Network/loadBalancers', 'rp-lb')]" ] }, { diff --git a/pkg/deploy/generator/resources_gateway.go b/pkg/deploy/generator/resources_gateway.go index 1217dec1def..951a941b4c4 100644 --- a/pkg/deploy/generator/resources_gateway.go +++ b/pkg/deploy/generator/resources_gateway.go @@ -366,7 +366,6 @@ func (g *generator) gatewayVMSS() *arm.Resource { APIVersion: azureclient.APIVersion("Microsoft.Compute"), DependsOn: []string{ "[resourceId('Microsoft.Network/loadBalancers', 'gateway-lb-internal')]", - "[resourceId('Microsoft.Storage/storageAccounts', substring(parameters('gatewayStorageAccountDomain'), 0, indexOf(parameters('gatewayStorageAccountDomain'), '.')))]", }, } } diff --git a/pkg/deploy/generator/resources_rp.go b/pkg/deploy/generator/resources_rp.go index ad47e981440..2cb125639ac 100644 --- a/pkg/deploy/generator/resources_rp.go +++ b/pkg/deploy/generator/resources_rp.go @@ -564,7 +564,6 @@ func (g *generator) rpVMSS() *arm.Resource { DependsOn: []string{ "[resourceId('Microsoft.Authorization/roleAssignments', guid(resourceGroup().id, parameters('rpServicePrincipalId'), 'RP / Reader'))]", "[resourceId('Microsoft.Network/loadBalancers', 'rp-lb')]", - "[resourceId('Microsoft.Storage/storageAccounts', substring(parameters('storageAccountDomain'), 0, indexOf(parameters('storageAccountDomain'), '.')))]", }, } }