diff options
| author | Nick Thomas <nick@gitlab.com> | 2019-04-30 13:07:09 +0000 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2019-04-30 13:07:09 +0000 |
| commit | ac2c2be97f1a0647630646ebf1e25f9bb0fb5ac9 (patch) | |
| tree | 8210b36f2248ba836b820c0537d2f91e827db18e | |
| parent | 0ed961a81a526e105ac3a6fe74b797183674d591 (diff) | |
| parent | 84103e2d2f2668053c09e7fc225610005dfaa3f7 (diff) | |
| download | gitlab-ce-ac2c2be97f1a0647630646ebf1e25f9bb0fb5ac9.tar.gz | |
Merge branch 'disable-http-for-review-apps' into 'master'
Disable HTTP for the nginx-ingress Review App service
See merge request gitlab-org/gitlab-ce!27884
| -rwxr-xr-x | scripts/review_apps/review-apps.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/scripts/review_apps/review-apps.sh b/scripts/review_apps/review-apps.sh index 8be22dc0278..9455e462617 100755 --- a/scripts/review_apps/review-apps.sh +++ b/scripts/review_apps/review-apps.sh @@ -216,6 +216,7 @@ HELM_CMD=$(cat << EOF --set global.ingress.configureCertmanager=false \ --set global.ingress.tls.secretName=tls-cert \ --set global.ingress.annotations."external-dns\.alpha\.kubernetes\.io/ttl"="10" + --set nginx-ingress.controller.service.enableHttp=false \ --set nginx-ingress.defaultBackend.resources.requests.memory=7Mi \ --set nginx-ingress.controller.resources.requests.memory=440M \ --set nginx-ingress.controller.replicaCount=2 \ |