diff --git a/.github/workflows/aws-prod.yaml b/.github/workflows/aws-prod.yaml index 1a62101..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 @@ -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 diff --git a/.github/workflows/aws-staging.yaml b/.github/workflows/aws-staging.yaml index 8a4c594..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 @@ -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 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..9583cbc 100644 --- a/deploy/prod/chainlog-logger.yaml +++ b/deploy/prod/chainlog-logger.yaml @@ -1,11 +1,8 @@ replicaCount: 1 service: - name: chainlog-logger - port: 8080 - type: ClusterIP - containerPort: 8080 - tls: - enabled: false + 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..b36b0e6 100644 --- a/deploy/staging/chainlog-logger.yaml +++ b/deploy/staging/chainlog-logger.yaml @@ -1,11 +1,8 @@ replicaCount: 1 service: - name: chainlog-logger - port: 8080 - type: ClusterIP - containerPort: 8080 - tls: - enabled: false + 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 / {