Skip to content

Commit

Permalink
workflow change
Browse files Browse the repository at this point in the history
  • Loading branch information
dante-mat committed Oct 24, 2024
1 parent 7dab7cf commit da3ca92
Show file tree
Hide file tree
Showing 14 changed files with 30 additions and 29 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/datacenterMap.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
"BACKEND_EMEA_TEST": {
"HUB": "EMEA",
"STAGE": "TEST",
"AWS_ACCOUNT": "<<ACCOUNT_ID>>",
"AWS_ACCOUNT": "<<605134466559>>",
"PROFILE": "backend-test",
"REGION": "eu-central-1",
"CLUSTER_NAME": "backend-ecs-test",
Expand All @@ -55,7 +55,7 @@ jobs:
"BACKEND_US_TEST": {
"HUB": "US",
"STAGE": "TEST",
"AWS_ACCOUNT": "<<ACCOUNT_ID>>",
"AWS_ACCOUNT": "<<605134466559>>",
"PROFILE": "backend-test",
"REGION": "us-east-1",
"CLUSTER_NAME": "backend-ecs-test",
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/provisionWithTerraform.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
name: Provision with Terraform
run-name: Provision with Terraform


on:
workflow_dispatch:
inputs:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ To do it, go to:
and click on Fork button and then (+) Create new fork.
After forking repository to your account, please clone it to your local machine and search for all occurrences of:
* <<ACCOUNT_ID>>
* <<605134466559>>
This is base AWS account id that we use for the base repository.
You must replace this with your own account id in all files.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"family": "backend-task-test",
"executionRoleArn": "arn:aws:iam::<<ACCOUNT_ID>>:role/backend-ecs-execution-role-eu-central-1",
"executionRoleArn": "arn:aws:iam::<<605134466559>>:role/backend-ecs-execution-role-eu-central-1",
"containerDefinitions": [
{
"logConfiguration": {
Expand Down Expand Up @@ -47,7 +47,7 @@
"cpu": 1024,
"memory": 2048,
"memoryReservation": 1024,
"image": "<<ACCOUNT_ID>>.dkr.ecr.eu-central-1.amazonaws.com/backend:latest",
"image": "<<605134466559>>.dkr.ecr.eu-central-1.amazonaws.com/backend:latest",
"dockerLabels": {
"PROMETHEUS_EXPORTER_PORT": "8081",
"PROMETHEUS_EXPORTER_PATH": "/backend/status/v1/prometheus",
Expand All @@ -57,7 +57,7 @@
"name": "backend"
}
],
"taskRoleArn": "arn:aws:iam::<<ACCOUNT_ID>>:role/backend-ecs-task-role-eu-central-1",
"taskRoleArn": "arn:aws:iam::<<605134466559>>:role/backend-ecs-task-role-eu-central-1",
"requiresCompatibilities": [
"FARGATE"
],
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"family": "backend-task-test",
"executionRoleArn": "arn:aws:iam::<<ACCOUNT_ID>>:role/backend-ecs-execution-role-us-east-1",
"executionRoleArn": "arn:aws:iam::<<605134466559>>:role/backend-ecs-execution-role-us-east-1",
"containerDefinitions": [
{
"logConfiguration": {
Expand Down Expand Up @@ -47,7 +47,7 @@
"cpu": 1024,
"memory": 2048,
"memoryReservation": 1024,
"image": "<<ACCOUNT_ID>>.dkr.ecr.us-east-1.amazonaws.com/backend:latest",
"image": "<<605134466559>>.dkr.ecr.us-east-1.amazonaws.com/backend:latest",
"dockerLabels": {
"PROMETHEUS_EXPORTER_PORT": "8081",
"PROMETHEUS_EXPORTER_PATH": "/backend/status/v1/prometheus",
Expand Down
6 changes: 3 additions & 3 deletions aws-infrastructure/docker-elasticsearch/README.md
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
# Push image to ECR
Run below commands to push our custom Elasticsearch image to ECR.
```
aws ecr get-login-password --region eu-central-1 --profile backend-test | docker login --username AWS --password-stdin <<ACCOUNT_ID>>.dkr.ecr.eu-central-1.amazonaws.com
aws ecr get-login-password --region eu-central-1 --profile backend-test | docker login --username AWS --password-stdin <<605134466559>>.dkr.ecr.eu-central-1.amazonaws.com
```

```
docker build -t elasticsearch-custom .
```

```
docker tag elasticsearch-custom <<ACCOUNT_ID>>.dkr.ecr.eu-central-1.amazonaws.com/monitoring:elasticsearch
docker tag elasticsearch-custom <<605134466559>>.dkr.ecr.eu-central-1.amazonaws.com/monitoring:elasticsearch
```

```
docker push <<ACCOUNT_ID>>.dkr.ecr.eu-central-1.amazonaws.com/monitoring:elasticsearch
docker push <<605134466559>>.dkr.ecr.eu-central-1.amazonaws.com/monitoring:elasticsearch
```
6 changes: 3 additions & 3 deletions aws-infrastructure/docker-filebeat/README.md
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
# Push image to ECR
Run below commands to push our custom Filebeat image to ECR.
```
aws ecr get-login-password --region eu-central-1 --profile backend-test | docker login --username AWS --password-stdin <<ACCOUNT_ID>>.dkr.ecr.eu-central-1.amazonaws.com
aws ecr get-login-password --region eu-central-1 --profile backend-test | docker login --username AWS --password-stdin <<605134466559>>.dkr.ecr.eu-central-1.amazonaws.com
```

```
docker build -t filebeat-custom .
```

```
docker tag filebeat-custom <<ACCOUNT_ID>>.dkr.ecr.eu-central-1.amazonaws.com/monitoring:filebeat
docker tag filebeat-custom <<605134466559>>.dkr.ecr.eu-central-1.amazonaws.com/monitoring:filebeat
```

```
docker push <<ACCOUNT_ID>>.dkr.ecr.eu-central-1.amazonaws.com/monitoring:filebeat
docker push <<605134466559>>.dkr.ecr.eu-central-1.amazonaws.com/monitoring:filebeat
```
2 changes: 1 addition & 1 deletion aws-infrastructure/docker-filebeat/filebeat.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
filebeat.inputs:
- type: aws-cloudwatch
log_group_arn: arn:aws:logs:eu-central-1:<<ACCOUNT_ID>>:log-group:/ecs/backend:*
log_group_arn: arn:aws:logs:eu-central-1:<<605134466559>>:log-group:/ecs/backend:*
scan_frequency: 1m
start_position: beginning

Expand Down
6 changes: 3 additions & 3 deletions aws-infrastructure/docker-grafana/README.md
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
# Push image to ECR
Run below commands to push our custom Grafana image to ECR.
```
aws ecr get-login-password --region eu-central-1 --profile backend-test | docker login --username AWS --password-stdin <<ACCOUNT_ID>>.dkr.ecr.eu-central-1.amazonaws.com
aws ecr get-login-password --region eu-central-1 --profile backend-test | docker login --username AWS --password-stdin <<605134466559>>.dkr.ecr.eu-central-1.amazonaws.com
```

```
docker build -t grafana-custom .
```

```
docker tag grafana-custom <<ACCOUNT_ID>>.dkr.ecr.eu-central-1.amazonaws.com/monitoring:grafana
docker tag grafana-custom <<605134466559>>.dkr.ecr.eu-central-1.amazonaws.com/monitoring:grafana
```

```
docker push <<ACCOUNT_ID>>.dkr.ecr.eu-central-1.amazonaws.com/monitoring:grafana
docker push <<605134466559>>.dkr.ecr.eu-central-1.amazonaws.com/monitoring:grafana
```
6 changes: 3 additions & 3 deletions aws-infrastructure/docker-kibana/README.md
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
# Push image to ECR
Run below commands to push our custom Kibana image to ECR.
```
aws ecr get-login-password --region eu-central-1 --profile backend-test | docker login --username AWS --password-stdin <<ACCOUNT_ID>>.dkr.ecr.eu-central-1.amazonaws.com
aws ecr get-login-password --region eu-central-1 --profile backend-test | docker login --username AWS --password-stdin <<605134466559>>.dkr.ecr.eu-central-1.amazonaws.com
```

```
docker build -t kibana-custom .
```

```
docker tag kibana-custom <<ACCOUNT_ID>>.dkr.ecr.eu-central-1.amazonaws.com/monitoring:kibana
docker tag kibana-custom <<605134466559>>.dkr.ecr.eu-central-1.amazonaws.com/monitoring:kibana
```

```
docker push <<ACCOUNT_ID>>.dkr.ecr.eu-central-1.amazonaws.com/monitoring:kibana
docker push <<605134466559>>.dkr.ecr.eu-central-1.amazonaws.com/monitoring:kibana
```
6 changes: 3 additions & 3 deletions aws-infrastructure/docker-prometheus/README.md
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
# Push image to ECR
Run below commands to push our custom Prometheus image to ECR.
```
aws ecr get-login-password --region eu-central-1 --profile backend-test | docker login --username AWS --password-stdin <<ACCOUNT_ID>>.dkr.ecr.eu-central-1.amazonaws.com
aws ecr get-login-password --region eu-central-1 --profile backend-test | docker login --username AWS --password-stdin <<605134466559>>.dkr.ecr.eu-central-1.amazonaws.com
```

```
docker build -t prometheus-custom .
```

```
docker tag prometheus-custom <<ACCOUNT_ID>>.dkr.ecr.eu-central-1.amazonaws.com/monitoring:prometheus
docker tag prometheus-custom <<605134466559>>.dkr.ecr.eu-central-1.amazonaws.com/monitoring:prometheus
```

```
docker push <<ACCOUNT_ID>>.dkr.ecr.eu-central-1.amazonaws.com/monitoring:prometheus
docker push <<605134466559>>.dkr.ecr.eu-central-1.amazonaws.com/monitoring:prometheus
```
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ output "hub" {
}

output "account_id" {
value = "<<ACCOUNT_ID>>"
value = "<<605134466559>>"
}

output "availability_zones" {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ output "hub" {
}

output "account_id" {
value = "<<ACCOUNT_ID>>"
value = "<<605134466559>>"
}

output "availability_zones" {
Expand Down
6 changes: 3 additions & 3 deletions loadtest/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,19 +42,19 @@ mvn clean install
3. Dockerize load test app and push to ECR

```
aws ecr get-login-password --region eu-central-1 --profile [PROFILE] | docker login --username AWS --password-stdin <<ACCOUNT_ID>>.dkr.ecr.eu-central-1.amazonaws.com
aws ecr get-login-password --region eu-central-1 --profile [PROFILE] | docker login --username AWS --password-stdin <<605134466559>>.dkr.ecr.eu-central-1.amazonaws.com
```

```
docker build -t backend-loadtest .
```

```
docker tag backend-loadtest:latest <<ACCOUNT_ID>>.dkr.ecr.eu-central-1.amazonaws.com/backend-loadtest:latest
docker tag backend-loadtest:latest <<605134466559>>.dkr.ecr.eu-central-1.amazonaws.com/backend-loadtest:latest
```

```
docker push <<ACCOUNT_ID>>.dkr.ecr.eu-central-1.amazonaws.com/backend-loadtest:latest
docker push <<605134466559>>.dkr.ecr.eu-central-1.amazonaws.com/backend-loadtest:latest
```

4. Force new service deployment in backend-loadtest cluster
Expand Down

0 comments on commit da3ca92

Please sign in to comment.