Helm chart: Mismatch between webhook ServiceMonitor selector and Service labels

Checks

• I've already read https://github.com/actions-runner-controller/actions-runner-controller/blob/master/TROUBLESHOOTING.md and I'm sure my issue is not covered in the troubleshooting guide.

Controller Version

0.26.0

Helm Chart Version

0.21.0

CertManager Version

1.9.1

Deployment Method

ArgoCD

cert-manager installation

Installed through Argo CD. Working for Certificates for Linkerd mTLS as well as for Contour HTTP routes.

Checks

• This isn't a question or user support case (For Q&A and community support, go to Discussions. It might also be a good idea to contract with any of contributors and maintainers if your business is so critical and therefore you need priority support
• I've read releasenotes before submitting this issue and I'm sure it's not due to any recently-introduced backward-incompatible changes
• My actions-runner-controller version (v0.x.y) does support the feature
• I've already upgraded ARC (including the CRDs, see charts/actions-runner-controller/docs/UPGRADING.md for details) to the latest and it didn't fix the issue

Resource Definitions

N/A (chart issue)

To Reproduce

1. Configure Prometheus Kubernetes service discovery.
2. Install ARC through Helm.
3. Check Prometheus scrape targets.

Describe the bug

Zero active targets:

serviceMonitor/github-runner/github-runner-actions-runner-controller-github--service-monitor/0 (0 / 12 active targets)

Describe the expected behavior

At least one active target.

Controller Logs

N/A (chart issue)

Runner Pod Logs

N/A (chart issue)

Additional Context

The ServiceMonitor specifies its selector like this:

https://github.com/actions-runner-controller/actions-runner-controller/blob/6863bdb20807546129ddaed61fc4c79644c8cfb6/charts/actions-runner-controller/templates/githubwebhook.serviceMonitor.yaml#L22-L24

But the webhook server Service specifies its labels like this:

https://github.com/actions-runner-controller/actions-runner-controller/blob/6863bdb20807546129ddaed61fc4c79644c8cfb6/charts/actions-runner-controller/templates/githubwebhook.service.yaml#L7-L8

As such, the ServiceMonitor’s selector and the Service’s labels don’t match:

  Selector:
    Match Labels:
      app.kubernetes.io/instance:  github-runner-github-webhook-server
      app.kubernetes.io/name:      actions-runner-controller

Labels:            app.kubernetes.io/instance=github-runner
                   app.kubernetes.io/managed-by=Helm
                   app.kubernetes.io/name=actions-runner-controller
                   app.kubernetes.io/version=0.26.0
                   argocd.argoproj.io/instance=github-runner
                   helm.sh/chart=actions-runner-controller-0.21.0

Start with charts/actions-runner-controller/templates/githubwebhook.serviceMonitor.yaml and githubwebhook.service.yaml, then render the chart with Helm to compare the ServiceMonitor selector with the webhook Service labels. Done means the selectors match and Prometheus reports at least one active scrape target.