From 83f8b7f030a251e8f23d9e310bccf037c006b498 Mon Sep 17 00:00:00 2001
From: zhenyus <zhenyus@mathmast.com>
Date: Mon, 17 Mar 2025 21:35:31 +0800
Subject: [PATCH] feat: enable serviceMonitor configuration for authentication,
 central-storage, content, notification, and payment services

Signed-off-by: zhenyus <zhenyus@mathmast.com>
---
 .../authentication/templates/authentication/service.yaml       | 3 ++-
 .../centralStorage/templates/central-storage/service.yaml      | 3 ++-
 freeleaps/helm-pkg/content/templates/content/service.yaml      | 3 ++-
 .../helm-pkg/notification/templates/notification/service.yaml  | 3 ++-
 freeleaps/helm-pkg/payment/templates/payment/service.yaml      | 3 ++-
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/freeleaps/helm-pkg/authentication/templates/authentication/service.yaml b/freeleaps/helm-pkg/authentication/templates/authentication/service.yaml
index bb31c28a..aef953a1 100644
--- a/freeleaps/helm-pkg/authentication/templates/authentication/service.yaml
+++ b/freeleaps/helm-pkg/authentication/templates/authentication/service.yaml
@@ -2,6 +2,7 @@
 {{ $appVersion := .Chart.AppVersion | quote }}
 {{ $releaseService := .Release.Service }}
 {{ $releaseName := .Release.Name }}
+{{ $serviceMonitorEnabled := .Values.authentication.serviceMonitor.enabled }}
 {{- range $service := .Values.authentication.services }}
 ---
 apiVersion: v1
@@ -18,7 +19,7 @@ spec:
   ports:
     - port: {{ $service.port }}
       targetPort: {{ $service.targetPort }}
-    {{- if .Values.authentication.serviceMonitor.enabled }}
+    {{- if $serviceMonitorEnabled }}
     - port: {{ $service.port }}
       targetPort: {{ $service.targetPort }}
       name: metrics
diff --git a/freeleaps/helm-pkg/centralStorage/templates/central-storage/service.yaml b/freeleaps/helm-pkg/centralStorage/templates/central-storage/service.yaml
index bd2b7a04..86cf91dc 100644
--- a/freeleaps/helm-pkg/centralStorage/templates/central-storage/service.yaml
+++ b/freeleaps/helm-pkg/centralStorage/templates/central-storage/service.yaml
@@ -2,6 +2,7 @@
 {{ $appVersion := .Chart.AppVersion | quote }}
 {{ $releaseService := .Release.Service }}
 {{ $releaseName := .Release.Name }}
+{{ $serviceMonitorEnabled := .Values.centralStorage.serviceMonitor.enabled }}
 {{- range $service := .Values.centralStorage.services }}
 ---
 apiVersion: v1
@@ -18,7 +19,7 @@ spec:
   ports:
     - port: {{ $service.port }}
       targetPort: {{ $service.targetPort }}
-    {{- if .Values.centralStorage.serviceMonitor.enabled }}
+    {{- if $serviceMonitorEnabled }}
     - port: {{ $service.port }}
       targetPort: {{ $service.targetPort }}
       name: metrics
diff --git a/freeleaps/helm-pkg/content/templates/content/service.yaml b/freeleaps/helm-pkg/content/templates/content/service.yaml
index 86c087c5..f0329129 100644
--- a/freeleaps/helm-pkg/content/templates/content/service.yaml
+++ b/freeleaps/helm-pkg/content/templates/content/service.yaml
@@ -2,6 +2,7 @@
 {{ $appVersion := .Chart.AppVersion | quote }}
 {{ $releaseService := .Release.Service }}
 {{ $releaseName := .Release.Name }}
+{{ $serviceMonitorEnabled := .Values.content.serviceMonitor.enabled }}
 {{- range $service := .Values.content.services }}
 ---
 apiVersion: v1
@@ -18,7 +19,7 @@ spec:
   ports:
     - port: {{ $service.port }}
       targetPort: {{ $service.targetPort }}
-    {{- if .Values.content.serviceMonitor.enabled }}
+    {{- if $serviceMonitorEnabled }}
     - port: {{ $service.port }}
       targetPort: {{ $service.targetPort }}
       name: metrics
diff --git a/freeleaps/helm-pkg/notification/templates/notification/service.yaml b/freeleaps/helm-pkg/notification/templates/notification/service.yaml
index 25fae9d1..cd9d4529 100644
--- a/freeleaps/helm-pkg/notification/templates/notification/service.yaml
+++ b/freeleaps/helm-pkg/notification/templates/notification/service.yaml
@@ -2,6 +2,7 @@
 {{ $appVersion := .Chart.AppVersion | quote }}
 {{ $releaseService := .Release.Service }}
 {{ $releaseName := .Release.Name }}
+{{ $serviceMonitorEnabled := .Values.notification.serviceMonitor.enabled }}
 {{- range $service := .Values.notification.services }}
 ---
 apiVersion: v1
@@ -18,7 +19,7 @@ spec:
   ports:
     - port: {{ $service.port }}
       targetPort: {{ $service.targetPort }}
-    {{- if .Values.content.serviceMonitor.enabled }}
+    {{- if $serviceMonitorEnabled }}
     - port: {{ $service.port }}
       targetPort: {{ $service.targetPort }}
       name: metrics
diff --git a/freeleaps/helm-pkg/payment/templates/payment/service.yaml b/freeleaps/helm-pkg/payment/templates/payment/service.yaml
index 33c18878..911ed77a 100644
--- a/freeleaps/helm-pkg/payment/templates/payment/service.yaml
+++ b/freeleaps/helm-pkg/payment/templates/payment/service.yaml
@@ -2,6 +2,7 @@
 {{ $appVersion := .Chart.AppVersion | quote }}
 {{ $releaseService := .Release.Service }}
 {{ $releaseName := .Release.Name }}
+{{ $serviceMonitorEnabled := .Values.payment.serviceMonitor.enabled }}
 {{- range $service := .Values.payment.services }}
 ---
 apiVersion: v1
@@ -18,7 +19,7 @@ spec:
   ports:
     - port: {{ $service.port }}
       targetPort: {{ $service.targetPort }}
-    {{- if .Values.content.serviceMonitor.enabled }}
+    {{- if $serviceMonitorEnabled }}
     - port: {{ $service.port }}
       targetPort: {{ $service.targetPort }}
       name: metrics