Fix ca cert key for service monitor

Signed-off-by: Tamal Saha <[email protected]>
stashed · Jul 7, 2024 · 4168e76 · 4168e76
1 parent 1f7357c
commit 4168e76
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 }}