Skip to content

Commit bfe361c

Browse files
BaalmartBaalmart
authored
Merge pull request #2457 from airqo-platform/staging
move to production
2 parents 16e6520 + 06d2836 commit bfe361c

31 files changed

+2039
-205
lines changed

‎k8s/calibrate/values-prod.yaml

+9-15
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ service:
1919
nodePort: 30106
2020
resources:
2121
limits:
22-
cpu: 50m
22+
cpu: 100m
2323
memory: 100Mi
2424
requests:
2525
cpu: 5m
@@ -28,25 +28,19 @@ autoscaling:
2828
minReplicas: 1
2929
maxReplicas: 3
3030
targetMemoryUtilizationPercentage: 70
31-
nodeSelector: {}
31+
nodeSelector:
32+
role: control-plane
3233
tolerations: []
3334
affinity:
3435
nodeAffinity:
3536
preferredDuringSchedulingIgnoredDuringExecution:
36-
- weight: 10
37-
preference:
37+
- preference:
3838
matchExpressions:
39-
- key: node-type
40-
operator: In
41-
values:
42-
- general-purpose
43-
- weight: 1
44-
preference:
45-
matchExpressions:
46-
- key: node-type
47-
operator: In
48-
values:
49-
- high-memory
39+
- key: role
40+
operator: In
41+
values:
42+
- control-plane
43+
weight: 1
5044
app:
5145
name: airqo-calibrate-app
5246
label: airqo-calibrate-app

‎k8s/docs/values-prod.yaml

+9-9
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ ingress:
1919
enabled: false
2020
resources:
2121
limits:
22-
cpu: 50m
22+
cpu: 200m
2323
memory: 100Mi
2424
requests:
2525
cpu: 10m
@@ -28,19 +28,19 @@ autoscaling:
2828
minReplicas: 1
2929
maxReplicas: 3
3030
targetCPUUtilizationPercentage: 70
31-
nodeSelector: {}
31+
nodeSelector:
32+
role: control-plane
3233
tolerations: []
3334
affinity:
3435
nodeAffinity:
3536
preferredDuringSchedulingIgnoredDuringExecution:
36-
- weight: 10
37-
preference:
37+
- preference:
3838
matchExpressions:
39-
- key: node-type
40-
operator: In
41-
values:
42-
- general-purpose
43-
app:
39+
- key: role
40+
operator: In
41+
values:
42+
- control-plane
43+
weight: 1
4444
name: airqo-prod-docs
4545
label: airqo-prod-docs
4646
namespace: production

‎k8s/inventory/values-prod.yaml

+11-17
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,15 @@ service:
1313
port: 8000
1414
ingress:
1515
enabled: false
16-
nodeSelector: {}
16+
nodeSelector:
17+
role: control-plane
1718
torelations: {}
1819
resources:
1920
requests:
20-
cpu: 5m
21-
memory: 60Mi
21+
cpu: 10m
22+
memory: 20Mi
2223
limits:
23-
cpu: 100m
24+
cpu: 50m
2425
memory: 150Mi
2526
autoscaling:
2627
minReplicas: 1
@@ -29,20 +30,13 @@ autoscaling:
2930
affinity:
3031
nodeAffinity:
3132
preferredDuringSchedulingIgnoredDuringExecution:
32-
- weight: 10
33-
preference:
33+
- preference:
3434
matchExpressions:
35-
- key: node-type
36-
operator: In
37-
values:
38-
- general-purpose
39-
- weight: 1
40-
preference:
41-
matchExpressions:
42-
- key: node-type
43-
operator: In
44-
values:
45-
- high-memory
35+
- key: role
36+
operator: In
37+
values:
38+
- control-plane
39+
weight: 1
4640
app:
4741
name: airqo-inventory
4842
label: airqo-inventory

‎k8s/netmanager/values-prod.yaml

