Skip to content

Commit 8328d0d

Browse files
chore: update resources - main, staging and dev #945
chore: update resources - main, staging and dev #945 - fix if expression (it was always evaluating to truthy) - update pod resources for dev, staging and production environments - add 10 minutes timeout to deployments
1 parent f85f47f commit 8328d0d

File tree

4 files changed

+13
-17
lines changed

4 files changed

+13
-17
lines changed

.github/workflows/deploy-dev.yaml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@ on:
88
jobs:
99
deploy-dev:
1010
runs-on: ubuntu-latest
11-
if: |
12-
${{ github.event_name == 'workflow_dispatch' }}
13-
|| ${{ github.event.workflow_run.conclusion == 'success' }}
11+
if: ${{ github.event_name == 'workflow_dispatch' || github.event.workflow_run.conclusion == 'success' }}
1412
environment:
1513
name: development
1614
url: https://api.development.basedosdados.org
@@ -56,10 +54,10 @@ jobs:
5654
resources:
5755
limits:
5856
cpu: 500m
59-
memory: 4096Mi
57+
memory: 2Gi
6058
requests:
6159
cpu: 250m
62-
memory: 1536Mi
60+
memory: 1.5Gi
6361
envFrom:
6462
- secretRef:
6563
name: api-development-secrets
@@ -87,8 +85,8 @@ jobs:
8785
run: |-
8886
helm upgrade \
8987
--wait \
90-
--timeout 15m \
9188
--install \
89+
--timeout 10m \
9290
--namespace website \
9391
--values values.yaml \
9492
api-dev charts/basedosdados-api/.

.github/workflows/deploy-prod.yaml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@ on:
88
jobs:
99
deploy-prod:
1010
runs-on: ubuntu-latest
11-
if: |
12-
${{ github.event_name == 'workflow_dispatch' }}
13-
|| ${{ github.event.workflow_run.conclusion == 'success' }}
11+
if: ${{ github.event_name == 'workflow_dispatch' || github.event.workflow_run.conclusion == 'success' }}
1412
environment:
1513
name: production
1614
url: https://backend.basedosdados.org
@@ -56,10 +54,10 @@ jobs:
5654
resources:
5755
limits:
5856
cpu: 1000m
59-
memory: 1536Mi
57+
memory: 4Gi
6058
requests:
6159
cpu: 500m
62-
memory: 1024Mi
60+
memory: 2Gi
6361
envFrom:
6462
- secretRef:
6563
name: api-prod-secrets
@@ -88,6 +86,7 @@ jobs:
8886
helm upgrade \
8987
--wait \
9088
--install \
89+
--timeout 10m \
9190
--namespace website \
9291
--values values.yaml \
9392
api-prod charts/basedosdados-api/.

.github/workflows/deploy-staging.yaml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@ on:
88
jobs:
99
deploy-staging:
1010
runs-on: ubuntu-latest
11-
if: |
12-
${{ github.event_name == 'workflow_dispatch' }}
13-
|| ${{ github.event.workflow_run.conclusion == 'success' }}
11+
if: ${{ github.event_name == 'workflow_dispatch' || github.event.workflow_run.conclusion == 'success' }}
1412
environment:
1513
name: staging
1614
url: https://staging.backend.basedosdados.org
@@ -56,10 +54,10 @@ jobs:
5654
resources:
5755
limits:
5856
cpu: 500m
59-
memory: 1Gi
57+
memory: 2Gi
6058
requests:
6159
cpu: 250m
62-
memory: 500Mi
60+
memory: 1.5Gi
6361
envFrom:
6462
- secretRef:
6563
name: api-staging-secrets
@@ -88,6 +86,7 @@ jobs:
8886
helm upgrade \
8987
--wait \
9088
--install \
89+
--timeout 10m \
9190
--namespace website \
9291
--values values.yaml \
9392
api-staging charts/basedosdados-api/.

.github/workflows/release-dev.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
registry: ghcr.io
1919
username: ${{ github.repository_owner }}
2020
password: ${{ secrets.GITHUB_TOKEN }}
21-
- name: Build and push PR image
21+
- name: Build and push development tagged image
2222
uses: docker/build-push-action@v2
2323
with:
2424
context: .

0 commit comments

Comments
 (0)