fix(application-template): prometheus metric port 명시방식 변경 (#16)

modusign · Feb 1, 2024 · 8a42bea · 8a42bea
1 parent d1ad389
commit 8a42bea
Show file tree

Hide file tree

Showing 12 changed files with 18 additions and 70 deletions.
diff --git a/charts/application-template/Chart.yaml b/charts/application-template/Chart.yaml
@@ -9,4 +9,4 @@ maintainers:
 - name: modusign
   url: https://github.com/modusign
 name: application-template
-version: 1.4.1
+version: 1.4.2
diff --git a/charts/application-template/templates/scheduler/deployment.yaml b/charts/application-template/templates/scheduler/deployment.yaml
@@ -103,11 +103,6 @@ spec:
             containerPort: {{ .targetPort }}
             protocol: TCP
         {{- end }}
-        {{- if .Values.global.observability.prometheus.enabled }}
-          - name: metrics
-            containerPort: {{ default .Values.global.observability.prometheus.port .Values.global.observability.prometheus.targetPort }}
-            protocol: TCP
-        {{- end }}
         {{- with .Values.scheduler.livenessProbe }}
         livenessProbe:
           httpGet:

diff --git a/charts/application-template/templates/scheduler/rollout.yaml b/charts/application-template/templates/scheduler/rollout.yaml
@@ -107,11 +107,6 @@ spec:
             containerPort: {{ .targetPort }}
             protocol: TCP
         {{- end }}
-        {{- if .Values.global.observability.prometheus.enabled }}
-          - name: metrics
-            containerPort: {{ default .Values.global.observability.prometheus.port .Values.global.observability.prometheus.targetPort }}
-            protocol: TCP
-        {{- end }}
         {{- with .Values.scheduler.livenessProbe }}
         livenessProbe:
           httpGet:

diff --git a/charts/application-template/templates/scheduler/service.yaml b/charts/application-template/templates/scheduler/service.yaml
@@ -12,16 +12,6 @@ spec:
       port: {{ .port }}
       targetPort: {{ .targetPort }}
       protocol: TCP
-{{- end }}
-{{- if .Values.global.observability.prometheus.enabled }}
-{{- with .Values.global.observability.prometheus }}
-    - name: metrics
-      port: {{ .port }}
-      {{- if .targetPort }}
-      targetPort: {{ .targetPort }}
-      {{- end }}
-      protocol: TCP
-{{- end }}
 {{- end }}
   selector:
     {{- include "application.scheduler.selectorLabels" . | nindent 4 }}

diff --git a/charts/application-template/templates/server/deployment.yaml b/charts/application-template/templates/server/deployment.yaml
@@ -103,11 +103,6 @@ spec:
             containerPort: {{ .targetPort }}
             protocol: TCP
         {{- end }}
-        {{- if .Values.global.observability.prometheus.enabled }}
-          - name: metrics
-            containerPort: {{ default .Values.global.observability.prometheus.port .Values.global.observability.prometheus.targetPort }}
-            protocol: TCP
-        {{- end }}
         {{- with .Values.server.livenessProbe }}
         livenessProbe:
           httpGet:

diff --git a/charts/application-template/templates/server/rollout.yaml b/charts/application-template/templates/server/rollout.yaml
@@ -107,11 +107,6 @@ spec:
             containerPort: {{ .targetPort }}
             protocol: TCP
         {{- end }}
-        {{- if .Values.global.observability.prometheus.enabled }}
-          - name: metrics
-            containerPort: {{ default .Values.global.observability.prometheus.port .Values.global.observability.prometheus.targetPort }}
-            protocol: TCP
-        {{- end }}
         {{- with .Values.server.livenessProbe }}
         livenessProbe:
           httpGet:

diff --git a/charts/application-template/templates/server/service.yaml b/charts/application-template/templates/server/service.yaml
@@ -12,16 +12,6 @@ spec:
       port: {{ .port }}
       targetPort: {{ .targetPort }}
       protocol: TCP
-{{- end }}
-{{- if .Values.global.observability.prometheus.enabled }}
-{{- with .Values.global.observability.prometheus }}
-    - name: metrics
-      port: {{ .port }}
-      {{- if .targetPort }}
-      targetPort: {{ .targetPort }}
-      {{- end }}
-      protocol: TCP
-{{- end }}
 {{- end }}
   selector:
     {{- include "application.server.selectorLabels" . | nindent 4 }}

diff --git a/charts/application-template/templates/service_monitor.yaml b/charts/application-template/templates/service_monitor.yaml
@@ -1,4 +1,4 @@
-{{- if and .Values.global.observability.prometheus.enabled .Values.global.observability.prometheus.serviceMonitor.enabled }}
+{{- if .Values.global.observability.prometheus.serviceMonitor.enabled }}
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
@@ -7,8 +7,8 @@ metadata:
     {{- include "application.commonLabels" . | nindent 4 }}
 spec:
   endpoints:
-    - path: {{ .Values.global.observability.prometheus.path }}
-      port: metrics
+    - path: {{ .Values.global.observability.prometheus.serviceMonitor.path }}
+      port: {{ .Values.global.observability.prometheus.serviceMonitor.portName }}
   namespaceSelector:
     matchNames:
       - {{ .Release.Namespace }}

diff --git a/charts/application-template/templates/worker/deployment.yaml b/charts/application-template/templates/worker/deployment.yaml
@@ -103,11 +103,6 @@ spec:
             containerPort: {{ .targetPort }}
             protocol: TCP
         {{- end }}
-        {{- if .Values.global.observability.prometheus.enabled }}
-          - name: metrics
-            containerPort: {{ default .Values.global.observability.prometheus.port .Values.global.observability.prometheus.targetPort }}
-            protocol: TCP
-        {{- end }}
         {{- with .Values.worker.livenessProbe }}
         livenessProbe:
           httpGet:

diff --git a/charts/application-template/templates/worker/rollout.yaml b/charts/application-template/templates/worker/rollout.yaml
@@ -107,11 +107,6 @@ spec:
             containerPort: {{ .targetPort }}
             protocol: TCP
         {{- end }}
-        {{- if .Values.global.observability.prometheus.enabled }}
-          - name: metrics
-            containerPort: {{ default .Values.global.observability.prometheus.port .Values.global.observability.prometheus.targetPort }}
-            protocol: TCP
-        {{- end }}
         {{- with .Values.worker.livenessProbe }}
         livenessProbe:
           httpGet:

diff --git a/charts/application-template/templates/worker/service.yaml b/charts/application-template/templates/worker/service.yaml
@@ -12,16 +12,6 @@ spec:
       port: {{ .port }}
       targetPort: {{ .targetPort }}
       protocol: TCP
-{{- end }}
-{{- if .Values.global.observability.prometheus.enabled }}
-{{- with .Values.global.observability.prometheus }}
-    - name: metrics
-      port: {{ .port }}
-      {{- if .targetPort }}
-      targetPort: {{ .targetPort }}
-      {{- end }}
-      protocol: TCP
-{{- end }}
 {{- end }}
   selector:
     {{- include "application.worker.selectorLabels" . | nindent 4 }}

diff --git a/charts/application-template/values.yaml b/charts/application-template/values.yaml
@@ -107,13 +107,12 @@ global:
         enabled: false
     # -- set up additional service port and setup
     prometheus:
-      enabled: false
-      port: 9100
-      # targetPort: 9100
-      path: /metrics
-      # -- create Prometheus Operator ServiceMonitorCR
+      # -- create Prometheus Operator ServiceMonitor CR
       serviceMonitor:
-        enabled: true
+        enabled: false
+        # port name of Service. e.g. server.ports[].name
+        portName: metrics
+        path: /metrics
 
 ## Server
 server:
@@ -235,6 +234,9 @@ server:
     - name: http
       port: 80
       targetPort: 3000
+    # - name: metrics
+    #   port: 9100
+    #   targetPort: 3001
 
   ## Readiness and liveness probes for default backend
   ## Ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-probes/
@@ -476,6 +478,9 @@ worker:
     - name: http
       port: 80
       targetPort: 3000
+    # - name: metrics
+    #   port: 9100
+    #   targetPort: 3001
 
   ## Readiness and liveness probes for default backend
   ## Ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-probes/
@@ -720,6 +725,9 @@ scheduler:
     - name: http
       port: 80
       targetPort: 3000
+    # - name: metrics
+    #   port: 9100
+    #   targetPort: 3001
 
   ## Readiness and liveness probes for default backend
   ## Ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-probes/