Skip to content
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

Adding managed identity settings #32009

Open
wants to merge 2 commits into
base: release-app-Microsoft.app-2025-01-01
Choose a base branch
from
Open

Adding managed identity settings #32009

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0290a28
Adding managed identity settings
vturecek Jan 6, 2025
eee8ea0
Merge branch 'release-app-Microsoft.app-2025-01-01' into 2025-01-01-i…
vturecek Jan 17, 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
28 changes: 28 additions & 0 deletions specification/app/resource-manager/Microsoft.App/stable/2025-01-01/CommonDefinitions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1253,6 +1253,34 @@
"type": "string"
}
}
},
"IdentitySettings": {
"description": "Optional settings for a Managed Identity that is assigned to the Container App.",
"type": "object",
"required": [
"identity"
],
"properties": {
"identity": {
"description": "The resource ID of a user-assigned managed identity that is assigned to the Container App, or 'system' for system-assigned identity.",
"type": "string"
},
"lifecycle": {
"description": "Use to select the lifecycle stages of a Container App during which the Managed Identity should be available.",
"enum": [
"Init",
"Main",
"None",
"All"
],
"type": "string",
"default": "All",
"x-ms-enum": {
"name": "IdentitySettingsLifeCycle",
"modelAsString": true
}
}
}
}
},
"securityDefinitions": {
Expand Down
10 changes: 10 additions & 0 deletions specification/app/resource-manager/Microsoft.App/stable/2025-01-01/ContainerApps.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -661,6 +661,16 @@
"service": {
"$ref": "#/definitions/Service",
"description": "Container App to be a dev Container App Service"
},
"identitySettings": {
"description": "Optional settings for Managed Identities that are assigned to the Container App. If a Managed Identity is not specified here, default settings will be used.",
"type": "array",
"items": {
"$ref": "./CommonDefinitions.json#/definitions/IdentitySettings"
},
"x-ms-identifiers": [
"identity"
]
}
}
},
Expand Down
10 changes: 10 additions & 0 deletions specification/app/resource-manager/Microsoft.App/stable/2025-01-01/Jobs.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -742,6 +742,16 @@
"x-ms-identifiers": [
"server"
]
},
"identitySettings": {
"description": "Optional settings for Managed Identities that are assigned to the Container App Job. If a Managed Identity is not specified here, default settings will be used.",
"type": "array",
"items": {
"$ref": "./CommonDefinitions.json#/definitions/IdentitySettings"
},
"x-ms-identifiers": [
"identity"
]
}
}
},
Expand Down
64 changes: 61 additions & 3 deletions ...source-manager/Microsoft.App/stable/2025-01-01/examples/ContainerApps_CreateOrUpdate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@
"api-version": "2025-01-01",
"containerAppEnvelope": {
"location": "East US",
"identity": {
"type": "SystemAssigned,UserAssigned",
"userAssignedIdentities": {
"/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourcegroups/rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/myidentity": {}
}
},
"properties": {
"environmentId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/rg/providers/Microsoft.App/managedEnvironments/demokube",
"workloadProfileName": "My-GP-01",
Expand Down Expand Up @@ -99,7 +105,17 @@
"java": {
"enableMetrics": true
}
}
},
"identitySettings": [
{
"identity": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourcegroups/rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/myidentity",
"lifecycle": "All"
},
{
"identity": "system",
"lifecycle": "Init"
}
]
},
"template": {
"containers": [
Expand Down Expand Up @@ -222,6 +238,17 @@
"name": "testcontainerapp0",
"type": "Microsoft.App/containerApps",
"location": "East US",
"identity": {
"type": "SystemAssigned,UserAssigned",
"principalId": "24adfa4f-dedf-8dc0-ca29-b6d1a69ab319",
"tenantId": "23adfa4f-eedf-1dc0-ba29-a6d1a69ab3d0",
"userAssignedIdentities": {
"/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourcegroups/rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/myidentity": {
"principalId": "74adfa4f-dedf-8dc0-ca29-b6d1a69ab312",
"clientId": "14adfa4f-eedf-1dc0-ba29-a6d1a69ab3df"
}
}
},
"properties": {
"provisioningState": "Succeeded",
"runningStatus": "Running",
Expand Down Expand Up @@ -286,7 +313,17 @@
"java": {
"enableMetrics": true
}
}
},
"identitySettings": [
{
"identity": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourcegroups/rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/myidentity",
"lifecycle": "All"
},
{
"identity": "system",
"lifecycle": "Init"
}
]
},
"template": {
"containers": [
Expand Down Expand Up @@ -406,6 +443,17 @@
"name": "testcontainerapp0",
"type": "Microsoft.App/containerApps",
"location": "East US",
"identity": {
"type": "SystemAssigned,UserAssigned",
"principalId": "24adfa4f-dedf-8dc0-ca29-b6d1a69ab319",
"tenantId": "23adfa4f-eedf-1dc0-ba29-a6d1a69ab3d0",
"userAssignedIdentities": {
"/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourcegroups/rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/myidentity": {
"principalId": "74adfa4f-dedf-8dc0-ca29-b6d1a69ab312",
"clientId": "14adfa4f-eedf-1dc0-ba29-a6d1a69ab3df"
}
}
},
"properties": {
"provisioningState": "InProgress",
"runningStatus": "Running",
Expand Down Expand Up @@ -439,7 +487,17 @@
"java": {
"enableMetrics": true
}
}
},
"identitySettings": [
{
"identity": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourcegroups/rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/myidentity",
"lifecycle": "All"
},
{
"identity": "system",
"lifecycle": "Init"
}
]
},
"template": {
"containers": [
Expand Down
23 changes: 22 additions & 1 deletion ...tion/app/resource-manager/Microsoft.App/stable/2025-01-01/examples/ContainerApps_Get.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,17 @@
"name": "testcontainerapp0",
"type": "Microsoft.App/containerApps",
"location": "East US",
"identity": {
"type": "SystemAssigned,UserAssigned",
"principalId": "24adfa4f-dedf-8dc0-ca29-b6d1a69ab319",
"tenantId": "23adfa4f-eedf-1dc0-ba29-a6d1a69ab3d0",
"userAssignedIdentities": {
"/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourcegroups/rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/myidentity": {
"principalId": "74adfa4f-dedf-8dc0-ca29-b6d1a69ab312",
"clientId": "14adfa4f-eedf-1dc0-ba29-a6d1a69ab3df"
}
}
},
"properties": {
"provisioningState": "Succeeded",
"runningStatus": "Running",
Expand Down Expand Up @@ -84,7 +95,17 @@
"maxInactiveRevisions": 10,
"service": {
"type": "redis"
}
},
"identitySettings": [
{
"identity": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourcegroups/rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/myidentity",
"lifecycle": "All"
},
{
"identity": "system",
"lifecycle": "Init"
}
]
},
"template": {
"containers": [
Expand Down
64 changes: 61 additions & 3 deletions ...ion/app/resource-manager/Microsoft.App/stable/2025-01-01/examples/Job_CreateorUpdate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@
"api-version": "2025-01-01",
"JobEnvelope": {
"location": "East US",
"identity": {
"type": "SystemAssigned,UserAssigned",
"userAssignedIdentities": {
"/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourcegroups/rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/myidentity": {}
}
},
"properties": {
"environmentId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/rg/providers/Microsoft.App/managedEnvironments/demokube",
"configuration": {
Expand All @@ -15,7 +21,17 @@
"replicaCompletionCount": 1,
"parallelism": 4
},
"triggerType": "Manual"
"triggerType": "Manual",
"identitySettings": [
{
"identity": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourcegroups/rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/myidentity",
"lifecycle": "All"
},
{
"identity": "system",
"lifecycle": "Init"
}
]
},
"template": {
"containers": [
Expand Down Expand Up @@ -94,6 +110,17 @@
"name": "testcontainerappsjob0",
"type": "Microsoft.App/jobs",
"location": "East US",
"identity": {
"type": "SystemAssigned,UserAssigned",
"principalId": "24adfa4f-dedf-8dc0-ca29-b6d1a69ab319",
"tenantId": "23adfa4f-eedf-1dc0-ba29-a6d1a69ab3d0",
"userAssignedIdentities": {
"/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourcegroups/rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/myidentity": {
"principalId": "74adfa4f-dedf-8dc0-ca29-b6d1a69ab312",
"clientId": "14adfa4f-eedf-1dc0-ba29-a6d1a69ab3df"
}
}
},
"properties": {
"provisioningState": "InProgress",
"environmentId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/rg/providers/Microsoft.App/managedEnvironments/demokube",
Expand All @@ -104,7 +131,17 @@
"replicaCompletionCount": 1,
"parallelism": 4
},
"triggerType": "Manual"
"triggerType": "Manual",
"identitySettings": [
{
"identity": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourcegroups/rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/myidentity",
"lifecycle": "All"
},
{
"identity": "system",
"lifecycle": "Init"
}
]
},
"template": {
"containers": [
Expand Down Expand Up @@ -189,6 +226,17 @@
"name": "testcontainerappsjob0",
"type": "Microsoft.App/jobs",
"location": "East US",
"identity": {
"type": "SystemAssigned,UserAssigned",
"principalId": "24adfa4f-dedf-8dc0-ca29-b6d1a69ab319",
"tenantId": "23adfa4f-eedf-1dc0-ba29-a6d1a69ab3d0",
"userAssignedIdentities": {
"/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourcegroups/rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/myidentity": {
"principalId": "74adfa4f-dedf-8dc0-ca29-b6d1a69ab312",
"clientId": "14adfa4f-eedf-1dc0-ba29-a6d1a69ab3df"
}
}
},
"properties": {
"provisioningState": "InProgress",
"environmentId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/rg/providers/Microsoft.App/managedEnvironments/demokube",
Expand All @@ -199,7 +247,17 @@
"replicaCompletionCount": 1,
"parallelism": 4
},
"triggerType": "Manual"
"triggerType": "Manual",
"identitySettings": [
{
"identity": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourcegroups/rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/myidentity",
"lifecycle": "All"
},
{
"identity": "system",
"lifecycle": "Init"
}
]
},
"template": {
"containers": [
Expand Down
23 changes: 22 additions & 1 deletion specification/app/resource-manager/Microsoft.App/stable/2025-01-01/examples/Job_Get.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,17 @@
"name": "testcontainerappsjob0",
"type": "Microsoft.App/jobs",
"location": "East US",
"identity": {
"type": "SystemAssigned,UserAssigned",
"principalId": "24adfa4f-dedf-8dc0-ca29-b6d1a69ab319",
"tenantId": "23adfa4f-eedf-1dc0-ba29-a6d1a69ab3d0",
"userAssignedIdentities": {
"/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourcegroups/rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/myidentity": {
"principalId": "74adfa4f-dedf-8dc0-ca29-b6d1a69ab312",
"clientId": "14adfa4f-eedf-1dc0-ba29-a6d1a69ab3df"
}
}
},
"properties": {
"provisioningState": "Succeeded",
"environmentId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/rg/providers/Microsoft.App/managedEnvironments/demokube",
Expand All @@ -23,7 +34,17 @@
"replicaCompletionCount": 1,
"parallelism": 4
},
"triggerType": "Manual"
"triggerType": "Manual",
"identitySettings": [
{
"identity": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourcegroups/rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/myidentity",
"lifecycle": "All"
},
{
"identity": "system",
"lifecycle": "Init"
}
]
},
"template": {
"containers": [
Expand Down
Loading