Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

TECH-2410 #22

Merged
merged 16 commits into from
Nov 7, 2023
Merged

TECH-2410 #22

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
4f28991
Merge pull request #17 from makerdao/TECH-1771
OleksandrUA Jul 14, 2023
d065cab
TECH-1902 - Triggering deployment
OleksandrUA Jul 20, 2023
52088be
Triggering GHA on Staging
OleksandrUA Aug 7, 2023
9d5d912
Triggering GHA on Staging - 2
OleksandrUA Aug 7, 2023
ec97165
Chaing CHart repo URL as GH Org got renamed
OleksandrUA Aug 7, 2023
46c8e50
TECH-2080 - Deploying Chainlog-Staging to USE2 cluster
OleksandrUA Aug 30, 2023
0f7119b
TECH-2080 - Removing temporary branch
OleksandrUA Aug 31, 2023
e6219b1
Merge pull request #20 from makerdao/TECH-2080
OleksandrUA Aug 31, 2023
a7d6ab9
TECH-2410 - 1) Updating images to newest version; 2) Moving Chainlog-…
OleksandrUA Nov 7, 2023
4e428f5
Merge pull request #21 from makerdao/TECH-2410
OleksandrUA Nov 7, 2023
7d1ffac
Update .github/workflows/aws-staging.yaml
OleksandrUA Nov 7, 2023
bb79e8b
Update .github/workflows/aws-staging.yaml
OleksandrUA Nov 7, 2023
ea08567
Update .github/workflows/aws-prod.yaml
OleksandrUA Nov 7, 2023
811d955
Update .github/workflows/aws-prod.yaml
OleksandrUA Nov 7, 2023
3e483de
Merge branch 'main' into dev
OleksandrUA Nov 7, 2023
62461f1
TECH-2410 - With usage of Helm Chart version 0.0.19 these values are …
OleksandrUA Nov 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/aws-prod.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,11 +87,11 @@ jobs:
values: image.repository=${{ steps.login-ecr.outputs.registry }}/chainlog-ui-prod,image.tag=${{ steps.vars.outputs.sha_short }}
cluster-name: ${{ env.CLUSTER_NAME }}
config-files: deploy/prod/chainlog-ui.yaml
chart-path: makerops/common
chart-path: techops-services/common
namespace: chainlog
timeout: 5m0s
name: chainlog-ui
chart-repository: https://makerops.github.io/helm-charts
chart-repository: https://techops-services.github.io/helm-charts
version: 0.0.10
OleksandrUA marked this conversation as resolved.
Show resolved Hide resolved
atomic: true

Expand All @@ -101,11 +101,11 @@ jobs:
values: image.repository=${{ steps.login-ecr.outputs.registry }}/chainlog-logger-prod,image.tag=${{ steps.vars.outputs.sha_short }}
cluster-name: ${{ env.CLUSTER_NAME }}
config-files: deploy/prod/chainlog-logger.yaml
chart-path: makerops/common
chart-path: techops-services/common
namespace: chainlog
timeout: 5m0s
name: chainlog-logger
chart-repository: https://makerops.github.io/helm-charts
chart-repository: https://techops-services.github.io/helm-charts
version: 0.0.10
OleksandrUA marked this conversation as resolved.
Show resolved Hide resolved
atomic: true

10 changes: 5 additions & 5 deletions .github/workflows/aws-staging.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest
environment: staging
env:
AWS_REGION: eu-central-1
AWS_REGION: us-east-2
CLUSTER_NAME: maker-staging

steps:
Expand Down Expand Up @@ -87,11 +87,11 @@ jobs:
values: image.repository=${{ steps.login-ecr.outputs.registry }}/chainlog-ui-staging,image.tag=${{ steps.vars.outputs.sha_short }}
cluster-name: ${{ env.CLUSTER_NAME }}
config-files: deploy/staging/chainlog-ui.yaml
chart-path: makerops/common
chart-path: techops-services/common
namespace: chainlog
timeout: 5m0s
name: chainlog-ui
chart-repository: https://makerops.github.io/helm-charts
chart-repository: https://techops-services.github.io/helm-charts
version: 0.0.10
OleksandrUA marked this conversation as resolved.
Show resolved Hide resolved
atomic: true

