From 4168e76b33ac15b193e2a9dc253dadb82cb13e33 Mon Sep 17 00:00:00 2001
From: Tamal Saha <tamal@appscode.com>
Date: Sun, 7 Jul 2024 11:55:52 -0700
Subject: [PATCH] Fix ca cert key for service monitor

Signed-off-by: Tamal Saha <tamal@appscode.com>
---
 charts/stash-community/templates/apiregistration.yaml  | 1 +
 charts/stash-community/templates/servicemonitor.yaml   | 2 +-
 charts/stash-enterprise/templates/apiregistration.yaml | 1 +
 charts/stash-enterprise/templates/servicemonitor.yaml  | 2 +-
 charts/stash-ui-server/templates/apiregistration.yaml  | 1 +
 charts/stash-ui-server/templates/servicemonitor.yaml   | 2 +-
 6 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/charts/stash-community/templates/apiregistration.yaml b/charts/stash-community/templates/apiregistration.yaml
index e1f95b3ea..dfd085fb2 100644
--- a/charts/stash-community/templates/apiregistration.yaml
+++ b/charts/stash-community/templates/apiregistration.yaml
@@ -74,6 +74,7 @@ metadata:
     {{- include "stash-community.labels" . | nindent 4 }}
 type: Opaque
 data:
+  ca.crt: {{ $caCrt }}
   tls.crt: {{ $serverCrt }}
   tls.key: {{ $serverKey }}
 ---
diff --git a/charts/stash-community/templates/servicemonitor.yaml b/charts/stash-community/templates/servicemonitor.yaml
index 519043553..5ff891257 100644
--- a/charts/stash-community/templates/servicemonitor.yaml
+++ b/charts/stash-community/templates/servicemonitor.yaml
@@ -32,7 +32,7 @@ spec:
       ca:
         secret:
           name: {{ include "stash-community.fullname" . }}-apiserver-cert
-          key: tls.crt
+          key: ca.crt
       serverName: "{{ include "stash-community.fullname" . }}.{{ .Release.Namespace }}.svc"
   {{- end }}
 {{- end }}
diff --git a/charts/stash-enterprise/templates/apiregistration.yaml b/charts/stash-enterprise/templates/apiregistration.yaml
index ff2922737..b320359c1 100644
--- a/charts/stash-enterprise/templates/apiregistration.yaml
+++ b/charts/stash-enterprise/templates/apiregistration.yaml
@@ -74,6 +74,7 @@ metadata:
     {{- include "stash-enterprise.labels" . | nindent 4 }}
 type: Opaque
 data:
+  ca.crt: {{ $caCrt }}
   tls.crt: {{ $serverCrt }}
   tls.key: {{ $serverKey }}
 ---
diff --git a/charts/stash-enterprise/templates/servicemonitor.yaml b/charts/stash-enterprise/templates/servicemonitor.yaml
index 0c1b6610f..77c1401a3 100644
--- a/charts/stash-enterprise/templates/servicemonitor.yaml
+++ b/charts/stash-enterprise/templates/servicemonitor.yaml
@@ -32,7 +32,7 @@ spec:
       ca:
         secret:
           name: {{ include "stash-enterprise.fullname" . }}-apiserver-cert
-          key: tls.crt
+          key: ca.crt
       serverName: "{{ include "stash-enterprise.fullname" . }}.{{ .Release.Namespace }}.svc"
   {{- end }}
 {{- end }}
diff --git a/charts/stash-ui-server/templates/apiregistration.yaml b/charts/stash-ui-server/templates/apiregistration.yaml
index bb322bf0e..320a991a7 100644
--- a/charts/stash-ui-server/templates/apiregistration.yaml
+++ b/charts/stash-ui-server/templates/apiregistration.yaml
@@ -41,6 +41,7 @@ metadata:
     {{- include "stash-ui-server.labels" . | nindent 4 }}
 type: kubernetes.io/tls
 data:
+  ca.crt: {{ $caCrt }}
   tls.crt: {{ $serverCrt }}
   tls.key: {{ $serverKey }}
 ---
diff --git a/charts/stash-ui-server/templates/servicemonitor.yaml b/charts/stash-ui-server/templates/servicemonitor.yaml
index 719800a5b..bd420d831 100644
--- a/charts/stash-ui-server/templates/servicemonitor.yaml
+++ b/charts/stash-ui-server/templates/servicemonitor.yaml
@@ -25,6 +25,6 @@ spec:
       ca:
         secret:
           name: {{ include "stash-ui-server.fullname" . }}-apiserver-cert
-          key: tls.crt
+          key: ca.crt
       serverName: "{{ include "stash-ui-server.fullname" . }}.{{ .Release.Namespace }}.svc"
 {{- end }}