Disable anonymous access on version SA and delete dedicated rp/ocp ve…

…rsions containers
Azure · Jan 31, 2025 · 3ad769d · 3ad769d
1 parent 8114216
commit 3ad769d
Showing 1 changed file with 5 additions and 31 deletions.
diff --git a/pkg/deploy/generator/resources_rp.go b/pkg/deploy/generator/resources_rp.go
@@ -1518,36 +1518,10 @@ func (g *generator) rpACRRBAC() []*arm.Resource {
 
 func (g *generator) rpVersionStorageAccount() []*arm.Resource {
 	return []*arm.Resource{
-		g.storageAccount("[parameters('rpVersionStorageAccountName')]", &mgmtstorage.AccountProperties{
-			AllowBlobPublicAccess: to.BoolPtr(true),
-		}, map[string]*string{
-			tagKeyExemptPublicBlob: to.StringPtr(tagValueExemptPublicBlob),
-		}),
-		{
-			Resource: &mgmtstorage.BlobContainer{
-				Name: to.StringPtr("[concat(parameters('rpVersionStorageAccountName'), '/default/rpversion')]"),
-				Type: to.StringPtr("Microsoft.Storage/storageAccounts/blobServices/containers"),
-				ContainerProperties: &mgmtstorage.ContainerProperties{
-					PublicAccess: mgmtstorage.PublicAccessContainer,
-				},
-			},
-			APIVersion: azureclient.APIVersion("Microsoft.Storage"),
-			DependsOn: []string{
-				"[resourceId('Microsoft.Storage/storageAccounts', parameters('rpVersionStorageAccountName'))]",
-			},
-		},
-		{
-			Resource: &mgmtstorage.BlobContainer{
-				Name: to.StringPtr("[concat(parameters('rpVersionStorageAccountName'), '/default/ocpversions')]"),
-				Type: to.StringPtr("Microsoft.Storage/storageAccounts/blobServices/containers"),
-				ContainerProperties: &mgmtstorage.ContainerProperties{
-					PublicAccess: mgmtstorage.PublicAccessContainer,
-				},
-			},
-			APIVersion: azureclient.APIVersion("Microsoft.Storage"),
-			DependsOn: []string{
-				"[resourceId('Microsoft.Storage/storageAccounts', parameters('rpVersionStorageAccountName'))]",
-			},
-		},
+		g.storageAccount(
+			"[parameters('rpVersionStorageAccountName')]",
+			&mgmtstorage.AccountProperties{AllowBlobPublicAccess: to.BoolPtr(false)},
+			map[string]*string{},
+		),
 	}
 }