From a68e0f3f6fd0f87f077a5ff8d5f8723f50dbdfc7 Mon Sep 17 00:00:00 2001
From: zhenyus <zhenyus@mathmast.com>
Date: Mon, 18 Aug 2025 12:16:59 +0800
Subject: [PATCH] feat: enable apiServerService in Helm values and update
 service template

- Added `apiServerService` configuration to `values.prod.yaml` and `values.yaml`, enabling the service.
- Updated the service template to use the new `apiServerService` configuration instead of the deprecated `metrics` configuration.

Signed-off-by: zhenyus <zhenyus@mathmast.com>
---
 .../helm-pkg/secret-operator/templates/service.yaml  | 12 ++++++------
 .../helm-pkg/secret-operator/values.prod.yaml        |  5 ++---
 .../helm-pkg/secret-operator/values.yaml             |  5 ++---
 freeleaps-secret-operator/prod/ci/Jenkinsfile        |  2 +-
 4 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/freeleaps-secret-operator/helm-pkg/secret-operator/templates/service.yaml b/freeleaps-secret-operator/helm-pkg/secret-operator/templates/service.yaml
index d603fa8d..b6ca3e18 100644
--- a/freeleaps-secret-operator/helm-pkg/secret-operator/templates/service.yaml
+++ b/freeleaps-secret-operator/helm-pkg/secret-operator/templates/service.yaml
@@ -1,17 +1,17 @@
-{{- if .Values.metrics.enabled }}
+{{- if .Values.apiServerService.enabled }}
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "freeleaps-secret-operator.fullname" . }}-metrics
+  name: {{ include "freeleaps-secret-operator.fullname" . }}-vault-service
   labels:
     {{- include "freeleaps-secret-operator.labels" . | nindent 4 }}
 spec:
-  type: {{ .Values.metrics.service.type }}
+  type: {{ .Values.apiServerService.service.type }}
   ports:
-    - port: {{ .Values.metrics.service.port }}
-      targetPort: metrics
+    - port: {{ .Values.apiServerService.service.port }}
+      targetPort: {{ .Values.operator.apiServerPort }}
       protocol: TCP
-      name: metrics
+      name: api
   selector:
     {{- include "freeleaps-secret-operator.selectorLabels" . | nindent 4 }}
 {{- end }}
diff --git a/freeleaps-secret-operator/helm-pkg/secret-operator/values.prod.yaml b/freeleaps-secret-operator/helm-pkg/secret-operator/values.prod.yaml
index 7068f019..13263981 100644
--- a/freeleaps-secret-operator/helm-pkg/secret-operator/values.prod.yaml
+++ b/freeleaps-secret-operator/helm-pkg/secret-operator/values.prod.yaml
@@ -104,9 +104,8 @@ hmac:
 crds:
   install: false # Set to false if you want to manage CRDs separately
 
-# Metrics configuration
-metrics:
-  enabled: false
+apiServerService:
+  enabled: true
   service:
     type: ClusterIP
     port: 8080
diff --git a/freeleaps-secret-operator/helm-pkg/secret-operator/values.yaml b/freeleaps-secret-operator/helm-pkg/secret-operator/values.yaml
index 9931bcb6..27dbf2dc 100644
--- a/freeleaps-secret-operator/helm-pkg/secret-operator/values.yaml
+++ b/freeleaps-secret-operator/helm-pkg/secret-operator/values.yaml
@@ -104,9 +104,8 @@ hmac:
 crds:
   install: false # Set to false if you want to manage CRDs separately
 
-# Metrics configuration
-metrics:
-  enabled: false
+apiServerService:
+  enabled: true
   service:
     type: ClusterIP
     port: 8080
diff --git a/freeleaps-secret-operator/prod/ci/Jenkinsfile b/freeleaps-secret-operator/prod/ci/Jenkinsfile
index dcccc10b..716025e1 100644
--- a/freeleaps-secret-operator/prod/ci/Jenkinsfile
+++ b/freeleaps-secret-operator/prod/ci/Jenkinsfile
@@ -11,7 +11,7 @@ executeFreeleapsPipeline {
   commitMessageLintEnabled = false
   components = [
     [
-      name: 'secret-operator',
+      name: 'secretOperator',
       root: 'secretoperator',
       language: 'python',
       dependenciesManager: 'pip',