(chore): performance boosts for when running on low resources

minds/templates/configMap.yaml

@@ -168,7 +168,7 @@ data:
  // Cassandra configuration
  $CONFIG->cassandra = (object) [
  'keyspace' => '{{ .Values.cassandra.keyspace }}',
- {{- if .Values.deployCassandra }}
+ {{- if .Values.cassandra.deploy }}
  'servers' => [ '{{ .Release.Name }}-cassandra' ],
  'cql_servers' => [ '{{ .Release.Name }}-cassandra' ],
  {{- else }}
@@ -188,8 +188,13 @@ data:
 
  // Redis configuration
  $CONFIG->redis = [
+ {{- if .Values.redis.deploy }}
  'master' => '{{ .Release.Name }}-redis',
  'slave' => '{{ .Release.Name }}-redis'
+ {{- else }}
+ 'master' => 'redis-master',
+ 'slave' => 'redis-slave'
+ {{- end }}
  ];
 
  // RabbitMQ configuration

minds/templates/deployment-app.yaml

@@ -36,7 +36,7 @@ spec:
  initialDelaySeconds: 10
  timeoutSeconds: 5
  resources:
- {{- toYaml .Values.resources | nindent 12 }}
+ {{- toYaml .Values.phpfpm.resources | nindent 12 }}
  volumeMounts:
  - name: front
  mountPath: /var/www/Minds/front
@@ -60,7 +60,7 @@ spec:
  containerPort: 80
  protocol: TCP
  resources:
- {{- toYaml .Values.resources | nindent 12 }}
+ {{- toYaml .Values.nginx.resources | nindent 12 }}
  volumeMounts:
  - name: front
  mountPath: /var/www/Minds/front

minds/values.yaml

@@ -8,8 +8,28 @@ phpfpm:
  tag: latest
  pullPolicy: Always
  replicas: 1
- max_children: 50 #500 on production
+ max_children: 5 #500 on production
  max_requests: 200 #20000 on production
+ resources:
+ limits:
+ memory: 512Mi
+ cpu: 600m
+ requests:
+ cpu: 200m
+ memory: 256Mi
+ 
+nginx:
+ image:
+ repository: nginx
+ tag: 1.13-alpine
+ pullPolicy: IfNotPresent
+ replicas: 1
+ worker_connections: 40 # 20000 in production
+ resources:
+ limits:
+ cpu: 400m
+ requests:
+ cpu: 200m
 
 runners:
  image:
@@ -22,14 +42,6 @@ runners:
  memory: 256Mi
  cpu: 200m
 
-nginx:
- image:
- repository: nginx
- tag: 1.13-alpine
- pullPolicy: IfNotPresent
- replicas: 1
- worker_connections: 50 # 20000 in production
-
 frontInit:
  image:
  repository: registry.gitlab.com/minds/front/front-init
@@ -62,8 +74,6 @@ ingress:
 loadbalancer: 
  enabled: false
 
-resources: {}
-
 nodeSelector: {}
 
 tolerations: []
@@ -117,6 +127,10 @@ rabbitmq:
  rabbitmq:
  username: 'user'
  password: 'guest'
+ resources:
+ limits:
+ memory: 256Mi
+ cpu: 200m
 
 # CockroachDB
 cockroachdb: