Skip to content

Commit a31d97d

Browse files
kolosovpetrokolosovpetro
authored
Merge pull request #160 from EventTriangle/AZ400-305
AZ400-305. Event triangle spots to improve
2 parents 341158f + a693f81 commit a31d97d

51 files changed

Lines changed: 370 additions & 169 deletions

Some content is hidden

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

‎CHANGELOG.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,3 +41,8 @@ and this project adheres to [Semantic Versioning v2.0.0](https://semver.org/spec
4141
- Add SonarCloud scan to Azure DevOps PR validation
4242
- Add separate build pipelines in Azure DevOps
4343
- Split pipelines by folders: pr validation, build, infrastructure
44+
- Update Cloudflare step: add only DNS record for ingress
45+
- Add deployed project URLs to README
46+
- Platform: Change PostgeSQL to be cluster IP
47+
- Disable terraform log info
48+
- Add AKS node pool name

‎README.md‎

Lines changed: 37 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -57,36 +57,6 @@ EventTriangleAPI offers realtime communication using SignalR.
5757

5858
![./img/infrastructure_diagram.png](./img/infrastructure_diagram.png)
5959

60-
## Screenshots
61-
62-
### Transactions
63-
64-
![./img/transactions.png](./img/transactions.png)
65-
66-
### Credit Cards
67-
68-
![./img/cards.png](./img/cards.png)
69-
70-
### Deposit
71-
72-
![./img/deposit.png](./img/deposit.png)
73-
74-
### Contacts
75-
76-
![./img/contacts.png](./img/contacts.png)
77-
78-
### Support
79-
80-
![./img/support.png](./img/support.png)
81-
82-
### Tickets
83-
84-
![./img/tickets.png](./img/tickets.png)
85-
86-
### Users
87-
88-
![./img/users.png](./img/users.png)
89-
9060
## Technology stack
9161

9262
- **SDK:** `.NET 8`
@@ -109,6 +79,13 @@ EventTriangleAPI offers realtime communication using SignalR.
10979

11080
## Useful links
11181

82+
### Deployments
83+
84+
- https://auth-eventtriangle.razumovsky.me/app/transactions
85+
- https://auth-eventtriangle.razumovsky.me/swagger/index.html
86+
87+
### Management
88+
11289
- Docker: https://hub.docker.com/u/kaminome
11390
- Azure DevOps: https://dev.azure.com/EventTriangle/EventTriangleAPI
11491
- Renovate: https://developer.mend.io/github/EventTriangle/EventTriangleAPI
@@ -133,3 +110,33 @@ From `src` folder run:
133110
- `docker build --build-arg FRONT_API_URL="http://localhost:7000/" -t eventtriangle/auth:1.0 -f ./authorization/Dockerfile .`
134111
- `docker build -t eventtriangle/consumer:1.0 -f ./consumer/Dockerfile . `
135112
- `docker build -t eventtriangle/sender:1.0 -f ./sender/Dockerfile .`
113+
114+
## Screenshots
115+
116+
### Transactions
117+
118+
![./img/transactions.png](./img/transactions.png)
119+
120+
### Credit Cards
121+
122+
![./img/cards.png](./img/cards.png)
123+
124+
### Deposit
125+
126+
![./img/deposit.png](./img/deposit.png)
127+
128+
### Contacts
129+
130+
![./img/contacts.png](./img/contacts.png)
131+
132+
### Support
133+
134+
![./img/support.png](./img/support.png)
135+
136+
### Tickets
137+
138+
![./img/tickets.png](./img/tickets.png)
139+
140+
### Users
141+
142+
![./img/users.png](./img/users.png)

‎azure-pipelines/infrastructure/configure-aks-cluster.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ variables:
2626
value: 'false'
2727

2828
stages:
29-
- template: templates/configure-cluster-stages.yml
29+
- template: ../templates/configure-cluster-stages.yml
3030
parameters:
3131
vmImage: windows-latest
3232
environment: aks
33-
workingDirectory: $(System.DefaultWorkingDirectory)/kubernetes
33+
workingDirectory: $(System.DefaultWorkingDirectory)/platform
3434
serviceConnection: Azure_Connection
3535
azureResourceGroup: $(library-aks-resource-group)
3636
kubernetesCluster: $(library-aks-cluster-name)

‎azure-pipelines/infrastructure/terraform-create.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ variables:
2323
- name: System.Debug
2424
value: 'false'
2525
- name: planStageName
26-
value: "Terraform_Plan_AKS_Cluster"
26+
value: "Terraform_Plan"
2727
- name: applyStageName
28-
value: "Terraform_Apply_AKS_Cluster"
28+
value: "Terraform_Apply"
2929

3030
stages:
31-
- template: templates/terraform-plan-stages.yml
31+
- template: ../templates/terraform-plan-stages.yml
3232
parameters:
3333
stageName: ${{ variables.planStageName }}
3434
VmImage: windows-latest
@@ -45,7 +45,7 @@ stages:
4545
tenantId: $(library-tenant-id)
4646
destroy: false
4747

48-
- template: templates/terraform-apply-stages.yml
48+
- template: ../templates/terraform-apply-stages.yml
4949
parameters:
5050
stageName: ${{ variables.applyStageName }}
5151
VmImage: windows-latest

‎azure-pipelines/infrastructure/terraform-destroy.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ variables:
1818
- name: System.Debug
1919
value: 'false'
2020
- name: planStageName
21-
value: "Terraform_Plan_Destroy_AKS_Cluster"
21+
value: "Terraform_Plan_Destroy"
2222
- name: applyStageName
23-
value: "Terraform_Apply_Destroy_AKS_Cluster"
23+
value: "Terraform_Destroy"
2424

2525
stages:
26-
- template: templates/terraform-plan-stages.yml
26+
- template: ../templates/terraform-plan-stages.yml
2727
parameters:
2828
stageName: ${{ variables.planStageName }}
2929
VmImage: windows-latest
@@ -40,7 +40,7 @@ stages:
4040
tenantId: $(library-tenant-id)
4141
destroy: true
4242

43-
- template: templates/terraform-apply-stages.yml
43+
- template: ../templates/terraform-apply-stages.yml
4444
parameters:
4545
stageName: ${{ variables.applyStageName }}
4646
VmImage: windows-latest

‎azure-pipelines/pr-validation/pr-validation-auth.yml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,14 @@ pr:
77
- main
88
paths:
99
include:
10-
- build
10+
- azure-pipelines
11+
- platform
12+
- helm
13+
- cloudflare
1114
- src/authorization/EventTriangleAPI.Authorization.BusinessLogic
1215
- src/authorization/EventTriangleAPI.Authorization.Presentation
1316
- src/shared/EventTriangleAPI.Shared.Application
1417
- src/shared/EventTriangleAPI.Shared.DTO
15-
exclude:
16-
- '**/*.md'
1718

1819
variables:
1920
- name: appName
@@ -46,5 +47,5 @@ stages:
4647
shouldPushToAcr: true
4748
acrRegistryUrl: 'acrsharedd01.azurecr.io'
4849
acrServiceConnection: 'Azure_ACR_Connection'
49-
sonarCloudEnabled: true
50+
sonarCloudEnabled: false
5051
workingDirectoryForDocker: '$(System.DefaultWorkingDirectory)/src'

‎azure-pipelines/pr-validation/pr-validation-consumer.yml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,10 @@ pr:
77
- main
88
paths:
99
include:
10-
- build
10+
- azure-pipelines
11+
- platform
12+
- helm
13+
- cloudflare
1114
- src/consumer/EventTriangleAPI.Consumer.Application
1215
- src/consumer/EventTriangleAPI.Consumer.BusinessLogic
1316
- src/consumer/EventTriangleAPI.Consumer.Domain
@@ -16,8 +19,6 @@ pr:
1619
- src/consumer/EventTriangleAPI.Consumer.UnitTests
1720
- src/shared/EventTriangleAPI.Shared.Application
1821
- src/shared/EventTriangleAPI.Shared.DTO
19-
exclude:
20-
- '**/*.md'
2122

2223
variables:
2324
- name: appName

‎azure-pipelines/pr-validation/pr-validation-sender.yml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,10 @@ pr:
77
- main
88
paths:
99
include:
10-
- build
10+
- azure-pipelines
11+
- platform
12+
- helm
13+
- cloudflare
1114
- src/sender/EventTriangleAPI.Sender.Application
1215
- src/sender/EventTriangleAPI.Sender.BusinessLogic
1316
- src/sender/EventTriangleAPI.Sender.Domain
@@ -16,8 +19,6 @@ pr:
1619
- src/sender/EventTriangleAPI.Sender.UnitTests
1720
- src/shared/EventTriangleAPI.Shared.Application
1821
- src/shared/EventTriangleAPI.Shared.DTO
19-
exclude:
20-
- '**/*.md'
2122

2223
variables:
2324
- name: appName

‎azure-pipelines/templates/configure-cluster-stages.yml‎

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ stages:
100100
displayName: 'Deploy Postgres'
101101
inputs:
102102
targetType: 'inline'
103-
script: 'kubectl apply -f ./pgsql-deployment-load-balancer --namespace ${{ parameters.namespace }}'
103+
script: 'kubectl apply -f ./pgsql-deployment --namespace ${{ parameters.namespace }}'
104104
pwsh: true
105105
workingDirectory: ${{ parameters.workingDirectory }}
106106

@@ -113,17 +113,13 @@ stages:
113113
pwsh: true
114114
workingDirectory: ${{ parameters.workingDirectory }}
115115

116-
- task: PowerShell@2
117-
displayName: 'Deploy RabbitMQ'
118-
inputs:
119-
targetType: 'filePath'
120-
filePath: ${{ parameters.workingDirectory }}/helm-install-rabbit-mq/deploy-rabbitmq-helm.ps1
121-
arguments: '-HelmReleaseName event-rabbitmq
122-
-Namespace ${{ parameters.namespace }}
123-
-RabbitMqUsername ${{ parameters.rabbitMqUser }}
124-
-RabbitMqPassword ${{ parameters.rabbitMqPassword }}'
125-
pwsh: true
126-
workingDirectory: ${{ parameters.workingDirectory }}
116+
- pwsh: |
117+
kubectl apply -f "https://github.com/rabbitmq/cluster-operator/releases/latest/download/cluster-operator.yml"
118+
Write-Host "Waiting 60 sec for Operator to provision..."
119+
Start-Sleep 60
120+
kubectl apply -f ./helm-install-rabbit-mq/rabbit.yaml
121+
workingDirectory: ${{ parameters.workingDirectory }}
122+
displayName: 'Install Rabbit MQ'
127123
128124
- task: PowerShell@2
129125
displayName: 'Deploy CertManager'
@@ -167,3 +163,10 @@ stages:
167163
arguments: '-ApiToken ${{ parameters.cloudflareApiKey }} -ZoneName ${{ parameters.cloudflareZone }}'
168164
pwsh: true
169165
workingDirectory: '$(System.DefaultWorkingDirectory)/cloudflare'
166+
167+
- pwsh: |
168+
helm upgrade --install auth-app .\auth-service-chart\ --values .\auth-service-chart\values.yaml --namespace "event-triangle"
169+
helm upgrade --install consumer-app .\consumer-service-chart\ --values .\consumer-service-chart\values.yaml --namespace "event-triangle"
170+
helm upgrade --install sender-app .\sender-service-chart\ --values .\sender-service-chart\values.yaml --namespace "event-triangle"
171+
workingDirectory: $(System.DefaultWorkingDirectory)\helm
172+
displayName: Deploy Web Apps

‎azure-pipelines/templates/terraform-apply-stages.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,6 @@ stages:
7272
pool:
7373
vmImage: ${{ parameters.VmImage }}
7474
environment: ${{ parameters.environment }}
75-
variables:
76-
- name: 'TF_LOG'
77-
value: 'INFO'
7875
strategy:
7976
runOnce:
8077
deploy:

0 commit comments

Comments
 (0)