Skip to content

feat: replace alz-prerequisites deployment script sleep with ARM retryOn for policy assignments #2153

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

Draft
Copilot wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

feat: replace alz-prerequisites deployment script sleep with ARM retryOn for policy assignments #2153

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
e70c888
feat: replace alz-prerequisites 15-min sleep with retryOn in policy a…
Copilot Apr 14, 2026
2a15ced
feat: completely remove alz-prerequisites deployment, rely on retryOn…
Copilot Apr 15, 2026
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
39 changes: 0 additions & 39 deletions eslzArm/eslz-portal.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1064,42 +1064,6 @@
]
},
"visible": "[equals(steps('management').enableAsc,'Yes')]"
},
{
"name": "alzPreReqRgCustomName",
"type": "Microsoft.Common.TextBox",
"label": "ALZ prerequisite resource group name",
"toolTip": "Name for the Azure Landing Zone prerequisite resource group",
"defaultValue": "rg-alz-prereq-prod",
"visible": "[equals(steps('core').namingConvention, 'custom')]",
"constraints": {
"regex": "^[a-zA-Z0-9][a-zA-Z0-9-_.()]{0,89}[a-zA-Z0-9_]$",
"validationMessage": "Resource group name must be 1-90 characters long and can contain alphanumeric characters, hyphens, underscores, periods, and parentheses. Cannot start or end with period."
}
},
{
"name": "alzPreReqUAMICustomName",
"type": "Microsoft.Common.TextBox",
"label": "ALZ prerequisite User Assigned Identity name",
"toolTip": "Name for the Azure Landing Zone prerequisite User Assigned Managed Identity",
"defaultValue": "id-alz-prereq-prod",
"visible": "[equals(steps('core').namingConvention, 'custom')]",
"constraints": {
"regex": "^[a-zA-Z0-9][a-zA-Z0-9-_.]{0,126}[a-zA-Z0-9_]$",
"validationMessage": "User Assigned Identity name must be 3-128 characters long and can contain alphanumeric characters, hyphens, underscores, and periods."
}
},
{
"name": "alzPreReqScriptCustomName",
"type": "Microsoft.Common.TextBox",
"label": "ALZ prerequisite script name",
"toolTip": "Name for the Azure Landing Zone prerequisite deployment script",
"defaultValue": "script-alz-prereq-prod",
"visible": "[equals(steps('core').namingConvention, 'custom')]",
"constraints": {
"regex": "^[a-zA-Z0-9][a-zA-Z0-9-_.]{0,88}[a-zA-Z0-9_]$",
"validationMessage": "Deployment script name must be 2-90 characters long and can contain alphanumeric characters, hyphens, underscores, and periods."
}
}
]
},
Expand Down Expand Up @@ -11129,9 +11093,6 @@
"azFwPolicyNameSecondary": "[steps('connectivity').esNetworkSecondarySubSection.azFwPolicySecondaryCustomName]",
"routeTableName": "[steps('connectivity').routeTableCustomName]",
"routeTableNameSecondary": "[steps('connectivity').esNetworkSecondarySubSection.routeTableSecondaryCustomName]",
"alzPreReqRg": "[steps('management').alzPreReqRgCustomName]",
"alzPreReqUAMIName": "[steps('management').alzPreReqUAMICustomName]",
"alzPreReqScriptName": "[steps('management').alzPreReqScriptCustomName]",
"avnmName": "[steps('connectivity').avnmCustomName]",
"avnmRgName": "[steps('connectivity').avnmRgCustomName]",
"avnmUserAssignedIdentityName": "[steps('connectivity').avnmUserAssignedIdentityCustomName]",
Expand Down
232 changes: 50 additions & 182 deletions eslzArm/eslzArm.json
View file
Open in desktop

Large diffs are not rendered by default.

