From d065cab36d981fc6cb9ad4c417b5c32c8439eb7c Mon Sep 17 00:00:00 2001 From: Oleksandr Tsurenko Date: Thu, 20 Jul 2023 19:50:22 +0200 Subject: [PATCH 01/12] TECH-1902 - Triggering deployment From 52088be3f5799f66d1acdff1cca294d7b0000887 Mon Sep 17 00:00:00 2001 From: Oleksandr Tsurenko Date: Mon, 7 Aug 2023 14:49:14 +0200 Subject: [PATCH 02/12] Triggering GHA on Staging From 9d5d91235bcc1b8c152c655cf5d1aeb917450cd8 Mon Sep 17 00:00:00 2001 From: Oleksandr Tsurenko Date: Mon, 7 Aug 2023 15:31:31 +0200 Subject: [PATCH 03/12] Triggering GHA on Staging - 2 From ec9716597be4a443b45883507fa2689b04aff321 Mon Sep 17 00:00:00 2001 From: Oleksandr Tsurenko Date: Mon, 7 Aug 2023 16:47:30 +0200 Subject: [PATCH 04/12] Chaing CHart repo URL as GH Org got renamed --- .github/workflows/aws-prod.yaml | 8 ++++---- .github/workflows/aws-staging.yaml | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/aws-prod.yaml b/.github/workflows/aws-prod.yaml index ca72a9a..1a62101 100644 --- a/.github/workflows/aws-prod.yaml +++ b/.github/workflows/aws-prod.yaml @@ -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 atomic: true @@ -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 atomic: true diff --git a/.github/workflows/aws-staging.yaml b/.github/workflows/aws-staging.yaml index ecd612f..b6aac4e 100644 --- a/.github/workflows/aws-staging.yaml +++ b/.github/workflows/aws-staging.yaml @@ -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 atomic: true @@ -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 atomic: true From 46c8e50e26f0228a4014252b4f3ecefabbe8f676 Mon Sep 17 00:00:00 2001 From: Oleksandr Tsurenko Date: Wed, 30 Aug 2023 14:17:19 +0200 Subject: [PATCH 05/12] TECH-2080 - Deploying Chainlog-Staging to USE2 cluster --- .github/workflows/aws-staging.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/aws-staging.yaml b/.github/workflows/aws-staging.yaml index b6aac4e..ccaaef0 100644 --- a/.github/workflows/aws-staging.yaml +++ b/.github/workflows/aws-staging.yaml @@ -2,6 +2,7 @@ on: push: branches: - dev + - TECH-2080 name: Deploy to AWS Staging (K8s) @@ -11,7 +12,7 @@ jobs: runs-on: ubuntu-latest environment: staging env: - AWS_REGION: eu-central-1 + AWS_REGION: us-east-2 CLUSTER_NAME: maker-staging steps: From 0f7119b4273ad4e49817bf2fcfb9afceb1e379cb Mon Sep 17 00:00:00 2001 From: Oleksandr Tsurenko Date: Thu, 31 Aug 2023 09:37:42 +0200 Subject: [PATCH 06/12] TECH-2080 - Removing temporary branch --- .github/workflows/aws-staging.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/aws-staging.yaml b/.github/workflows/aws-staging.yaml index ccaaef0..8a4c594 100644 --- a/.github/workflows/aws-staging.yaml +++ b/.github/workflows/aws-staging.yaml @@ -2,7 +2,6 @@ on: push: branches: - dev - - TECH-2080 name: Deploy to AWS Staging (K8s) From a7d6ab962b4c3fc9a336f93d159a20575a63a5b4 Mon Sep 17 00:00:00 2001 From: Oleksandr Tsurenko Date: Tue, 7 Nov 2023 14:36:23 +0100 Subject: [PATCH 07/12] TECH-2410 - 1) Updating images to newest version; 2) Moving Chainlog-UI to port 8080 as current one (80) can't be handled properly with Ingress Controller --- Dockerfile.ui | 2 +- deploy/prod/chainlog-logger.yaml | 6 +++--- deploy/prod/chainlog-ui.yaml | 17 ++++++++++------- deploy/staging/chainlog-logger.yaml | 6 +++--- deploy/staging/chainlog-ui.yaml | 11 +++++++---- docker-compose.yml | 2 +- nginx/nginx.conf.template | 4 ++-- 7 files changed, 27 insertions(+), 21 deletions(-) diff --git a/Dockerfile.ui b/Dockerfile.ui index 9edaba5..3173311 100644 --- a/Dockerfile.ui +++ b/Dockerfile.ui @@ -1,4 +1,4 @@ -FROM nginx:1.21 +FROM nginx:1.25 COPY api.html \ index.html \ diff --git a/deploy/prod/chainlog-logger.yaml b/deploy/prod/chainlog-logger.yaml index cff84df..d55d0ec 100644 --- a/deploy/prod/chainlog-logger.yaml +++ b/deploy/prod/chainlog-logger.yaml @@ -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 diff --git a/deploy/prod/chainlog-ui.yaml b/deploy/prod/chainlog-ui.yaml index a34b781..5794fbb 100644 --- a/deploy/prod/chainlog-ui.yaml +++ b/deploy/prod/chainlog-ui.yaml @@ -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 @@ -29,8 +32,8 @@ resources: memory: 256Mi autoscaling: enabled: true - minReplicas: 1 - maxReplicas: 2 + minReplicas: 2 + maxReplicas: 3 targetCPUUtilizationPercentage: 80 targetMemoryUtilizationPercentage: 60 env: @@ -39,7 +42,7 @@ env: value: "localhost" readinessProbe: tcpSocket: - port: 80 + port: 8080 livenessProbe: tcpSocket: - port: 80 + port: 8080 diff --git a/deploy/staging/chainlog-logger.yaml b/deploy/staging/chainlog-logger.yaml index 4a0667d..9d0d805 100644 --- a/deploy/staging/chainlog-logger.yaml +++ b/deploy/staging/chainlog-logger.yaml @@ -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 diff --git a/deploy/staging/chainlog-ui.yaml b/deploy/staging/chainlog-ui.yaml index e06d0a1..e6aad8b 100644 --- a/deploy/staging/chainlog-ui.yaml +++ b/deploy/staging/chainlog-ui.yaml @@ -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 @@ -39,7 +42,7 @@ env: value: "localhost" readinessProbe: tcpSocket: - port: 80 + port: 8080 livenessProbe: tcpSocket: - port: 80 + port: 8080 diff --git a/docker-compose.yml b/docker-compose.yml index 20ffd16..b5e8568 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -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: diff --git a/nginx/nginx.conf.template b/nginx/nginx.conf.template index 20b63d8..5734d39 100644 --- a/nginx/nginx.conf.template +++ b/nginx/nginx.conf.template @@ -1,6 +1,6 @@ server { - listen 80; - listen [::]:80; + listen 8080; + listen [::]:8080; server_name localhost; location / { From 7d1ffac935b9d0ba5a4900166efa975cc424a28b Mon Sep 17 00:00:00 2001 From: Sasha Tsurenko Date: Tue, 7 Nov 2023 15:45:08 +0100 Subject: [PATCH 08/12] Update .github/workflows/aws-staging.yaml Co-authored-by: Santiago Botto --- .github/workflows/aws-staging.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/aws-staging.yaml b/.github/workflows/aws-staging.yaml index 8a4c594..fc1044f 100644 --- a/.github/workflows/aws-staging.yaml +++ b/.github/workflows/aws-staging.yaml @@ -106,6 +106,6 @@ jobs: timeout: 5m0s name: chainlog-logger chart-repository: https://techops-services.github.io/helm-charts - version: 0.0.10 + version: 0.0.19 atomic: true From bb79e8b4d055fb0a57c2cd31eeab553a0e6f00d3 Mon Sep 17 00:00:00 2001 From: Sasha Tsurenko Date: Tue, 7 Nov 2023 15:45:13 +0100 Subject: [PATCH 09/12] Update .github/workflows/aws-staging.yaml Co-authored-by: Santiago Botto --- .github/workflows/aws-staging.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/aws-staging.yaml b/.github/workflows/aws-staging.yaml index fc1044f..7d38e32 100644 --- a/.github/workflows/aws-staging.yaml +++ b/.github/workflows/aws-staging.yaml @@ -92,7 +92,7 @@ jobs: timeout: 5m0s name: chainlog-ui chart-repository: https://techops-services.github.io/helm-charts - version: 0.0.10 + version: 0.0.19 atomic: true - name: Deploying Chainlog Logger to Kubernetes with Helm From ea0856765ef78041f7bdf946126bafc288e1e98b Mon Sep 17 00:00:00 2001 From: Sasha Tsurenko Date: Tue, 7 Nov 2023 15:45:18 +0100 Subject: [PATCH 10/12] Update .github/workflows/aws-prod.yaml Co-authored-by: Santiago Botto --- .github/workflows/aws-prod.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/aws-prod.yaml b/.github/workflows/aws-prod.yaml index 1a62101..60638e9 100644 --- a/.github/workflows/aws-prod.yaml +++ b/.github/workflows/aws-prod.yaml @@ -106,6 +106,6 @@ jobs: timeout: 5m0s name: chainlog-logger chart-repository: https://techops-services.github.io/helm-charts - version: 0.0.10 + version: 0.0.19 atomic: true From 811d955105395d04c6f5d9cf4f64f2fe401ea5e9 Mon Sep 17 00:00:00 2001 From: Sasha Tsurenko Date: Tue, 7 Nov 2023 15:46:20 +0100 Subject: [PATCH 11/12] Update .github/workflows/aws-prod.yaml Co-authored-by: Santiago Botto --- .github/workflows/aws-prod.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/aws-prod.yaml b/.github/workflows/aws-prod.yaml index 60638e9..d9c0cf4 100644 --- a/.github/workflows/aws-prod.yaml +++ b/.github/workflows/aws-prod.yaml @@ -92,7 +92,7 @@ jobs: timeout: 5m0s name: chainlog-ui chart-repository: https://techops-services.github.io/helm-charts - version: 0.0.10 + version: 0.0.19 atomic: true - name: Deploying Chainlog Logger to Kubernetes with Helm From 62461f1c3e66d24a81ebeedab04e2c7a9ae0cb31 Mon Sep 17 00:00:00 2001 From: Oleksandr Tsurenko Date: Tue, 7 Nov 2023 15:50:54 +0100 Subject: [PATCH 12/12] TECH-2410 - With usage of Helm Chart version 0.0.19 these values are no longer needed --- deploy/prod/chainlog-logger.yaml | 3 --- deploy/staging/chainlog-logger.yaml | 3 --- 2 files changed, 6 deletions(-) diff --git a/deploy/prod/chainlog-logger.yaml b/deploy/prod/chainlog-logger.yaml index d55d0ec..9583cbc 100644 --- a/deploy/prod/chainlog-logger.yaml +++ b/deploy/prod/chainlog-logger.yaml @@ -1,9 +1,6 @@ replicaCount: 1 service: enabled: false - type: ClusterIP - tls: - enabled: false deployment: enabled: true image: diff --git a/deploy/staging/chainlog-logger.yaml b/deploy/staging/chainlog-logger.yaml index 9d0d805..b36b0e6 100644 --- a/deploy/staging/chainlog-logger.yaml +++ b/deploy/staging/chainlog-logger.yaml @@ -1,9 +1,6 @@ replicaCount: 1 service: enabled: false - type: ClusterIP - tls: - enabled: false deployment: enabled: true image: