Commit f32119b2 authored by Lin Jen-Shin's avatar Lin Jen-Shin

Merge branch 'update-nginx-ingress-config' into 'master'

Update nginx-ingress components replica count from 2 to 1

See merge request gitlab-org/gitlab!26609
parents 2cf113b5 a492d5f2
...@@ -111,7 +111,6 @@ nginx-ingress: ...@@ -111,7 +111,6 @@ nginx-ingress:
controller: controller:
config: config:
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
replicaCount: 2
resources: resources:
requests: requests:
cpu: 100m cpu: 100m
...@@ -119,7 +118,6 @@ nginx-ingress: ...@@ -119,7 +118,6 @@ nginx-ingress:
limits: limits:
cpu: 200m cpu: 200m
memory: 675M memory: 675M
minAvailable: 1
service: service:
enableHttp: false enableHttp: false
livenessProbe: livenessProbe:
...@@ -134,7 +132,6 @@ nginx-ingress: ...@@ -134,7 +132,6 @@ nginx-ingress:
limits: limits:
cpu: 10m cpu: 10m
memory: 24M memory: 24M
replicaCount: 1
postgresql: postgresql:
metrics: metrics:
enabled: false enabled: 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