Skip to content

Commit

Permalink
modified
Browse files Browse the repository at this point in the history
  • Loading branch information
davin111 committed Jul 14, 2023
1 parent 97e258c commit 86ca51e
Show file tree
Hide file tree
Showing 7 changed files with 38 additions and 20 deletions.
1 change: 0 additions & 1 deletion apps/templates/wacruit-judge-dev.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

apiVersion: argoproj.io/v1alpha1
kind: Application
metadata:
Expand Down
1 change: 0 additions & 1 deletion apps/templates/wacruit-judge.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

apiVersion: argoproj.io/v1alpha1
kind: Application
metadata:
Expand Down
15 changes: 9 additions & 6 deletions apps/wacruit-dev/wacruit-judge/wacruit-judge-server.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,17 @@ spec:
spec:
serviceAccountName: wacruit-judge-server
containers:
- image: 405906814034.dkr.ecr.ap-northeast-2.amazonaws.com/wacruit-dev/wacruit-judge-server:1
- image: 405906814034.dkr.ecr.ap-northeast-2.amazonaws.com/wacruit-dev/wacruit-judge-server:3
name: wacruit-judge-server
ports:
- containerPort: 2358
resources:
requests:
memory: 512Mi
cpu: 100m
memory: 192Mi
limits:
memory: 1Gi
cpu: 200m
memory: 192Mi
ports:
- containerPort: 2358
---
apiVersion: v1
kind: ServiceAccount
Expand Down Expand Up @@ -62,8 +64,9 @@ metadata:
spec:
gateways:
- istio-ingress/waffle-ingressgateway
- mesh
hosts:
- wacruit-judge-dev.wafflestudio.com
- wacruit-judge-api-dev.wafflestudio.com
http:
- route:
- destination:
Expand Down
8 changes: 4 additions & 4 deletions apps/wacruit-dev/wacruit-judge/wacruit-judge-worker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,18 +23,18 @@ spec:
spec:
serviceAccountName: wacruit-judge-worker
containers:
- image: 405906814034.dkr.ecr.ap-northeast-2.amazonaws.com/wacruit-dev/wacruit-judge-server:1
- image: 405906814034.dkr.ecr.ap-northeast-2.amazonaws.com/wacruit-dev/wacruit-judge-server:3
name: wacruit-judge-worker
command: ["./scripts/workers"]
securityContext:
privileged: true
resources:
requests:
cpu: 1000m
cpu: 500m
memory: 512Mi
limits:
cpu: 1000m
memory: 1Gi
cpu: 500m
memory: 512Mi
---
apiVersion: v1
kind: ServiceAccount
Expand Down
15 changes: 9 additions & 6 deletions apps/wacruit-prod/wacruit-judge/wacruit-judge-server.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
app: wacruit-judge-server
namespace: wacruit-prod
spec:
replicas: 1
replicas: 0
selector:
matchLabels:
app: wacruit-judge-server
Expand All @@ -25,13 +25,15 @@ spec:
containers:
- image: 405906814034.dkr.ecr.ap-northeast-2.amazonaws.com/wacruit-prod/wacruit-judge-server:1
name: wacruit-judge-server
ports:
- containerPort: 2358
resources:
requests:
memory: 512Mi
cpu: 200m
memory: 256Mi
limits:
memory: 1Gi
cpu: 400m
memory: 256Mi
ports:
- containerPort: 2358
---
apiVersion: v1
kind: ServiceAccount
Expand Down Expand Up @@ -62,8 +64,9 @@ metadata:
spec:
gateways:
- istio-ingress/waffle-ingressgateway
- mesh
hosts:
- wacruit-judge.wafflestudio.com
- wacruit-judge-api.wafflestudio.com
http:
- route:
- destination:
Expand Down
4 changes: 2 additions & 2 deletions apps/wacruit-prod/wacruit-judge/wacruit-judge-worker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
app: wacruit-judge-worker
namespace: wacruit-prod
spec:
replicas: 1
replicas: 0
selector:
matchLabels:
app: wacruit-judge-worker
Expand All @@ -31,7 +31,7 @@ spec:
resources:
requests:
cpu: 1000m
memory: 512Mi
memory: 1Gi
limits:
cpu: 1000m
memory: 1Gi
Expand Down
14 changes: 14 additions & 0 deletions misc/apps/namespace.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -116,3 +116,17 @@ metadata:
name: waffledotcom-prod
labels:
istio-injection: enabled
---
apiVersion: v1
kind: Namespace
metadata:
name: wacruit-dev
labels:
istio-injection: enabled
---
apiVersion: v1
kind: Namespace
metadata:
name: wacruit-prod
labels:
istio-injection: enabled

0 comments on commit 86ca51e

Please sign in to comment.