Skip to content

Commit

Permalink
[WAL-5938] Switch mastermind from uwsgi to gunicorn
Browse files Browse the repository at this point in the history
  • Loading branch information
Sergei Zaiaev authored and livenson committed Oct 13, 2023
1 parent b2a42a4 commit 6418fa5
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 21 deletions.
8 changes: 4 additions & 4 deletions locust-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ image:

master:
config:
target-host: "http://waldur-mastermind-api.default.svc.cluster.local:8080"
locust-host: "http://waldur-mastermind-api.default.svc.cluster.local:8080"
target-host: "http://waldur-mastermind-api.default.svc.cluster.local:80"
locust-host: "http://waldur-mastermind-api.default.svc.cluster.local:80"
locust-mode-master: true
locust-locustfile: "/locust-tasks/tasks.py"


worker:
config:
worker:
config:
configmapName: "locust-tasks-config"
locust-mode-worker: true
locust-locustfile: "/locust-tasks/tasks.py"
Expand Down
8 changes: 4 additions & 4 deletions waldur/templates/deployment-api.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,20 +34,20 @@ spec:
exec:
command:
- pgrep
- uwsgi
initialDelaySeconds: 5 # it takes around 5 sec to spawn UWSGI processes
- gunicorn
initialDelaySeconds: 5 # it takes around 5 sec to spawn Gunicorn processes
periodSeconds: 5
failureThreshold: 5
readinessProbe:
httpGet:
port: 8080
port: 80
path: /api/configuration/
initialDelaySeconds: 50 # it takes around a minute to completely start UWSGI server
periodSeconds: 10
failureThreshold: 100 # Mastermind can wait long for DB migrations
ports:
- name: http
containerPort: 8080
containerPort: 80
protocol: TCP
env:
{{- include "waldur.credentials" . | nindent 13 }}
Expand Down
2 changes: 1 addition & 1 deletion waldur/templates/deployment-metrics-exporter.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ spec:
protocol: TCP
env:
- name: WALDUR_API_URL
value: "http://waldur-mastermind-api:8080/api/"
value: "http://waldur-mastermind-api:80/api/"
- name: WALDUR_API_TOKEN
valueFrom:
secretKeyRef:
Expand Down
4 changes: 2 additions & 2 deletions waldur/templates/deployment-uvk-everypay.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ spec:
imagePullPolicy: {{ .Values.waldur.pullPolicy }}
env:
- name: WALDUR_API_URL
value: "http://waldur-mastermind-api:8080/api/"
value: "http://waldur-mastermind-api:80/api/"
- name: WALDUR_API_TOKEN
valueFrom:
secretKeyRef:
Expand Down Expand Up @@ -73,7 +73,7 @@ spec:
protocol: TCP
env:
- name: WALDUR_API_URL
value: "http://waldur-mastermind-api:8080/api/"
value: "http://waldur-mastermind-api:80/api/"
- name: WALDUR_URL
value: "{{ .Values.homeportScheme }}://{{ .Values.homeportHostname }}"
- name: WALDUR_API_TOKEN
Expand Down
18 changes: 9 additions & 9 deletions waldur/templates/ingress-api.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,57 +28,57 @@ spec:
service:
name: waldur-mastermind-api
port:
number: 8080
number: 80
- path: /api-auth
pathType: Prefix
backend:
service:
name: waldur-mastermind-api
port:
number: 8080
number: 80
- path: /docs
pathType: Prefix
backend:
service:
name: waldur-mastermind-api
port:
number: 8080
number: 80
- path: /admin
pathType: Prefix
backend:
service:
name: waldur-mastermind-api
port:
number: 8080
number: 80
- path: /static
pathType: Prefix
backend:
service:
name: waldur-mastermind-api
port:
number: 8080
number: 80
- path: /apidocs
pathType: Prefix
backend:
service:
name: waldur-mastermind-api
port:
number: 8080
number: 80
- path: /media
pathType: Prefix
backend:
service:
name: waldur-mastermind-api
port:
number: 8080
number: 80
- path: /health-check
pathType: Prefix
backend:
service:
name: waldur-mastermind-api
port:
number: 8080
{{ if and .Values.ingress.tls.enabled }}
number: 80
{{ if .Values.ingress.tls.enabled }}
tls:
- hosts:
- {{ .Values.apiHostname }}
Expand Down
2 changes: 1 addition & 1 deletion waldur/templates/service-api.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
spec:
type: ClusterIP
ports:
- port: 8080
- port: 80
targetPort: http
protocol: TCP
name: http
Expand Down

0 comments on commit 6418fa5

Please sign in to comment.