addressing comments around duplicate ports, per-comonent conventions, and dead variable reference

Signed-off-by: lemonprogis <edward.briggler@gmail.com>

Author: lemonprogis

deployment/chainloop/templates/cas/service-metrics.yaml

@@ -3,22 +3,22 @@ Copyright Chainloop, Inc. All Rights Reserved.
 SPDX-License-Identifier: APACHE-2.0
 */}}
 
-{{- if .Values.metrics.enabled }}
+{{- if .Values.cas.metrics.enabled }}
 apiVersion: v1
 kind: Service
 metadata:
   name: {{ include "chainloop.cas.fullname" . }}-metrics
   namespace: {{ include "common.names.namespace" . | quote }}
   labels: {{ include "chainloop.cas.labels" . | nindent 4 }}
-  {{- if or .Values.metrics.service.annotations .Values.commonAnnotations }}
-  {{- $annotations := include "common.tplvalues.merge" (dict "values" (list .Values.metrics.service.annotations .Values.commonAnnotations) "context" .) }}
+  {{- if or .Values.cas.metrics.service.annotations .Values.commonAnnotations }}
+  {{- $annotations := include "common.tplvalues.merge" (dict "values" (list .Values.cas.metrics.service.annotations .Values.commonAnnotations) "context" .) }}
   annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $ ) | nindent 4 }}
   {{- end }}
 spec:
   type: ClusterIP
   ports:
     - name: metrics
-      port: {{ .Values.metrics.service.port }}
+      port: {{ .Values.cas.containerPorts.metrics }}
       targetPort: metrics
       protocol: TCP
   selector: {{ include "chainloop.cas.selectorLabels" . | nindent 4 }}

deployment/chainloop/templates/controlplane/service-metrics.yaml

@@ -3,24 +3,23 @@ Copyright Chainloop, Inc. All Rights Reserved.
 SPDX-License-Identifier: APACHE-2.0
 */}}
 
-{{- if .Values.metrics.enabled }}
+{{- if .Values.controlplane.metrics.enabled }}
 apiVersion: v1
 kind: Service
 metadata:
   name: {{ include "chainloop.controlplane.fullname" . }}-metrics
   namespace: {{ include "common.names.namespace" . | quote }}
   labels: {{- include "chainloop.controlplane.labels" . | nindent 4 }}
-  {{- if or .Values.metrics.service.annotations .Values.commonAnnotations }}
-  {{- $annotations := include "common.tplvalues.merge" (dict "values" (list .Values.metrics.service.annotations .Values.commonAnnotations) "context" .) }}
+  {{- if or .Values.controlplane.metrics.service.annotations .Values.commonAnnotations }}
+  {{- $annotations := include "common.tplvalues.merge" (dict "values" (list .Values.controlplane.metrics.service.annotations .Values.commonAnnotations) "context" .) }}
   annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $ ) | nindent 4 }}
   {{- end }}
 spec:
   type: ClusterIP
   ports:
     - name: metrics
-      port: {{ .Values.metrics.service.port }}
+      port: {{ .Values.controlplane.containerPorts.metrics }}
       targetPort: metrics
       protocol: TCP
-  {{- $podLabels := include "common.tplvalues.merge" (dict "values" (list .Values.controlplane.podLabels .Values.commonLabels) "context" .) | fromYaml }}
   selector: {{ include "chainloop.controlplane.selectorLabels" . | nindent 4 }}
 {{- end }}

deployment/chainloop/values.yaml

@@ -51,18 +51,6 @@ commonLabels: {}
 ##
 extraDeploy: []
 
-## @section Prometheus Metrics
-## @extra metrics Prometheus metrics configuration for controlplane and CAS
-## @param metrics.enabled Enable metrics services for both controlplane and CAS
-metrics:
-  enabled: false
-  ## @extra metrics.service Metrics service configuration
-  service:
-    ## @param metrics.service.port Metrics service port
-    port: 5000
-    ## @param metrics.service.annotations Additional custom annotations for metrics services
-    annotations: {}
-
 ## @section Secrets Backend
 ##
 
@@ -350,6 +338,15 @@ controlplane:
     ##
     sessionAffinityConfig: {}
 
+  ## @extra controlplane.metrics Prometheus metrics configuration
+  ## @param controlplane.metrics.enabled Enable metrics service for controlplane
+  metrics:
+    enabled: false
+    ## @extra controlplane.metrics.service Metrics service configuration
+    service:
+      ## @param controlplane.metrics.service.annotations Additional custom annotations for metrics service
+      annotations: {}
+
   serviceAPI:
     ## @param controlplane.serviceAPI.type Service type
     type: ClusterIP
@@ -1104,6 +1101,15 @@ cas:
     ##
     sessionAffinityConfig: {}
 
+  ## @extra cas.metrics Prometheus metrics configuration
+  ## @param cas.metrics.enabled Enable metrics service for CAS
+  metrics:
+    enabled: false
+    ## @extra cas.metrics.service Metrics service configuration
+    service:
+      ## @param cas.metrics.service.annotations Additional custom annotations for metrics service
+      annotations: {}
+
   serviceAPI:
     ## @param cas.serviceAPI.type Service type
     type: ClusterIP