From 52a23e555cd788f94316c2ab336f6476f293f484 Mon Sep 17 00:00:00 2001 From: Marcus Felling Date: Tue, 20 Sep 2022 09:59:17 -0500 Subject: [PATCH] update to latest stable types, remove unused tags --- deploy/Services/acr.bicep | 2 +- deploy/Services/api.bicep | 22 +++++++++++++--------- deploy/Web/web.bicep | 4 ++-- 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/deploy/Services/acr.bicep b/deploy/Services/acr.bicep index 522ea2f..237bb9c 100644 --- a/deploy/Services/acr.bicep +++ b/deploy/Services/acr.bicep @@ -17,7 +17,7 @@ param location string = resourceGroup().location ]) param acrSku string = 'Basic' -resource acr 'Microsoft.ContainerRegistry/registries@2019-12-01-preview' = { +resource acr 'Microsoft.ContainerRegistry/registries@2021-09-01' = { name: acrName location: location tags: { diff --git a/deploy/Services/api.bicep b/deploy/Services/api.bicep index 17b620e..19c5913 100644 --- a/deploy/Services/api.bicep +++ b/deploy/Services/api.bicep @@ -26,7 +26,7 @@ var storageEnv = environment().suffixes.storage var imagesStorage = 'https://${storageAccountName}.blob.${storageEnv}/covers/' var deployIngestion = false -resource sqlServer 'Microsoft.Sql/servers@2020-02-02-preview' = { +resource sqlServer 'Microsoft.Sql/servers@2021-11-01' = { name: serverName location: location properties: { @@ -35,7 +35,7 @@ resource sqlServer 'Microsoft.Sql/servers@2020-02-02-preview' = { } } -resource sqlDB 'Microsoft.Sql/servers/databases@2020-08-01-preview' = { +resource sqlDB 'Microsoft.Sql/servers/databases@2021-11-01' = { parent: sqlServer name: sqlDBName location: location @@ -67,14 +67,14 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2019-06-01' = { } } -resource feedQueue 'Microsoft.Storage/storageAccounts/queueServices/queues@2021-06-01' = { +resource feedQueue 'Microsoft.Storage/storageAccounts/queueServices/queues@2022-05-01' = { name: '${storageAccountName}/default/feed-queue' dependsOn: [ storageAccount ] } -resource workspace 'Microsoft.OperationalInsights/workspaces@2020-08-01' = { +resource workspace 'Microsoft.OperationalInsights/workspaces@2021-06-01' = { name: workspaceName location: location properties: { @@ -93,7 +93,6 @@ resource workspace 'Microsoft.OperationalInsights/workspaces@2020-08-01' = { resource kubernetesEnv 'Microsoft.App/managedEnvironments@2022-03-01' = { name: kubernetesEnvName location: location - properties: { appLogsConfiguration: { destination: 'log-analytics' @@ -111,6 +110,9 @@ resource apiContainerApp 'Microsoft.App/containerApps@2022-03-01' = { properties: { managedEnvironmentId: kubernetesEnvId configuration: { + dapr: { + enabled: false + } activeRevisionsMode: 'single' ingress: { external: true @@ -175,8 +177,6 @@ resource apiContainerApp 'Microsoft.App/containerApps@2022-03-01' = { } } } - tags: { - } dependsOn: [ sqlDB ] @@ -188,6 +188,9 @@ resource ingestionContainerApp 'Microsoft.App/containerApps@2022-03-01' = if (de properties: { managedEnvironmentId: kubernetesEnvId configuration: { + dapr: { + enabled: false + } activeRevisionsMode: 'single' registries: [ { @@ -265,6 +268,9 @@ resource updaterContainerApp 'Microsoft.App/containerApps@2022-03-01' = { properties: { managedEnvironmentId: kubernetesEnvId configuration: { + dapr: { + enabled: false + } activeRevisionsMode: 'single' registries: [ { @@ -311,8 +317,6 @@ resource updaterContainerApp 'Microsoft.App/containerApps@2022-03-01' = { } } } - tags: { - } dependsOn: [ apiContainerApp storageAccount diff --git a/deploy/Web/web.bicep b/deploy/Web/web.bicep index 0bcf6e7..c1eeda3 100644 --- a/deploy/Web/web.bicep +++ b/deploy/Web/web.bicep @@ -15,7 +15,7 @@ param location string = resourceGroup().location @description('The Runtime stack of current web app') param linuxFxVersion string = 'DOTNETCORE|6.0' -resource servicePlan 'Microsoft.Web/serverfarms@2020-06-01' = { +resource servicePlan 'Microsoft.Web/serverfarms@2022-03-01' = { name: servicePlanName location: location sku: { @@ -27,7 +27,7 @@ resource servicePlan 'Microsoft.Web/serverfarms@2020-06-01' = { } } -resource webApp 'Microsoft.Web/sites@2020-06-01' = { +resource webApp 'Microsoft.Web/sites@2022-03-01' = { name: webAppName location: location properties: {