Commit 717ef5a7 authored by GitLab Bot's avatar GitLab Bot

Automatic merge of gitlab-org/gitlab-ce master

parents 171955f4 ac2c2be9
...@@ -216,6 +216,7 @@ HELM_CMD=$(cat << EOF ...@@ -216,6 +216,7 @@ HELM_CMD=$(cat << EOF
--set global.ingress.configureCertmanager=false \ --set global.ingress.configureCertmanager=false \
--set global.ingress.tls.secretName=tls-cert \ --set global.ingress.tls.secretName=tls-cert \
--set global.ingress.annotations."external-dns\.alpha\.kubernetes\.io/ttl"="10" --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.defaultBackend.resources.requests.memory=7Mi \
--set nginx-ingress.controller.resources.requests.memory=440M \ --set nginx-ingress.controller.resources.requests.memory=440M \
--set nginx-ingress.controller.replicaCount=2 \ --set nginx-ingress.controller.replicaCount=2 \
......
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