HPA周りいじる

na2na-p · Jun 9, 2024 · 813bee8 · 813bee8
1 parent cf29bd9
commit 813bee8
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 7 deletions.
diff --git a/infra/k8s/web/templates/hpa.yaml b/infra/k8s/web/templates/hpa.yaml
@@ -8,10 +8,9 @@ metadata:
 spec:
   scaleTargetRef:
     apiVersion: apps/v1
-    kind: StatefulSet
+    kind: ReplicaSet
     name: {{ include "web.fullname" . }}
   minReplicas: {{ .Values.hpa.minReplicas }}
   maxReplicas: {{ .Values.hpa.maxReplicas }}
   targetCPUUtilizationPercentage: {{ .Values.hpa.targetCPUUtilizationPercentage }}
-  # targetMemoryUtilizationPercentage: {{ .Values.hpa.targetMemoryUtilizationPercentage }} # 必要に応じてコメントアウトを解除
 {{- end }}
diff --git a/infra/k8s/web/templates/replicaSet.yaml b/infra/k8s/web/templates/replicaSet.yaml
@@ -5,7 +5,6 @@ metadata:
   labels:
     {{- include "web.labels" . | nindent 4 }}
 spec:
-  replicas: {{ .Values.replicaCount }}
   selector:
     matchLabels:
       {{- include "web.selectorLabels" . | nindent 6 }}
@@ -30,6 +29,13 @@ spec:
               periodSeconds: 10
               path: /healthz
               port: 3000
+          resources:
+            requests:
+              cpu: {{ .Values.resources.requests.cpu }}
+              memory: {{ .Values.resources.requests.memory }}
+            limits:
+              cpu: {{ .Values.resources.limits.cpu }}
+              memory: {{ .Values.resources.limits.memory }}
           volumeMounts:
           - mountPath: /misskey/.config
             name: misskey-default-conf-file

diff --git a/infra/k8s/web/values.yaml b/infra/k8s/web/values.yaml
@@ -1,5 +1,3 @@
-replicaCount: 2
-
 image:
   repository: na2na/misskey-na2na
   tag: "2023.11.1-na2na-v4"
@@ -22,8 +20,6 @@ service:
   port: 3000
   nodePort: 30000
 
-resources: {}
-
 nodeSelector: {}
 
 tolerations: []
@@ -37,3 +33,11 @@ hpa:
   maxReplicas: 3
   targetCPUUtilizationPercentage: 80
   # targetMemoryUtilizationPercentage: 80 # 必要に応じてコメントアウトを解除
+
+resources:
+  requests:
+    cpu: 100m
+    memory: 1Gi
+  limits:
+    cpu: 1
+    memory: 2Gi