minecraft-server: Fix ServiceMonitor

qumine · Aug 1, 2021 · 7d9348b · 7d9348b
1 parent ec0b577
commit 7d9348b
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/charts/minecraft-server/questions.yml b/charts/minecraft-server/questions.yml
@@ -804,7 +804,7 @@ questions:
     type: string
     label: Image Repository
   - variable: image.tag
-    default: v0.1.6
+    default: v0.1.7
     description: Image tag
     type: string
     label: Image tag
diff --git a/charts/minecraft-server/templates/deployment.yaml b/charts/minecraft-server/templates/deployment.yaml
@@ -105,6 +105,8 @@ spec:
         ports:
         - name: minecraft
           containerPort: {{ .Values.service.port }}
+        - name: http
+          containerPort: 8080
         - name: metrics
           containerPort: {{ .Values.integrations.metrics.service.port }}
         readinessProbe: {{ toYaml .Values.readinessProbe | nindent 10 }}

diff --git a/charts/minecraft-server/templates/servicemonitor.yaml b/charts/minecraft-server/templates/servicemonitor.yaml
@@ -12,7 +12,7 @@ metadata:
     {{- end }}
 spec:
   endpoints:
-  - port: http
+  - port: metrics
     path: /metrics
     {{- with .Values.integrations.metrics.serviceMonitor.interval }}
     interval: {{ . }}

diff --git a/charts/minecraft-server/values.yaml b/charts/minecraft-server/values.yaml
@@ -437,7 +437,7 @@ resources:
 livenessProbe:
   httpGet:
     path: /health/live
-    port: metrics
+    port: http
   periodSeconds: 5
   timeoutSeconds: 1
   failureThreshold: 5
@@ -449,7 +449,7 @@ livenessProbe:
 readinessProbe:
   httpGet:
     path: /health/ready
-    port: metrics
+    port: http
   periodSeconds: 5
   timeoutSeconds: 1
   failureThreshold: 5
@@ -499,7 +499,7 @@ integrations:
       ## Kubernetes svc type
       ##
       type: ClusterIP
-      port: 8080
+      port: 9225
       ## Specify the nodePort value for the LoadBalancer and NodePort service types for the client port
       ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-nodeport
       ##