Skip to content

G
gitlab-ce
Commit 310c85f8 authored by Rémy Coutable's avatar Rémy Coutable
Browse files
Options

Merge branch 'alberts-gitlab-master-patch-91581' into 'master' 

Increase nginx-ingress-controller CPU

See merge request gitlab-org/gitlab!62665
parents 4b53d41e 58c83e57
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
scripts/review_apps/base-config.yaml
View file @ 310c85f8
...@@ -113,10 +113,10 @@ nginx-ingress: ...@@ -113,10 +113,10 @@ nginx-ingress:
ssl-ciphers: ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA:ECDHE-RSA-AES128-SHA:AES256-GCM-SHA384:AES128-GCM-SHA256:AES256-SHA256:AES128-SHA256:AES256-SHA:AES128-SHA:!aNULL:!eNULL:!EXPORT:!DES:!MD5:!PSK:!RC4 ssl-ciphers: ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA:ECDHE-RSA-AES128-SHA:AES256-GCM-SHA384:AES128-GCM-SHA256:AES256-SHA256:AES128-SHA256:AES256-SHA:AES128-SHA:!aNULL:!eNULL:!EXPORT:!DES:!MD5:!PSK:!RC4
resources: resources:
requests: requests:
cpu: 100m cpu: 300m
memory: 450M memory: 450M
limits: limits:
cpu: 200m cpu: 600m
memory: 675M memory: 675M
service: service:
enableHttp: false enableHttp: false
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7