ports over https://github.com/helm/charts/pull/13646
This ports over the work in https://github.com/helm/charts/pull/13646
Addresses: https://gitlab.com/charts/gitlab/issues/1353
Edited by John Skarbek
This ports over the work in https://github.com/helm/charts/pull/13646
Addresses: https://gitlab.com/charts/gitlab/issues/1353