From 8c8e8e4ed4533239a37d26fcb5b53c1cd168f958 Mon Sep 17 00:00:00 2001 From: Nont Date: Thu, 4 Apr 2024 15:34:34 -0500 Subject: [PATCH] Remove SkipLinuxAzSecPack from RP and Gateway VMSS --- pkg/deploy/assets/gateway-production.json | 4 +--- pkg/deploy/assets/rp-production.json | 4 +--- pkg/deploy/generator/resources_gateway.go | 4 +--- pkg/deploy/generator/resources_rp.go | 4 +--- 4 files changed, 4 insertions(+), 12 deletions(-) diff --git a/pkg/deploy/assets/gateway-production.json b/pkg/deploy/assets/gateway-production.json index e1d0afaf42e..814a55a1513 100644 --- a/pkg/deploy/assets/gateway-production.json +++ b/pkg/deploy/assets/gateway-production.json @@ -327,9 +327,7 @@ "name": "[concat('gateway-vmss-', parameters('vmssName'))]", "type": "Microsoft.Compute/virtualMachineScaleSets", "location": "[resourceGroup().location]", - "tags": { - "SkipLinuxAzSecPack": "true" - }, + "tags": {}, "apiVersion": "2020-12-01", "dependsOn": [ "[resourceId('Microsoft.Network/loadBalancers', 'gateway-lb-internal')]", diff --git a/pkg/deploy/assets/rp-production.json b/pkg/deploy/assets/rp-production.json index 2339efdb40e..a703c9a35c4 100644 --- a/pkg/deploy/assets/rp-production.json +++ b/pkg/deploy/assets/rp-production.json @@ -534,9 +534,7 @@ "name": "[concat('rp-vmss-', parameters('vmssName'))]", "type": "Microsoft.Compute/virtualMachineScaleSets", "location": "[resourceGroup().location]", - "tags": { - "SkipLinuxAzSecPack": "true" - }, + "tags": {}, "apiVersion": "2020-12-01", "dependsOn": [ "[resourceId('Microsoft.Authorization/roleAssignments', guid(resourceGroup().id, parameters('rpServicePrincipalId'), 'RP / Reader'))]", diff --git a/pkg/deploy/generator/resources_gateway.go b/pkg/deploy/generator/resources_gateway.go index 0491bf3062e..63e7f1dbf39 100644 --- a/pkg/deploy/generator/resources_gateway.go +++ b/pkg/deploy/generator/resources_gateway.go @@ -256,9 +256,7 @@ func (g *generator) gatewayVMSS() *arm.Resource { Tier: to.StringPtr("Standard"), Capacity: to.Int64Ptr(1339), }, - Tags: map[string]*string{ - "SkipLinuxAzSecPack": to.StringPtr("true"), - }, + Tags: map[string]*string{}, VirtualMachineScaleSetProperties: &mgmtcompute.VirtualMachineScaleSetProperties{ UpgradePolicy: &mgmtcompute.UpgradePolicy{ Mode: mgmtcompute.UpgradeModeManual, diff --git a/pkg/deploy/generator/resources_rp.go b/pkg/deploy/generator/resources_rp.go index a33fa5746ea..ac4aa4d947f 100644 --- a/pkg/deploy/generator/resources_rp.go +++ b/pkg/deploy/generator/resources_rp.go @@ -545,9 +545,7 @@ func (g *generator) rpVMSS() *arm.Resource { Tier: to.StringPtr("Standard"), Capacity: to.Int64Ptr(1338), }, - Tags: map[string]*string{ - "SkipLinuxAzSecPack": to.StringPtr("true"), - }, + Tags: map[string]*string{}, VirtualMachineScaleSetProperties: &mgmtcompute.VirtualMachineScaleSetProperties{ UpgradePolicy: &mgmtcompute.UpgradePolicy{ Mode: mgmtcompute.UpgradeModeManual,