workhorse metrics cannot be scraped with default metrics annotations

Summary

The default annotations set prometheus.io/port which limits metrics scraping to just the webservice, even if workhorse metrics are enabled.

https://gitlab.com/gitlab-org/charts/gitlab/-/blob/0d2c4c26acbad430bef4a8d1136b2f6dbc539ec8/charts/gitlab/charts/webservice/templates/deployment.yaml#L68

Steps to reproduce

N/A

Configuration used

N/A

Current behavior

Workhorse metrics are not scraped, only webservice metrics are.

Expected behavior

Both webservice and workhorse metrics should be scraped.

Versions

  • Chart: v8.1.2
  • Platform: N/A
  • Kubernetes: N/A
  • Helm: N/A

Relevant logs

N/A