Merge "Ceph: Add metrics port to ceph-mgr service"

ceph/templates/deployment-mgr.yaml

@@ -89,6 +89,13 @@ spec:
             {{- end }}
           command:
             - /mgr-start.sh
+          ports:
+            - name: mgr
+              containerPort: {{ tuple "ceph_mgr" "internal" "mgr" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
+          {{- if (has "prometheus" .Values.ceph_mgr_enabled_modules) }}
+            - name: metrics
+              containerPort: {{ tuple "ceph_mgr" "internal" "metrics" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
+          {{ end -}}
           livenessProbe:
            exec:
             command:

ceph/templates/service-mgr.yaml

@@ -28,9 +28,15 @@ metadata:
 {{- end }}
 spec:
   ports:
-  - port: {{ .Values.network.port.mgr }}
+  - name: ceph-mgr
+    port: {{ tuple "ceph_mgr" "internal" "mgr" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
     protocol: TCP
-    targetPort: {{ .Values.network.port.mgr }}
+    targetPort: {{ tuple "ceph_mgr" "internal" "mgr" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
+  {{ if (has "prometheus" .Values.ceph_mgr_enabled_modules) }}
+  - name: metrics
+    protocol: TCP
+    port: {{ tuple "ceph_mgr" "internal" "metrics" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
+  {{ end }}
   selector:
 {{ tuple $envAll "ceph" "mgr" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
 {{- end }}

ceph/values.yaml

@@ -605,6 +605,8 @@ endpoints:
     port:
       mgr:
         default: 7000
+      metrics:
+        default: 9283
     scheme:
       default: http