Skip to content

Commit 5fab1e7

Browse files
authored
Merge pull request #43472 from github/repo-sync
Repo sync
2 parents 4a132e2 + 5c31596 commit 5fab1e7

File tree

5 files changed

+120
-20
lines changed

5 files changed

+120
-20
lines changed

config/kubernetes/default/deployments/webapp.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ apiVersion: apps/v1
22
kind: Deployment
33
metadata:
44
name: webapp
5+
annotations:
6+
moda.github.net/inject-unified-service-tag-env-var: docs-internal
57
spec:
68
replicas: 1
79
selector:

config/kubernetes/production/deployments/webapp.yaml

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,14 @@ metadata:
44
name: webapp
55
annotations:
66
moda.github.net/allow-missing-ready-pods: '1'
7+
moda.github.net/inject-unified-service-tag-env-var: docs-internal
78
spec:
8-
replicas: 6
9+
replicas: 12
10+
strategy:
11+
type: RollingUpdate
12+
rollingUpdate:
13+
maxUnavailable: 1
14+
maxSurge: 2
915
selector:
1016
matchLabels:
1117
app: webapp
@@ -27,17 +33,17 @@ spec:
2733
image: docs-internal
2834
resources:
2935
requests:
30-
cpu: 2500m
36+
cpu: 1250m
3137
# Absolute minimum to start app is 1000m
3238
# Node is single-threaded but we want more CPUs
3339
# for OS and image resizing, and other binary executions
3440
# Better to increase replicas or memory than CPU
35-
memory: 16.0Gi
41+
memory: 8.0Gi
3642
# Absolute minimum to start app is 4500Mi
3743
# Would increase with more pages, versions, or languages supported
3844
# The additional memory helps during traffic surges
3945
limits:
40-
cpu: 16000m
46+
cpu: 8000m
4147
memory: 16.0Gi
4248
ports:
4349
- name: http

0 commit comments

Comments
 (0)