diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-14 21:06:24 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-14 21:06:24 +0300 |
commit | 8c30d396c5a789080345303330069981aa06e4af (patch) | |
tree | 6fd96c7c80bec2f1101af34d749ada58e59b38ee /scripts | |
parent | 429d1abad29d379d8bc8f5219eb72384ad485deb (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/review_apps/base-config.yaml | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/scripts/review_apps/base-config.yaml b/scripts/review_apps/base-config.yaml index e839ccc2417..de5e14af4d4 100644 --- a/scripts/review_apps/base-config.yaml +++ b/scripts/review_apps/base-config.yaml @@ -67,6 +67,11 @@ gitlab: limits: cpu: 1.2G memory: 2.8G + deployment: + readinessProbe: + initialDelaySeconds: 5 # Default is 0 + periodSeconds: 15 # Default is 10 + timeoutSeconds: 5 # Default is 2 workhorse: resources: requests: @@ -75,6 +80,10 @@ gitlab: limits: cpu: 200m memory: 200M + readinessProbe: + initialDelaySeconds: 5 # Default is 0 + periodSeconds: 15 # Default is 10 + timeoutSeconds: 5 # Default is 2 gitlab-runner: resources: requests: |