Skip to content

Commit 550e0fa

Browse files
AlexanderSehrAlexanderSehr
authored
Added RG-Location to bicep registry (#839)
* Update to latest * Update to latest * Update to latest * Update to latest * Update to latest * Temp excluded publish condition to test * Update to latest * Disabled jobs * Disabled ado condition * Update to latest * Update to latest * Re-enabled original conditions & pipeline * Update to latest * Update to latest * Update to latest * Update to latest * Undid unrelated wiki changes
1 parent 1633dcd commit 550e0fa

90 files changed

Lines changed: 143 additions & 34 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.azuredevops/pipelineTemplates/module.jobs.publish.yml‎

Lines changed: 30 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -18,28 +18,29 @@
1818
##
1919
## NOTE: If you don't need to overwrite a shared value, you can IGNORE this section
2020
##
21-
## |==================================================================================================================================================================================================================|
22-
## | Parameter | Default Value | Description | Example |
23-
## |---------------------------------|--------------------------------------|-----------------------------------------------------------------------------------------------------|-----------------------------------|
24-
## | displayName | 'Publish module' | Name for the pipeline job | 'Publish KeyVault' |
25-
## | serviceConnection | '$(serviceConnection)' | The service connection that connects to Azure | 'demo-internal' |
26-
## | poolName | '$(poolName)' | You can provide either a [poolname] or [vmImage] to run the job on | 'Custom Deployment Pool' |
27-
## | vmImage | '$(vmImage)' | You can provide either a [poolname] or [vmImage] to run the job on | 'ubuntu20.04' |
28-
## | defaultJobTimeoutInMinutes | 120 | The timeout for the job in this pipeline | 120 |
29-
## | versionOption | '$(versionOption)' | The mode to handle the version increments [major|minor|patch|custom]. | 'patch' |
30-
## | moduleVersion | '$(moduleVersion)' | The version to enforce if [versionOption] is set to [custom] | '1.0.0' |
31-
## | modulePath | '$(modulePath)' | The path to the module to deploy. E.g. [c:/KeyVault] | 'c:/KeyVault' |
32-
## | templateSpecsRGName | '$(templateSpecsRGName)' | Required to publish to template spec. ResourceGroup of the template spec to publish to | 'mgmt-rg' |
33-
## | templateSpecsRGLocation | '$(templateSpecsRGLocation)' | Required to publish to template spec. Location of the template spec resource group | 'West Europe' |
34-
## | templateSpecsDescription | '$(templateSpecsDescription)' | Required to publish to template spec. Description of the template spec to publish to | 'IaCs module' |
35-
## | vstsFeedName | '$(vstsFeedName)' | Required to publish to a DevOps feed. Name to the feed to publish to. | 'modules' |
36-
## | vstsProject | '$(System.TeamProject)' | Required to publish to a DevOps feed. Name of the project hosting the artifacts feed. May be empty. | 'iacs' |
37-
## | bicepRegistryName | '$(bicepRegistryName)' | Required to publish to the private bicep registry. Name of the hosting container registry | 'adpsxxazacrx001' |
38-
## | bicepRegistryRGName | '$(bicepRegistryRGName)' | Required to publish to the private bicep registry. Resource group of the hosting container registry | 'artifacts-rg' |
39-
## | vstsOrganization | '$(vstsOrganization)' | Required to publish to a DevOps feed. Name of the organization hosting the artifacts feed. | 'servicescode' |
40-
## | azurePowerShellVersion | '$(azurePowerShellVersion)' | Used for configuring the Azure PowerShell Version, one of the example values. | 'latestVersion' or 'OtherVersion' |
41-
## | preferredAzurePowerShellVersion | '$(preferredAzurePowerShellVersion)' | Used for configuring the Azure PowerShell Version, either an empty string or specific version. | '4.4.0' |
42-
## |==================================================================================================================================================================================================================|
21+
## |======================================================================================================================================================================================================================|
22+
## | Parameter | Default Value | Description | Example |
23+
## |---------------------------------|--------------------------------------|---------------------------------------------------------------------------------------------------------|-----------------------------------|
24+
## | displayName | 'Publish module' | Name for the pipeline job | 'Publish KeyVault' |
25+
## | serviceConnection | '$(serviceConnection)' | The service connection that connects to Azure | 'demo-internal' |
26+
## | poolName | '$(poolName)' | You can provide either a [poolname] or [vmImage] to run the job on | 'Custom Deployment Pool' |
27+
## | vmImage | '$(vmImage)' | You can provide either a [poolname] or [vmImage] to run the job on | 'ubuntu20.04' |
28+
## | defaultJobTimeoutInMinutes | 120 | The timeout for the job in this pipeline | 120 |
29+
## | versionOption | '$(versionOption)' | The mode to handle the version increments [major|minor|patch|custom]. | 'patch' |
30+
## | moduleVersion | '$(moduleVersion)' | The version to enforce if [versionOption] is set to [custom] | '1.0.0' |
31+
## | modulePath | '$(modulePath)' | The path to the module to deploy. E.g. [c:/KeyVault] | 'c:/KeyVault' |
32+
## | templateSpecsRGName | '$(templateSpecsRGName)' | Required to publish to template spec. ResourceGroup of the template spec to publish to | 'mgmt-rg' |
33+
## | templateSpecsRGLocation | '$(templateSpecsRGLocation)' | Required to publish to template spec. Location of the template spec resource group | 'West Europe' |
34+
## | templateSpecsDescription | '$(templateSpecsDescription)' | Required to publish to template spec. Description of the template spec to publish to | 'IaCs module' |
35+
## | vstsFeedName | '$(vstsFeedName)' | Required to publish to a DevOps feed. Name to the feed to publish to. | 'modules' |
36+
## | vstsProject | '$(System.TeamProject)' | Required to publish to a DevOps feed. Name of the project hosting the artifacts feed. May be empty. | 'iacs' |
37+
## | bicepRegistryName | '$(bicepRegistryName)' | Required to publish to the private bicep registry. Name of the hosting container registry | 'adpsxxazacrx001' |
38+
## | bicepRegistryRGName | '$(bicepRegistryRGName)' | Required to publish to the private bicep registry. Resource group of the hosting container registry | 'artifacts-rg' |
39+
## | bicepRegistryRgLocation | '$(bicepRegistryRgLocation)' | Required to publish to the private bicep registry. Location of the RG of the hosting container registry | 'West Europe' |
40+
## | vstsOrganization | '$(vstsOrganization)' | Required to publish to a DevOps feed. Name of the organization hosting the artifacts feed. | 'servicescode' |
41+
## | azurePowerShellVersion | '$(azurePowerShellVersion)' | Used for configuring the Azure PowerShell Version, one of the example values. | 'latestVersion' or 'OtherVersion' |
42+
## | preferredAzurePowerShellVersion | '$(preferredAzurePowerShellVersion)' | Used for configuring the Azure PowerShell Version, either an empty string or specific version. | '4.4.0' |
43+
## |======================================================================================================================================================================================================================|
4344
##
4445
##---------------------------------------------##
4546

@@ -72,6 +73,7 @@ parameters:
7273
## Private-Bicep-Registry-related
7374
bicepRegistryName: '$(bicepRegistryName)'
7475
bicepRegistryRGName: '$(bicepRegistryRGName)'
76+
bicepRegistryRgLocation: '$(bicepRegistryRgLocation)'
7577

7678
##---------------------------------------------##
7779
## TEMPLATE LOGIC ##
@@ -238,11 +240,12 @@ jobs:
238240
. (Join-Path '$(System.DefaultWorkingDirectory)' '$(pipelineFunctionsPath)' 'resourcePublish' 'Publish-ModuleToPrivateBicepRegistry.ps1')
239241
240242
$functionInput = @{
241-
templateFilePath = Join-Path '$(ENVMODULEPATH)' 'deploy.bicep'
242-
bicepRegistryName = '${{ parameters.bicepRegistryName }}'
243-
bicepRegistryRgName = '${{ parameters.bicepRegistryRgName }}'
244-
customVersion = '${{ parameters.customVersion }}'
245-
versioningOption = '${{ parameters.versioningOption }}'
243+
templateFilePath = Join-Path '$(ENVMODULEPATH)' 'deploy.bicep'
244+
bicepRegistryName = '${{ parameters.bicepRegistryName }}'
245+
bicepRegistryRgName = '${{ parameters.bicepRegistryRgName }}'
246+
bicepRegistryRgLocation = '${{ parameters.bicepRegistryRgLocation }}'
247+
customVersion = '${{ parameters.customVersion }}'
248+
versioningOption = '${{ parameters.versioningOption }}'
246249
}
247250
248251
Write-Verbose "Invoke task with" -Verbose

‎.azuredevops/pipelineVariables/global.variables.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ variables:
4848
bicepRegistryDoPublish: true # Set to true, if you would like to publish module templates to a bicep registry
4949
bicepRegistryName: adpsxxazacrx001 # The name of the bicep registry (ACR) to publish to. If it does not exist, it will be created.
5050
bicepRegistryRGName: 'artifacts-rg' # The resource group that hosts the private bicep registry (ACR)
51+
bicepRegistryRgLocation: 'West Europe' # The location of the resource group to publish to
5152

5253
######################################
5354
# Azure PowerShell Version

‎.github/actions/templates/publishModule/action.yml‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,9 @@ inputs:
3030
description: 'Required to publish to private bicep registry. ResourceGroup of the container registry to publish to'
3131
required: false
3232
bicepRegistryRgName:
33+
description: 'Required to publish to private bicep registry. Name of the container registry resource group'
34+
required: false
35+
bicepRegistryRgLocation:
3336
description: 'Required to publish to private bicep registry. Location of the container registry resource group'
3437
required: false
3538
bicepRegistryDoPublish:
@@ -95,11 +98,12 @@ runs:
9598
. (Join-Path $env:GITHUB_WORKSPACE 'utilities' 'pipelines' 'resourcePublish' 'Publish-ModuleToPrivateBicepRegistry.ps1')
9699
97100
$functionInput = @{
98-
templateFilePath = Join-Path $env:GITHUB_WORKSPACE "${{ inputs.templateFilePath }}"
99-
bicepRegistryName = '${{ inputs.bicepRegistryName }}'
100-
bicepRegistryRgName = '${{ inputs.bicepRegistryRgName }}'
101-
customVersion = '${{ inputs.customVersion }}'
102-
versioningOption = '${{ inputs.versioningOption }}'
101+
templateFilePath = Join-Path $env:GITHUB_WORKSPACE "${{ inputs.templateFilePath }}"
102+
bicepRegistryName = '${{ inputs.bicepRegistryName }}'
103+
bicepRegistryRgName = '${{ inputs.bicepRegistryRgName }}'
104+
bicepRegistryRgLocation = '${{ inputs.bicepRegistryRgLocation }}'
105+
customVersion = '${{ inputs.customVersion }}'
106+
versioningOption = '${{ inputs.versioningOption }}'
103107
}
104108
105109
Write-Verbose "Invoke task with" -Verbose

‎.github/variables/global.variables.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@
3232
"name": "bicepRegistryRGName",
3333
"value": "artifacts-rg"
3434
},
35+
{
36+
"name": "bicepRegistryRgLocation",
37+
"value": "WestEurope"
38+
},
3539
{
3640
"name": "bicepRegistryDoPublish",
3741
"value": "true"

‎.github/workflows/ms.analysisservices.servers.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,4 +143,5 @@ jobs:
143143
templateSpecsDoPublish: '${{ env.templateSpecsDoPublish }}'
144144
bicepRegistryName: '${{ env.bicepRegistryName }}'
145145
bicepRegistryRGName: '${{ env.bicepRegistryRGName }}'
146+
bicepRegistryRgLocation: '${{ env.bicepRegistryRgLocation }}'
146147
bicepRegistryDoPublish: '${{ env.bicepRegistryDoPublish }}'

‎.github/workflows/ms.apimanagement.service.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,4 +143,5 @@ jobs:
143143
templateSpecsDoPublish: '${{ env.templateSpecsDoPublish }}'
144144
bicepRegistryName: '${{ env.bicepRegistryName }}'
145145
bicepRegistryRGName: '${{ env.bicepRegistryRGName }}'
146+
bicepRegistryRgLocation: '${{ env.bicepRegistryRgLocation }}'
146147
bicepRegistryDoPublish: '${{ env.bicepRegistryDoPublish }}'

‎.github/workflows/ms.authorization.policyassignments.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,4 +147,5 @@ jobs:
147147
templateSpecsDoPublish: '${{ env.templateSpecsDoPublish }}'
148148
bicepRegistryName: '${{ env.bicepRegistryName }}'
149149
bicepRegistryRGName: '${{ env.bicepRegistryRGName }}'
150+
bicepRegistryRgLocation: '${{ env.bicepRegistryRgLocation }}'
150151
bicepRegistryDoPublish: '${{ env.bicepRegistryDoPublish }}'

‎.github/workflows/ms.authorization.policydefinitions.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,4 +147,5 @@ jobs:
147147
templateSpecsDoPublish: '${{ env.templateSpecsDoPublish }}'
148148
bicepRegistryName: '${{ env.bicepRegistryName }}'
149149
bicepRegistryRGName: '${{ env.bicepRegistryRGName }}'
150+
bicepRegistryRgLocation: '${{ env.bicepRegistryRgLocation }}'
150151
bicepRegistryDoPublish: '${{ env.bicepRegistryDoPublish }}'

‎.github/workflows/ms.authorization.policyexemptions.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,4 +147,5 @@ jobs:
147147
templateSpecsDoPublish: '${{ env.templateSpecsDoPublish }}'
148148
bicepRegistryName: '${{ env.bicepRegistryName }}'
149149
bicepRegistryRGName: '${{ env.bicepRegistryRGName }}'
150+
bicepRegistryRgLocation: '${{ env.bicepRegistryRgLocation }}'
150151
bicepRegistryDoPublish: '${{ env.bicepRegistryDoPublish }}'

‎.github/workflows/ms.authorization.policysetdefinitions.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,4 +147,5 @@ jobs:
147147
templateSpecsDoPublish: '${{ env.templateSpecsDoPublish }}'
148148
bicepRegistryName: '${{ env.bicepRegistryName }}'
149149
bicepRegistryRGName: '${{ env.bicepRegistryRGName }}'
150+
bicepRegistryRgLocation: '${{ env.bicepRegistryRgLocation }}'
150151
bicepRegistryDoPublish: '${{ env.bicepRegistryDoPublish }}'

0 commit comments

Comments
 (0)