Expand All @@ -101,11 +101,11 @@ jobs:
values: image.repository=${{ steps.login-ecr.outputs.registry }}/chainlog-logger-staging,image.tag=${{ steps.vars.outputs.sha_short }}
cluster-name: ${{ env.CLUSTER_NAME }}
config-files: deploy/staging/chainlog-logger.yaml
chart-path: makerops/common
chart-path: techops-services/common
namespace: chainlog
timeout: 5m0s
name: chainlog-logger
chart-repository: https://makerops.github.io/helm-charts
chart-repository: https://techops-services.github.io/helm-charts
version: 0.0.10
OleksandrUA marked this conversation as resolved.
Show resolved Hide resolved
atomic: true

2 changes: 1 addition & 1 deletion Dockerfile.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM nginx:1.21
FROM nginx:1.25

COPY api.html \
index.html \
Expand Down
6 changes: 3 additions & 3 deletions deploy/prod/chainlog-logger.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
replicaCount: 1
service:
name: chainlog-logger
port: 8080
enabled: false
type: ClusterIP
containerPort: 8080
tls:
enabled: false
deployment:
enabled: true
image:
repository: ${ECR_REGISTRY}/chainlog-logger-prod
pullPolicy: Always
Expand Down
17 changes: 10 additions & 7 deletions deploy/prod/chainlog-ui.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
replicaCount: 1
replicaCount: 2
service:
enabled: true
name: chainlog-ui
port: 80
port: 8080
type: ClusterIP
containerPort: 80
containerPort: 8080
tls:
enabled: true
issuerName: cloudflare
deployment:
enabled: true
image:
repository: ${ECR_REGISTRY}/chainlog-ui-prod
pullPolicy: Always
Expand All @@ -29,8 +32,8 @@ resources:
memory: 256Mi
autoscaling:
enabled: true
minReplicas: 1
maxReplicas: 2
minReplicas: 2
maxReplicas: 3
targetCPUUtilizationPercentage: 80
targetMemoryUtilizationPercentage: 60
env:
Expand All @@ -39,7 +42,7 @@ env:
value: "localhost"
readinessProbe:
tcpSocket:
port: 80
port: 8080
livenessProbe:
tcpSocket:
port: 80
port: 8080
6 changes: 3 additions & 3 deletions deploy/staging/chainlog-logger.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
replicaCount: 1
service:
name: chainlog-logger
port: 8080
enabled: false
type: ClusterIP
containerPort: 8080
tls:
enabled: false
deployment:
enabled: true
image:
repository: ${ECR_REGISTRY}/chainlog-logger-staging
pullPolicy: IfNotPresent
Expand Down
11 changes: 7 additions & 4 deletions deploy/staging/chainlog-ui.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
replicaCount: 1
service:
enabled: true
name: chainlog-ui
port: 80
port: 8080
type: ClusterIP
containerPort: 80
containerPort: 8080
tls:
enabled: true
issuerName: cloudflare
deployment:
enabled: true
image:
repository: ${ECR_REGISTRY}/chainlog-ui-staging
pullPolicy: IfNotPresent
Expand Down Expand Up @@ -39,7 +42,7 @@ env:
value: "localhost"
readinessProbe:
tcpSocket:
port: 80
port: 8080
livenessProbe:
tcpSocket:
port: 80
port: 8080
2 changes: 1 addition & 1 deletion docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ services:
environment:
CHECKSUM_CONTAINER_NAME: checksum
ports:
- "0.0.0.0:8080:80/tcp"
- "0.0.0.0:8080:8080/tcp"
volumes:
- ./api:/usr/share/nginx/html/api
logger:
Expand Down
4 changes: 2 additions & 2 deletions nginx/nginx.conf.template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
server {
listen 80;
listen [::]:80;
listen 8080;
listen [::]:8080;
server_name localhost;

location / {
Expand Down
Loading