+7-13
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ service:
1313
port: 80
1414
ingress:
1515
enabled: false
16-
nodeSelector: {}
16+
nodeSelector:
17+
role: control-plane
1718
torelations: {}
1819
resources:
1920
requests:
@@ -24,25 +25,18 @@ resources:
2425
memory: 150Mi
2526
autoscaling:
2627
minReplicas: 1
27-
maxReplicas: 4
28+
maxReplicas: 3
2829
targetMemoryUtilizationPercentage: 70
2930
affinity:
3031
nodeAffinity:
3132
preferredDuringSchedulingIgnoredDuringExecution:
32-
- weight: 10
33-
preference:
33+
- preference:
3434
matchExpressions:
35-
- key: node-type
35+
- key: role
3636
operator: In
3737
values:
38-
- general-purpose
39-
- weight: 1
40-
preference:
41-
matchExpressions:
42-
- key: node-type
43-
operator: In
44-
values:
45-
- high-memory
38+
- control-plane
39+
weight: 1
4640
app:
4741
name: airqo-platform-frontend
4842
label: airqo-platform

‎k8s/platform/values-prod.yaml

+10-16
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ replicaCount: 1
22
image:
33
repository: eu.gcr.io/airqo-250220/airqo-next-platform
44
pullPolicy: Always
5-
tag: prod-87212ef4-1737696175
5+
tag: prod-16e65200-1739133930
66
imagePullSecrets: []
77
nameOverride: ''
88
fullnameOverride: ''
@@ -20,33 +20,27 @@ ingress:
2020
resources:
2121
limits:
2222
cpu: 200m
23-
memory: 700Mi
23+
memory: 350Mi
2424
requests:
25-
cpu: 100m
26-
memory: 250Mi
25+
cpu: 20m
26+
memory: 150Mi
2727
autoscaling:
2828
minReplicas: 1
2929
maxReplicas: 4
3030
targetCPUUtilizationPercentage: 70
31-
nodeSelector: {}
31+
nodeSelector:
32+
role: control-plane
3233
tolerations: []
3334
affinity:
3435
nodeAffinity:
3536
preferredDuringSchedulingIgnoredDuringExecution:
36-
- weight: 10
37-
preference:
37+
- preference:
3838
matchExpressions:
39-
- key: node-type
39+
- key: role
4040
operator: In
4141
values:
42-
- general-purpose
43-
- weight: 1
44-
preference:
45-
matchExpressions:
46-
- key: node-type
47-
operator: In
48-
values:
49-
- high-memory
42+
- control-plane
43+
weight: 1
5044
app:
5145
name: airqo-next-platform
5246
label: airqo-next-platform

‎k8s/platform/values-stage.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ replicaCount: 1
22
image:
33
repository: eu.gcr.io/airqo-250220/airqo-stage-next-platform
44
pullPolicy: Always
5-
tag: stage-68854d0b-1737695785
5+
tag: stage-9a7f69be-1739133857
66
imagePullSecrets: []
77
nameOverride: ''
88
fullnameOverride: ''

‎k8s/reports/values-prod.yaml

+14-20
Original file line numberDiff line numberDiff line change
@@ -13,36 +13,30 @@ service:
1313
port: 3000
1414
ingress:
1515
enabled: false
16-
nodeSelector: {}
1716
torelations: {}
1817
resources:
1918
requests:
20-
cpu: 5m
21-
memory: 60Mi
22-
limits:
23-
cpu: 100m
19+
cpu: 10m
2420
memory: 150Mi
21+
limits:
22+
cpu: 50m
23+
memory: 200Mi
2524
autoscaling:
2625
minReplicas: 1
27-
maxReplicas: 4
28-
targetMemoryUtilizationPercentage: 70
26+
maxReplicas: 3
27+
targetMemoryUtilizationPercentage: 80
28+
nodeSelector:
29+
role: control-plane
2930
affinity:
3031
nodeAffinity:
3132
preferredDuringSchedulingIgnoredDuringExecution:
32-
- weight: 10
33-
preference:
34-
matchExpressions:
35-
- key: node-type
36-
operator: In
37-
values:
38-
- general-purpose
39-
- weight: 1
40-
preference:
33+
- preference:
4134
matchExpressions:
42-
- key: node-type
43-
operator: In
44-
values:
45-
- high-memory
35+
- key: role
36+
operator: In
37+
values:
38+
- control-plane
39+
weight: 1
4640
app:
4741
name: airqo-reports
4842
label: airqo-reports

‎netmanager-app/.env.example

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
NEXT_PUBLIC_API_TOKEN=
2-
NEXT_PUBLIC_API_URL=
2+
NEXT_PUBLIC_API_URL=https://staging-analytics.airqo.net/api/v2/
33
NEXT_PUBLIC_ENV=development

0 commit comments

Comments
 (0)