Skip to content

Commit 3a4315d

Browse files
authored
Merge pull request #145 from EventTriangle/AZ400-307
AZ400-309. Move configure AKS cluster to separate pipeline
2 parents b948703 + 8486862 commit 3a4315d

5 files changed

Lines changed: 49 additions & 54 deletions

File tree

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,4 @@ and this project adheres to [Semantic Versioning v2.0.0](https://semver.org/spec
2121
- Merge two docker builds templates for docker build and push
2222
- Add integration tests project to auth service
2323
- Create a separate powershell script for build and tag docker images
24+
- Move configure AKS cluster to separate pipeline

build/configure-aks-cluster.yml

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
#pr:
2+
# paths:
3+
# include:
4+
# - terraform
5+
# - build/terraform-plan-apply.yml
6+
# exclude:
7+
# - terraform/README.md
8+
9+
#trigger:
10+
# batch: true
11+
# branches:
12+
# include:
13+
# - docs
14+
15+
trigger: none
16+
pr: none
17+
18+
variables:
19+
- group: Azure_Terraform_Integration
20+
- group: Postgres_Rabbit_Connection_Credentials
21+
- group: Terraform_Auto_Tfvars_Json_Transform
22+
- group: AKS_Settings
23+
- group: Prefix_Library
24+
- name: System.Debug
25+
value: 'false'
26+
27+
stages:
28+
- template: templates/configure-cluster-stages.yml
29+
parameters:
30+
vmImage: ubuntu-latest
31+
environment: aks
32+
workingDirectory: $(System.DefaultWorkingDirectory)/kubernetes
33+
serviceConnection: Azure_Connection
34+
azureResourceGroup: $(library-aks-resource-group)
35+
kubernetesCluster: $(library-aks-cluster-name)
36+
namespace: 'event-triangle'
37+
rabbitMqUser: $(library-rabbitmq-user)
38+
rabbitMqPassword: $(library-rabbitmq-password)
39+
transformTargetFiles: |
40+
secrets/connection-secrets.yaml

build/templates/azure-k8s-configure-stages.yml renamed to build/templates/configure-cluster-stages.yml

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -34,19 +34,9 @@ parameters:
3434
displayName: 'RabbitMQ Password'
3535
type: string
3636

37-
- name: dependsOn
38-
displayName: 'Depends On'
39-
type: object
40-
41-
- name: condition
42-
displayName: 'Condition'
43-
type: string
44-
4537
stages:
4638
- stage: 'Configure_AKS_${{ parameters.environment }}'
4739
displayName: 'Configure_AKS_${{ parameters.environment }}'
48-
dependsOn: ${{ parameters.dependsOn }}
49-
condition: succeeded('${{ parameters.condition }}')
5040
jobs:
5141
- deployment: 'Configure_AKS_${{ parameters.environment }}'
5242
displayName: 'Configure_AKS_${{ parameters.environment }}'
@@ -115,13 +105,13 @@ stages:
115105
inputs:
116106
targetType: 'filePath'
117107
filePath: ${{ parameters.workingDirectory }}/helm-install-rabbit-mq/deploy-rabbitmq-helm.ps1
118-
arguments: '-HelmReleaseName event-rabbitmq
119-
-Namespace ${{ parameters.namespace }}
120-
-RabbitMqUsername ${{ parameters.rabbitMqUser }}
108+
arguments: '-HelmReleaseName event-rabbitmq
109+
-Namespace ${{ parameters.namespace }}
110+
-RabbitMqUsername ${{ parameters.rabbitMqUser }}
121111
-RabbitMqPassword ${{ parameters.rabbitMqPassword }}'
122112
pwsh: true
123113
workingDirectory: ${{ parameters.workingDirectory }}
124-
114+
125115
- task: PowerShell@2
126116
displayName: 'Deploy CertManager'
127117
inputs:
@@ -136,16 +126,16 @@ stages:
136126
inputs:
137127
targetType: 'filePath'
138128
filePath: ${{ parameters.workingDirectory }}/scripts/wait-deployments.ps1
139-
arguments: '-Namespace ${{ parameters.namespace }}
140-
-RabbitRelease event-rabbitmq
129+
arguments: '-Namespace ${{ parameters.namespace }}
130+
-RabbitRelease event-rabbitmq
141131
-PostgresDeployment postgresdb'
142132
pwsh: true
143133
workingDirectory: ${{ parameters.workingDirectory }}
144-
134+
145135
- task: PowerShell@2
146136
displayName: 'Print Public IPs'
147137
inputs:
148138
targetType: 'filePath'
149139
filePath: ${{ parameters.workingDirectory }}/scripts/print-ip.ps1
150140
pwsh: true
151-
workingDirectory: ${{ parameters.workingDirectory }}
141+
workingDirectory: ${{ parameters.workingDirectory }}

build/templates/docker-build-push-jobs.yml

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -125,26 +125,6 @@ jobs:
125125
projects: '${{ parameters.integrationTestsProjectPath }}'
126126
arguments: '--no-build --configuration ${{ parameters.buildConfiguration }} --collect "Code Coverage"'
127127

128-
# - bash: |
129-
# GIT_VERSION_IMAGE="${{ parameters.dockerRegistryUrl }}/${{ parameters.imageRepository }}:$(GitVersion.SemVer)"
130-
# LATEST_VERSION_IMAGE="${{ parameters.dockerRegistryUrl }}/${{ parameters.imageRepository }}:latest"
131-
# echo "GIT_VERSION_IMAGE: $GIT_VERSION_IMAGE"
132-
# echo "LATEST_VERSION_IMAGE: $LATEST_VERSION_IMAGE"
133-
#
134-
# ACR_GIT_VERSION_IMAGE="${{ parameters.acrRegistryUrl }}/${{ parameters.imageRepository }}:$(GitVersion.SemVer)"
135-
# ACR_LATEST_VERSION_IMAGE="${{ parameters.acrRegistryUrl }}/${{ parameters.imageRepository }}:latest"
136-
# echo "ACR_GIT_VERSION_IMAGE: $ACR_GIT_VERSION_IMAGE"
137-
# echo "ACR_LATEST_VERSION_IMAGE: $ACR_LATEST_VERSION_IMAGE"
138-
#
139-
# docker build --build-arg FRONT_API_URL="${{ parameters.dockerBuildParameterUrl }}" \
140-
# --build-arg VERSION=$(GitVersion.SemVer) -t "$GIT_VERSION_IMAGE" \
141-
# -f ${{ parameters.dockerfilePath }} .
142-
# docker tag "$GIT_VERSION_IMAGE" "$LATEST_VERSION_IMAGE"
143-
# docker tag "$GIT_VERSION_IMAGE" "$ACR_LATEST_VERSION_IMAGE"
144-
# docker tag "$GIT_VERSION_IMAGE" "$ACR_GIT_VERSION_IMAGE"
145-
# workingDirectory: ${{ parameters.workingDirectoryForDocker }}
146-
# displayName: 'Build Docker Image'
147-
148128
- task: PowerShell@2
149129
displayName: 'Build Docker Image'
150130
inputs:

build/terraform-create-aks-cluster.yml

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -62,19 +62,3 @@ stages:
6262
environment: 'aks'
6363
dependsOn: [ '${{ variables.planStageName }}' ]
6464
condition: ${{ variables.planStageName }}
65-
66-
- template: templates/azure-k8s-configure-stages.yml
67-
parameters:
68-
vmImage: ubuntu-latest
69-
environment: aks
70-
workingDirectory: $(System.DefaultWorkingDirectory)/kubernetes
71-
serviceConnection: Azure_Connection
72-
azureResourceGroup: $(library-aks-resource-group)
73-
kubernetesCluster: $(library-aks-cluster-name)
74-
namespace: 'event-triangle'
75-
rabbitMqUser: $(library-rabbitmq-user)
76-
rabbitMqPassword: $(library-rabbitmq-password)
77-
dependsOn: [ '${{ variables.applyStageName }}' ]
78-
condition: ${{ variables.applyStageName }}
79-
transformTargetFiles: |
80-
secrets/connection-secrets.yaml

0 commit comments

Comments
 (0)