Fix db sku for staging

Altinn · Feb 6, 2025 · 9e3fc5b · 9e3fc5b
1 parent 84e8f1c
commit 9e3fc5b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 19 deletions.
diff --git a/.azure/infrastructure/main.bicep b/.azure/infrastructure/main.bicep
@@ -27,9 +27,6 @@ param slackUrl string
 import { Sku as KeyVaultSku } from '../modules/keyvault/create.bicep'
 param keyVaultSku KeyVaultSku
 
-import { Sku as PostgresSku } from '../modules/postgreSql/create.bicep'
-param postgresSku PostgresSku
-
 var resourceGroupName = '${namePrefix}-rg'
 
 var secrets = [
@@ -103,7 +100,6 @@ module postgresql '../modules/postgreSql/create.bicep' = {
     srcKeyVault: srcKeyVault
     srcSecretName: brokerAdminPasswordSecretName
     administratorLoginPassword: brokerPgAdminPassword
-    sku: postgresSku
     tenantId: tenantId
     environment: environment
   }

diff --git a/.azure/infrastructure/params.bicepparam b/.azure/infrastructure/params.bicepparam
@@ -20,9 +20,3 @@ param keyVaultSku = {
   name: 'standard'
   family: 'A'
 }
-param postgresSku = {
-  name: readEnvironmentVariable('ENVIRONMENT') == 'test'
-    ? 'Standard_B1ms'
-    : readEnvironmentVariable('ENVIRONMENT') == 'staging' ? 'Standard_B2s' : 'Standard_D2ads_v5'
-  tier: readEnvironmentVariable('ENVIRONMENT') == 'production' ? 'GeneralPurpose' : 'Burstable'
-}
diff --git a/.azure/modules/postgreSql/create.bicep b/.azure/modules/postgreSql/create.bicep
@@ -1,18 +1,11 @@
 param namePrefix string
 param location string
+@secure()
 param environmentKeyVaultName string
 param srcSecretName string
-
-@export()
-type Sku = {
-  name: 'Standard_B1ms' | 'Standard_B2s' | 'Standard_D2ads_v5'
-  tier: 'Burstable' | 'GeneralPurpose' | 'MemoryOptimized'
-}
-param sku Sku
 param environment string
 @secure()
 param srcKeyVault object
-
 @secure()
 param administratorLoginPassword string
 @secure()
@@ -52,6 +45,7 @@ resource postgres 'Microsoft.DBforPostgreSQL/flexibleServers@2023-12-01-preview'
     administratorLoginPassword: administratorLoginPassword
     storage: {
       storageSizeGB: 32
+      tier: environment == 'test' ? 'P4' : 'P20'
     }
     backup: { backupRetentionDays: 35 }
     authConfig: {
@@ -60,7 +54,12 @@ resource postgres 'Microsoft.DBforPostgreSQL/flexibleServers@2023-12-01-preview'
       tenantId: tenantId
     }
   }
-  sku: sku
+  sku: {
+    name: environment == 'test'
+    ? 'Standard_B1ms'
+    : 'Standard_D2ds_v5'
+    tier: environment == 'test' ? 'Burstable' : 'GeneralPurpose'
+  }
 }
 
 resource database 'Microsoft.DBforPostgreSQL/flexibleServers/databases@2023-12-01-preview' = {