update tlsConfig & namespaceSelector for metrics serviceMonitor

chart/templates/prometheus-servicemonitor.yaml

@@ -23,6 +23,11 @@ spec:
   selector:
     matchLabels:
       control-plane: controller-manager
+  {{- if .Values.telemetry.serviceMonitor.namespaceSelector }}
+  namespaceSelector:
+    matchNames:
+  {{- toYaml .Values.telemetry.serviceMonitor.namespaceSelector | nindent 6 }}
+  {{- end }}       
   endpoints:
     - port: {{ .Values.telemetry.serviceMonitor.port }}
       scheme: {{ .Values.telemetry.serviceMonitor.scheme }}
@@ -34,5 +39,10 @@ spec:
         format:
           - prometheus
       tlsConfig:
-        insecureSkipVerify: true
+        insecureSkipVerify: {{ .Values.telemetry.serviceMonitor.insecureSkipVerify }}   
+        {{- if .Values.telemetry.serviceMonitor.tlsconfiguration.enabled }}           
+        caFile: {{ .Values.telemetry.serviceMonitor.tlsconfiguration.caFile }}
+        certFile: {{ .Values.telemetry.serviceMonitor.tlsconfiguration.certFile }}
+        keyFile: {{ .Values.telemetry.serviceMonitor.tlsconfiguration.keyFile }}  
+        {{- end }}
 {{ end }}

chart/templates/tests/test-runner.yaml

@@ -19,5 +19,5 @@ metadata:
 spec:
   containers:
     - name: vault-operator-test
-      image: "{{ .Values.controller.manager.image.repository }}"
+      image: "{{ .Values.controller.manager.image.repository.tag }}"
 {{- end }}

chart/values.yaml

@@ -724,10 +724,14 @@ telemetry:
 
     # Selector labels to add to the ServiceMonitor.
     # When empty, defaults to:
-    #  release: prometheus
+    #  control-plane: controller-manager
     # @type: string
     selectors: {}
 
+    # NamespaceSelector labels to add Vault Secrets Operator metric's service namespace
+    # When empty , defaults to your Vault Secrets Operator's release namespace  
+    namespaceSelector: {}
+
     # Scheme of the service Prometheus scrapes metrics from. This must match the scheme of the metrics service of VSO
     # @type: string
     scheme: https
@@ -744,6 +748,21 @@ telemetry:
     # @type: string
     bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
 
+    # tlsConfig for serviceMonitor.
+    # true means skip the verification of SSL/TLS certificates when establishing a secure connection to the target endpoints
+    insecureSkipVerify: true 
+
+    # Enable tlsconfiguration to provide CA certificates, client certificates, and client keys for SSL/TLS certificates validation
+    # @type: boolean
+    tlsconfiguration: 
+      enabled: false  
+
+      # Uncomment following to add configuration
+      # @type: string
+      # caFile: /path/to/ca.crt
+      # certFile: /path/to/client.crt
+      # keyFile: /path/to/client.key
+
     # Interval at which Prometheus scrapes metrics
     # @type: string
     interval: 30s