13 changes: 9 additions & 4 deletions eslzArm/managementGroupTemplates/policyAssignments/AUDIT-AppGwWafPolicyAssignment.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"$schema": "https://schema.management.azure.com/schemas/2019-08-01/managementGroupDeploymentTemplate.json#",
"languageVersion": "2.0",
"contentVersion": "1.0.0.0",
"parameters": {
"policyEffect": {
Expand Down Expand Up @@ -40,8 +41,8 @@
"DoNotEnforce": "should"
}
},
"resources": [
{
"resources": {
"policyAssignment": {
"type": "Microsoft.Authorization/policyAssignments",
"apiVersion": "2024-04-01",
"name": "[variables('policyAssignmentNames').auditWAF]",
Expand All @@ -61,8 +62,12 @@
"value": "[parameters('policyEffect')]"
}
}
},
"retryOn": {
"count": 6,
"interval": "PT5M"
}
}
],
},
"outputs": {}
}
}
11 changes: 8 additions & 3 deletions eslzArm/managementGroupTemplates/policyAssignments/AUDIT-PeDnsZonesPolicyAssignment.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"$schema": "https://schema.management.azure.com/schemas/2019-08-01/managementGroupDeploymentTemplate.json#",
"languageVersion": "2.0",
"contentVersion": "1.0.0.0",
"parameters": {
"topLevelManagementGroupPrefix": {
Expand Down Expand Up @@ -118,8 +119,8 @@
"DoNotEnforce": "should"
}
},
"resources": [
{
"resources": {
"policyAssignment": {
"type": "Microsoft.Authorization/policyAssignments",
"apiVersion": "2022-06-01",
"name": "[variables('policyAssignmentNames').auditPeDnsZones]",
Expand All @@ -141,8 +142,12 @@
"value": "[parameters('policyEffect')]"
}
}
},
"retryOn": {
"count": 6,
"interval": "PT5M"
}
}
],
},
"outputs": {}
}
16 changes: 10 additions & 6 deletions .../managementGroupTemplates/policyAssignments/AUDIT-ResourceRGLocationPolicyAssignment.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"$schema": "https://schema.management.azure.com/schemas/2019-08-01/managementGroupDeploymentTemplate.json#",
"languageVersion": "2.0",
"contentVersion": "1.0.0.0",
"parameters": {
"enforcementMode": {
Expand Down Expand Up @@ -31,8 +32,8 @@
"DoNotEnforce": "should"
}
},
"resources": [
{
"resources": {
"policyAssignment": {
"type": "Microsoft.Authorization/policyAssignments",
"apiVersion": "2024-04-01",
"name": "[variables('policyAssignmentNames').auditRGL]",
Expand All @@ -47,10 +48,13 @@
"message": "[replace(variables('nonComplianceMessage').message, parameters('nonComplianceMessagePlaceholder'), variables('nonComplianceMessage')[parameters('enforcementMode')])]"
}
],
"parameters": {
}
"parameters": {}
},
"retryOn": {
"count": 6,
"interval": "PT5M"
}
}
],
},
"outputs": {}
}
}
13 changes: 9 additions & 4 deletions eslzArm/managementGroupTemplates/policyAssignments/AUDIT-TrustedLaunchPolicyAssignment.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"$schema": "https://schema.management.azure.com/schemas/2019-08-01/managementGroupDeploymentTemplate.json#",
"languageVersion": "2.0",
"contentVersion": "1.0.0.0",
"parameters": {
"topLevelManagementGroupPrefix": {
Expand All @@ -26,7 +27,7 @@
"Disabled",
"Audit"
],
"defaultValue": "Audit"
"defaultValue": "Audit"
}
},
"variables": {
Expand All @@ -44,8 +45,8 @@
"DoNotEnforce": "should"
}
},
"resources": [
{
"resources": {
"policyAssignment": {
"type": "Microsoft.Authorization/policyAssignments",
"apiVersion": "2022-06-01",
"name": "[variables('policyAssignmentNames').trustedLaunch]",
Expand All @@ -65,8 +66,12 @@
"value": "[parameters('effect')]"
}
}
},
"retryOn": {
"count": 6,
"interval": "PT5M"
}
}
],
},
"outputs": {}
}
17 changes: 11 additions & 6 deletions ...Arm/managementGroupTemplates/policyAssignments/AUDIT-UnusedResourcesPolicyAssignment.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"$schema": "https://schema.management.azure.com/schemas/2019-08-01/managementGroupDeploymentTemplate.json#",
"languageVersion": "2.0",
"contentVersion": "1.0.0.0",
"parameters": {
"topLevelManagementGroupPrefix": {
Expand All @@ -26,23 +27,23 @@
"Disabled",
"Audit"
],
"defaultValue": "Audit"
"defaultValue": "Audit"
},
"effectPublicIpAddresses": {
"type": "string",
"allowedValues": [
"Disabled",
"Audit"
],
"defaultValue": "Audit"
"defaultValue": "Audit"
},
"effectServerFarms": {
"type": "string",
"allowedValues": [
"Disabled",
"Audit"
],
"defaultValue": "Audit"
"defaultValue": "Audit"
}
},
"variables": {
Expand All @@ -60,8 +61,8 @@
"DoNotEnforce": "should"
}
},
"resources": [
{
"resources": {
"policyAssignment": {
"type": "Microsoft.Authorization/policyAssignments",
"apiVersion": "2022-06-01",
"name": "[variables('policyAssignmentNames').costOptimization]",
Expand All @@ -87,8 +88,12 @@
"value": "[parameters('effectServerFarms')]"
}
}
},
"retryOn": {
"count": 6,
"interval": "PT5M"
}
}
],
},
"outputs": {}
}
13 changes: 9 additions & 4 deletions eslzArm/managementGroupTemplates/policyAssignments/AUDIT-ZoneResilientPolicyAssignment.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"$schema": "https://schema.management.azure.com/schemas/2019-08-01/managementGroupDeploymentTemplate.json#",
"languageVersion": "2.0",
"contentVersion": "1.0.0.0",
"parameters": {
"effect": {
Expand Down Expand Up @@ -49,8 +50,8 @@
"DoNotEnforce": "should"
}
},
"resources": [
{
"resources": {
"policyAssignment": {
"type": "Microsoft.Authorization/policyAssignments",
"apiVersion": "2024-04-01",
"name": "[variables('policyAssignmentNames').auditZR]",
Expand All @@ -73,8 +74,12 @@
"value": "[parameters('allow')]"
}
}
},
"retryOn": {
"count": 6,
"interval": "PT5M"
}
}
],
},
"outputs": {}
}
}
13 changes: 9 additions & 4 deletions ...rm/managementGroupTemplates/policyAssignments/DENY-AksPrivEscalationPolicyAssignment.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"$schema": "https://schema.management.azure.com/schemas/2019-08-01/managementGroupDeploymentTemplate.json#",
"languageVersion": "2.0",
"contentVersion": "1.0.0.0",
"parameters": {
"enforcementMode": {
Expand All @@ -22,8 +23,8 @@
"displayName": "Kubernetes clusters should not allow container privilege escalation"
}
},
"resources": [
{
"resources": {
"policyAssignment": {
"type": "Microsoft.Authorization/policyAssignments",
"apiVersion": "2024-04-01",
"name": "[variables('policyAssignmentNames').denyAksNoPrivEsc]",
Expand All @@ -38,8 +39,12 @@
"value": "Deny"
}
}
},
"retryOn": {
"count": 6,
"interval": "PT5M"
}
}
],
},
"outputs": {}
}
}
11 changes: 8 additions & 3 deletions eslzArm/managementGroupTemplates/policyAssignments/DENY-AksPrivilegedPolicyAssignment.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"$schema": "https://schema.management.azure.com/schemas/2019-08-01/tenantDeploymentTemplate.json#",
"languageVersion": "2.0",
"contentVersion": "1.0.0.0",
"parameters": {
"enforcementMode": {
Expand All @@ -22,8 +23,8 @@
"displayName": "Kubernetes cluster should not allow privileged containers"
}
},
"resources": [
{
"resources": {
"policyAssignment": {
"type": "Microsoft.Authorization/policyAssignments",
"apiVersion": "2024-04-01",
"name": "[variables('policyAssignmentNames').denyAksPriv]",
Expand All @@ -38,8 +39,12 @@
"value": "Deny"
}
}
},
"retryOn": {
"count": 6,
"interval": "PT5M"
}
}
],
},
"outputs": {}
}
13 changes: 9 additions & 4 deletions eslzArm/managementGroupTemplates/policyAssignments/DENY-AksWithoutHttpsPolicyAssignment.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"$schema": "https://schema.management.azure.com/schemas/2019-08-01/managementGroupDeploymentTemplate.json#",
"languageVersion": "2.0",
"contentVersion": "1.0.0.0",
"parameters": {
"enforcementMode": {
Expand All @@ -22,8 +23,8 @@
"displayName": "Kubernetes clusters should be accessible only over HTTPS"
}
},
"resources": [
{
"resources": {
"policyAssignment": {
"type": "Microsoft.Authorization/policyAssignments",
"apiVersion": "2024-04-01",
"name": "[variables('policyAssignmentNames').denyHttpIngressAks]",
Expand All @@ -38,8 +39,12 @@
"value": "Deny"
}
}
},
"retryOn": {
"count": 6,
"interval": "PT5M"
}
}
],
},
"outputs": {}
}
}
Loading
Loading