Skip to content

Commit

Permalink
Dasd 8310 add building blocks (#156)
Browse files Browse the repository at this point in the history
* Added template for managed identity

* Added helm-upgrade-template step template

* Added Environment param to arm-deploy

* Added PublicIpAddressId to pip output

* Modified arm-deploy steps to optional deploy to resource group

* Copied app-gateway-v2 building block from dfc-devops

* Removed identity from app-gateway-v2

* Made userAssignedIdentityName param optional

* Updated apiVersion

* Removed userAssignedIdentityName param and properties that depended on it

* Allows urlPathMaps to be empty array

* Made defaultPathMap properties conditional on required params

* Made requestRoutingRules properties conditional on required params

* Changed condition for urlPathMaps & requestRoutingRules properties

* Revert commits allowing empty backendPools, backendHttpSettings & routingRules

This reverts commit 868bcc7
db791c6
907e5ba
928ea1a

* Deleted helm-upgrade-template step template

* Changed name of output value

* Replaced subnetRef with it's consituent parts

* Removed unneeded values from tier variable

* Deleted managed-identity building block

* Added userAssignedIdentity back in

* Renamed publicIpAddressId param

* Update templates/app-gateway-v2.json

* Reordered parameters

* Parameterised ssl policy

* Removed storage option for logs, refactored OMS option

* Updated apiVersion for diagnosticSettings

* Removed tier variable

Co-authored-by: jack-education <[email protected]>
  • Loading branch information
NickGraham101 and CloudPlatformer authored Dec 3, 2020
1 parent 45e0fcd commit 8159e72
Show file tree
Hide file tree
Showing 3 changed files with 392 additions and 2 deletions.
9 changes: 7 additions & 2 deletions azure-pipelines-templates/deploy/step/arm-deploy.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
parameters:
Environment:
Location:
ParametersPath:
ServiceConnection:
SubscriptionId:
TemplatePath:
IsMultiRepoCheckout: false
ResourceGroupName: ''
Scope: Subscription
TemplateSecrets: {}

steps:
Expand All @@ -25,16 +28,18 @@ steps:
- task: AzureResourceManagerTemplateDeployment@3
displayName: Azure Subscription Deployment - Create/Tag resource group and deploy resources
inputs:
deploymentScope: Subscription
deploymentScope: ${{ parameters.Scope }}
ConnectedServiceName: ${{ parameters.ServiceConnection }}
${{ if eq(parameters.Scope, 'Resource Group') }}:
resourceGroupName: ${{ parameters.ResourceGroupName }}
subscriptionId: ${{ parameters.SubscriptionId }}
location: ${{ parameters.Location }}
csmFile: ${{ parameters.TemplatePath }}
csmParametersFile: ${{ parameters.ParametersPath }}
deploymentOutputs: ARMOutput

- task: PowerShell@2
name: ArmOutputs
name: ArmOutputs${{ parameters.Environment }}
displayName: Convert ARM Template Outputs to Variables
inputs:
${{ if eq(parameters.IsMultiRepoCheckout, false) }}:
Expand Down
Loading

0 comments on commit 8159e72

Please sign in to comment.