From 79543add3f8c4bff5f60bd375bf0e7064f8939d1 Mon Sep 17 00:00:00 2001
From: John Stewart <32647598+jstewart612@users.noreply.github.com>
Date: Tue, 29 Jun 2021 02:50:38 -0400
Subject: [PATCH] Instruct ServiceMonitor to connect using https for controller
 (#625)

The controller metrics endpoint serves over https using a self-signed cert by default in this chart so correct the ServiceMonitor to reflect.
---
 charts/actions-runner-controller/Chart.yaml                 | 2 +-
 .../templates/controller.metrics.serviceMonitor.yaml        | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/charts/actions-runner-controller/Chart.yaml b/charts/actions-runner-controller/Chart.yaml
index 0f26fb74..68c9bc58 100644
--- a/charts/actions-runner-controller/Chart.yaml
+++ b/charts/actions-runner-controller/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.12.3
+version: 0.12.4
 
 # Used as the default manager tag value when no tag property is provided in the values.yaml
 appVersion: 0.19.0
diff --git a/charts/actions-runner-controller/templates/controller.metrics.serviceMonitor.yaml b/charts/actions-runner-controller/templates/controller.metrics.serviceMonitor.yaml
index 3b4eca44..3e4cbffe 100644
--- a/charts/actions-runner-controller/templates/controller.metrics.serviceMonitor.yaml
+++ b/charts/actions-runner-controller/templates/controller.metrics.serviceMonitor.yaml
@@ -9,6 +9,12 @@ spec:
   endpoints:
     - path: /metrics
       port: metrics-port
+      {{- if .Values.metrics.proxy.enabled }}
+      bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
+      scheme: https
+      tlsConfig:
+        insecureSkipVerify: true
+      {{- end }}
   selector:
     matchLabels:
       {{- include "actions-runner-controller.selectorLabels" . | nindent 6 }}