Skip to content

[release/9.3] Changing default SKU for App Service Plan to P0V3 #9330

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
May 15, 2025
Merged

[release/9.3] Changing default SKU for App Service Plan to P0V3 #9330

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f04a9ec
Changing default SKU for App Service Plan to P0V3
ShilpiRach May 13, 2025
08e2f03
Removed TargetPort property from sitecontainer definition
ShilpiRach May 13, 2025
303792b
Updated manifest file for sample appservice project
ShilpiRach May 14, 2025
db31205
Updated the comments related to sidecar configuration
ShilpiRach May 14, 2025
23b21ab
Fixed failing AppService unit tests
ShilpiRach May 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion playground/AzureAppService/AzureAppService.AppHost/api.module.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,25 @@ param api_identity_outputs_id string

param api_identity_outputs_clientid string

resource mainContainer 'Microsoft.Web/sites/sitecontainers@2024-04-01' = {
name: 'main'
properties: {
authType: 'UserAssigned'
image: api_containerimage
isMain: true
userManagedIdentityClientId: infra_outputs_azure_container_registry_managed_identity_client_id
}
parent: webapp
}

resource webapp 'Microsoft.Web/sites@2024-04-01' = {
name: take('${toLower('api')}-${uniqueString(resourceGroup().id)}', 60)
location: location
properties: {
serverFarmId: infra_outputs_planid
keyVaultReferenceIdentity: api_identity_outputs_id
siteConfig: {
linuxFxVersion: 'DOCKER|${api_containerimage}'
linuxFxVersion: 'SITECONTAINERS'
acrUseManagedIdentityCreds: true
acrUserManagedIdentityID: infra_outputs_azure_container_registry_managed_identity_client_id
appSettings: [
Expand Down
4 changes: 2 additions & 2 deletions playground/AzureAppService/AzureAppService.AppHost/infra.module.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ resource infra_asplan 'Microsoft.Web/serverfarms@2024-04-01' = {
}
kind: 'Linux'
sku: {
name: 'B1'
tier: 'Basic'
name: 'P0V3'
tier: 'Premium'
}
}

Expand Down
4 changes: 2 additions & 2 deletions src/Aspire.Hosting.Azure.AppService/AzureAppServiceEnvironmentExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,8 @@ public static IResourceBuilder<AzureAppServiceEnvironmentResource> AddAzureAppSe
{
Sku = new AppServiceSkuDescription
{
Name = "B1",
Tier = "Basic"
Name = "P0V3",
Tier = "Premium"
},
Kind = "Linux",
IsReserved = true
Expand Down
16 changes: 15 additions & 1 deletion src/Aspire.Hosting.Azure.AppService/AzureAppServiceWebsiteContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,9 +212,10 @@ public void BuildWebSite(AzureResourceInfrastructure infra)
// Use the host name as the name of the web app
Name = HostName,
AppServicePlanId = appServicePlanParameter,
// Creating the app service with new sidecar configuration
SiteConfig = new SiteConfigProperties()
{
LinuxFxVersion = BicepFunction.Interpolate($"DOCKER|{containerImage}"),
LinuxFxVersion = "SITECONTAINERS",
AcrUserManagedIdentityId = acrClientIdParameter,
UseManagedIdentityCreds = true,
AppSettings = []
Expand All @@ -226,6 +227,19 @@ public void BuildWebSite(AzureResourceInfrastructure infra)
},
};

// Defining the main container for the app service
var mainContainer = new SiteContainer("mainContainer")
{
Parent = webSite,
Name = "main",
Image = containerImage,
AuthType = SiteContainerAuthType.UserAssigned,
UserManagedIdentityClientId = acrClientIdParameter,
IsMain = true
};

infra.Add(mainContainer);

foreach (var kv in EnvironmentVariables)
{
var (val, secretType) = ProcessValue(kv.Value);
Expand Down
13 changes: 12 additions & 1 deletion ...tainerAppEnvironmentAddsDeploymentTargetWithContainerAppToProjectResources.verified.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,24 @@ param api_containerimage string

param api_containerport string

resource mainContainer 'Microsoft.Web/sites/sitecontainers@2024-04-01' = {
name: 'main'
properties: {
authType: 'UserAssigned'
image: api_containerimage
isMain: true
userManagedIdentityClientId: env_outputs_azure_container_registry_managed_identity_client_id
}
parent: webapp
}

resource webapp 'Microsoft.Web/sites@2024-04-01' = {
name: take('${toLower('api')}-${uniqueString(resourceGroup().id)}', 60)
location: location
properties: {
serverFarmId: env_outputs_planid
siteConfig: {
linuxFxVersion: 'DOCKER|${api_containerimage}'
linuxFxVersion: 'SITECONTAINERS'
acrUseManagedIdentityCreds: true
acrUserManagedIdentityID: env_outputs_azure_container_registry_managed_identity_client_id
appSettings: [
Expand Down
6 changes: 3 additions & 3 deletions ...ots/AzureAppServiceTests.AddContainerAppEnvironmentAddsEnvironmentResource.verified.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ resource env_asplan 'Microsoft.Web/serverfarms@2024-04-01' = {
}
kind: 'Linux'
sku: {
name: 'B1'
tier: 'Basic'
name: 'P0V3'
tier: 'Premium'
}
}

Expand All @@ -51,4 +51,4 @@ output AZURE_CONTAINER_REGISTRY_ENDPOINT string = env_acr.properties.loginServer

output AZURE_CONTAINER_REGISTRY_MANAGED_IDENTITY_ID string = env_mi.id

output AZURE_CONTAINER_REGISTRY_MANAGED_IDENTITY_CLIENT_ID string = env_mi.properties.clientId
output AZURE_CONTAINER_REGISTRY_MANAGED_IDENTITY_CLIENT_ID string = env_mi.properties.clientId
13 changes: 12 additions & 1 deletion ...Snapshots/AzureAppServiceTests.EndpointReferencesAreResolvedAcrossProjects.verified.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,24 @@ param project2_containerimage string

param project2_containerport string

resource mainContainer 'Microsoft.Web/sites/sitecontainers@2024-04-01' = {
name: 'main'
properties: {
authType: 'UserAssigned'
image: project2_containerimage
isMain: true
userManagedIdentityClientId: env_outputs_azure_container_registry_managed_identity_client_id
}
parent: webapp
}

resource webapp 'Microsoft.Web/sites@2024-04-01' = {
name: take('${toLower('project2')}-${uniqueString(resourceGroup().id)}', 60)
location: location
properties: {
serverFarmId: env_outputs_planid
siteConfig: {
linuxFxVersion: 'DOCKER|${project2_containerimage}'
linuxFxVersion: 'SITECONTAINERS'
acrUseManagedIdentityCreds: true
acrUserManagedIdentityID: env_outputs_azure_container_registry_managed_identity_client_id
appSettings: [
Expand Down
13 changes: 12 additions & 1 deletion ...sting.Azure.Tests/Snapshots/AzureAppServiceTests.KeyvaultReferenceHandling.verified.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,17 @@ param api_identity_outputs_id string

param api_identity_outputs_clientid string

resource mainContainer 'Microsoft.Web/sites/sitecontainers@2024-04-01' = {
name: 'main'
properties: {
authType: 'UserAssigned'
image: api_containerimage
isMain: true
userManagedIdentityClientId: env_outputs_azure_container_registry_managed_identity_client_id
}
parent: webapp
}

resource mydb_kv_outputs_name_kv 'Microsoft.KeyVault/vaults@2023-07-01' existing = {
name: mydb_kv_outputs_name
}
Expand All @@ -33,7 +44,7 @@ resource webapp 'Microsoft.Web/sites@2024-04-01' = {
serverFarmId: env_outputs_planid
keyVaultReferenceIdentity: api_identity_outputs_id
siteConfig: {
linuxFxVersion: 'DOCKER|${api_containerimage}'
linuxFxVersion: 'SITECONTAINERS'
acrUseManagedIdentityCreds: true
acrUserManagedIdentityID: env_outputs_azure_container_registry_managed_identity_client_id
appSettings: [
Expand Down