From 1deb5dbdb2b491e0a185ec7609121d7886841419 Mon Sep 17 00:00:00 2001 From: zetaloop Date: Wed, 6 May 2026 10:24:59 +0800 Subject: [PATCH] fix(k01): resource requests based on actual usage --- deploy/k01/infra/envoy.yaml | 6 +-- deploy/k01/infra/kafka.yaml | 28 ++++++------- deploy/k01/infra/mongo.yaml | 10 ++--- deploy/k01/infra/postgres.yaml | 44 ++++++++++---------- deploy/k01/infra/ratelimit.yaml | 12 +++--- deploy/k01/infra/redis.yaml | 72 ++++++++++++++++----------------- deploy/k01/install.sh | 16 ++++---- 7 files changed, 94 insertions(+), 94 deletions(-) diff --git a/deploy/k01/infra/envoy.yaml b/deploy/k01/infra/envoy.yaml index 561e91e..ae24d2e 100644 --- a/deploy/k01/infra/envoy.yaml +++ b/deploy/k01/infra/envoy.yaml @@ -1058,10 +1058,10 @@ spec: periodSeconds: 10 resources: requests: - cpu: 50m - memory: 128Mi + cpu: 30m + memory: 20Mi limits: - memory: 512Mi + memory: 120Mi volumes: - name: config configMap: diff --git a/deploy/k01/infra/kafka.yaml b/deploy/k01/infra/kafka.yaml index 4cab454..af1946d 100644 --- a/deploy/k01/infra/kafka.yaml +++ b/deploy/k01/infra/kafka.yaml @@ -16,12 +16,12 @@ spec: resources: requests: cpu: 30m - memory: 64Mi + memory: 200Mi limits: - memory: 768Mi + memory: 400Mi jvmOptions: - -Xms: "192M" - -Xmx: "384M" + -Xms: "128M" + -Xmx: "320M" --- apiVersion: kafka.strimzi.io/v1 @@ -42,12 +42,12 @@ spec: resources: requests: cpu: 50m - memory: 128Mi + memory: 350Mi limits: - memory: 1536Mi + memory: 600Mi jvmOptions: - -Xms: "256M" - -Xmx: "1024M" + -Xms: "192M" + -Xmx: "512M" --- apiVersion: kafka.strimzi.io/v1 @@ -77,17 +77,17 @@ spec: topicOperator: resources: requests: - cpu: 20m - memory: 80Mi + cpu: 15m + memory: 130Mi limits: - memory: 256Mi + memory: 250Mi userOperator: resources: requests: - cpu: 20m - memory: 80Mi + cpu: 15m + memory: 130Mi limits: - memory: 256Mi + memory: 250Mi --- apiVersion: kafka.strimzi.io/v1 diff --git a/deploy/k01/infra/mongo.yaml b/deploy/k01/infra/mongo.yaml index c3ee582..d0c7958 100644 --- a/deploy/k01/infra/mongo.yaml +++ b/deploy/k01/infra/mongo.yaml @@ -31,16 +31,16 @@ spec: resources: requests: cpu: 30m - memory: 100Mi + memory: 80Mi limits: - memory: 1Gi + memory: 400Mi - name: mongodb-agent resources: requests: - cpu: 30m - memory: 80Mi + cpu: 20m + memory: 35Mi limits: - memory: 200Mi + memory: 100Mi volumeClaimTemplates: - metadata: name: data-volume diff --git a/deploy/k01/infra/postgres.yaml b/deploy/k01/infra/postgres.yaml index 1935eb3..6933a3d 100644 --- a/deploy/k01/infra/postgres.yaml +++ b/deploy/k01/infra/postgres.yaml @@ -16,9 +16,9 @@ spec: resources: requests: cpu: 30m - memory: 30Mi + memory: 50Mi limits: - memory: 1Gi + memory: 200Mi --- apiVersion: postgresql.cnpg.io/v1 @@ -39,9 +39,9 @@ spec: resources: requests: cpu: 30m - memory: 30Mi + memory: 50Mi limits: - memory: 1Gi + memory: 200Mi --- apiVersion: postgresql.cnpg.io/v1 @@ -62,9 +62,9 @@ spec: resources: requests: cpu: 30m - memory: 30Mi + memory: 50Mi limits: - memory: 1Gi + memory: 200Mi --- apiVersion: postgresql.cnpg.io/v1 @@ -85,9 +85,9 @@ spec: resources: requests: cpu: 30m - memory: 30Mi + memory: 50Mi limits: - memory: 1Gi + memory: 200Mi --- apiVersion: postgresql.cnpg.io/v1 @@ -108,9 +108,9 @@ spec: resources: requests: cpu: 30m - memory: 30Mi + memory: 50Mi limits: - memory: 1Gi + memory: 200Mi --- apiVersion: postgresql.cnpg.io/v1 @@ -131,9 +131,9 @@ spec: resources: requests: cpu: 30m - memory: 30Mi + memory: 50Mi limits: - memory: 1Gi + memory: 200Mi --- apiVersion: postgresql.cnpg.io/v1 @@ -154,9 +154,9 @@ spec: resources: requests: cpu: 30m - memory: 30Mi + memory: 50Mi limits: - memory: 1Gi + memory: 200Mi --- apiVersion: postgresql.cnpg.io/v1 @@ -177,9 +177,9 @@ spec: resources: requests: cpu: 30m - memory: 30Mi + memory: 50Mi limits: - memory: 1Gi + memory: 200Mi --- apiVersion: postgresql.cnpg.io/v1 @@ -200,9 +200,9 @@ spec: resources: requests: cpu: 30m - memory: 30Mi + memory: 50Mi limits: - memory: 1Gi + memory: 200Mi --- apiVersion: postgresql.cnpg.io/v1 @@ -223,9 +223,9 @@ spec: resources: requests: cpu: 30m - memory: 30Mi + memory: 50Mi limits: - memory: 1Gi + memory: 200Mi --- apiVersion: postgresql.cnpg.io/v1 @@ -246,6 +246,6 @@ spec: resources: requests: cpu: 30m - memory: 30Mi + memory: 50Mi limits: - memory: 1Gi + memory: 200Mi diff --git a/deploy/k01/infra/ratelimit.yaml b/deploy/k01/infra/ratelimit.yaml index 8b0bd79..7332f77 100644 --- a/deploy/k01/infra/ratelimit.yaml +++ b/deploy/k01/infra/ratelimit.yaml @@ -61,10 +61,10 @@ spec: - containerPort: 6379 resources: requests: - cpu: 20m - memory: 32Mi + cpu: 10m + memory: 10Mi limits: - memory: 64Mi + memory: 60Mi --- apiVersion: v1 @@ -130,10 +130,10 @@ spec: mountPath: /data/ratelimit/config resources: requests: - cpu: 20m - memory: 64Mi + cpu: 10m + memory: 10Mi limits: - memory: 256Mi + memory: 60Mi volumes: - name: config configMap: diff --git a/deploy/k01/infra/redis.yaml b/deploy/k01/infra/redis.yaml index 553f70c..7ff91ca 100644 --- a/deploy/k01/infra/redis.yaml +++ b/deploy/k01/infra/redis.yaml @@ -10,10 +10,10 @@ spec: imagePullPolicy: IfNotPresent resources: requests: - cpu: 10m - memory: 24Mi + cpu: 5m + memory: 10Mi limits: - memory: 1Gi + memory: 80Mi redisSecret: name: user-redis key: password @@ -41,10 +41,10 @@ spec: imagePullPolicy: IfNotPresent resources: requests: - cpu: 10m - memory: 24Mi + cpu: 5m + memory: 10Mi limits: - memory: 1Gi + memory: 80Mi redisSecret: name: player-redis key: password @@ -72,10 +72,10 @@ spec: imagePullPolicy: IfNotPresent resources: requests: - cpu: 10m - memory: 24Mi + cpu: 5m + memory: 10Mi limits: - memory: 1Gi + memory: 80Mi redisSecret: name: game-redis key: password @@ -103,10 +103,10 @@ spec: imagePullPolicy: IfNotPresent resources: requests: - cpu: 10m - memory: 24Mi + cpu: 5m + memory: 10Mi limits: - memory: 1Gi + memory: 80Mi redisSecret: name: shop-redis key: password @@ -134,10 +134,10 @@ spec: imagePullPolicy: IfNotPresent resources: requests: - cpu: 10m - memory: 24Mi + cpu: 5m + memory: 10Mi limits: - memory: 1Gi + memory: 80Mi redisSecret: name: order-redis key: password @@ -165,10 +165,10 @@ spec: imagePullPolicy: IfNotPresent resources: requests: - cpu: 10m - memory: 24Mi + cpu: 5m + memory: 10Mi limits: - memory: 1Gi + memory: 80Mi redisSecret: name: wallet-redis key: password @@ -196,10 +196,10 @@ spec: imagePullPolicy: IfNotPresent resources: requests: - cpu: 10m - memory: 24Mi + cpu: 5m + memory: 10Mi limits: - memory: 1Gi + memory: 80Mi redisSecret: name: community-redis key: password @@ -227,10 +227,10 @@ spec: imagePullPolicy: IfNotPresent resources: requests: - cpu: 10m - memory: 24Mi + cpu: 5m + memory: 10Mi limits: - memory: 1Gi + memory: 80Mi redisSecret: name: review-redis key: password @@ -258,10 +258,10 @@ spec: imagePullPolicy: IfNotPresent resources: requests: - cpu: 10m - memory: 24Mi + cpu: 5m + memory: 10Mi limits: - memory: 1Gi + memory: 80Mi redisSecret: name: dispute-redis key: password @@ -289,10 +289,10 @@ spec: imagePullPolicy: IfNotPresent resources: requests: - cpu: 10m - memory: 24Mi + cpu: 5m + memory: 10Mi limits: - memory: 1Gi + memory: 80Mi redisSecret: name: notification-redis key: password @@ -320,10 +320,10 @@ spec: imagePullPolicy: IfNotPresent resources: requests: - cpu: 10m - memory: 24Mi + cpu: 5m + memory: 10Mi limits: - memory: 1Gi + memory: 80Mi redisSecret: name: search-redis key: password @@ -351,10 +351,10 @@ spec: imagePullPolicy: IfNotPresent resources: requests: - cpu: 10m - memory: 24Mi + cpu: 5m + memory: 10Mi limits: - memory: 1Gi + memory: 80Mi redisSecret: name: chat-redis key: password diff --git a/deploy/k01/install.sh b/deploy/k01/install.sh index 742bad9..01eaee3 100755 --- a/deploy/k01/install.sh +++ b/deploy/k01/install.sh @@ -80,14 +80,14 @@ kubectl apply -f "${K01_DIR}/base/" kubectl apply --server-side --force-conflicts -f \ "https://github.com/cloudnative-pg/cloudnative-pg/releases/download/v${CNPG_VERSION}/cnpg-${CNPG_VERSION}.yaml" kubectl -n cnpg-system set resources deploy/cnpg-controller-manager \ - --requests=cpu=50m,memory=64Mi --limits=cpu=200m,memory=256Mi + --requests=cpu=30m,memory=40Mi --limits=cpu=200m,memory=200Mi kubectl create namespace kafka 2>/dev/null || true curl -sfL "https://github.com/strimzi/strimzi-kafka-operator/releases/download/${STRIMZI_VERSION}/strimzi-cluster-operator-${STRIMZI_VERSION}.yaml" \ | sed 's/namespace: .*/namespace: kafka/' \ | kubectl apply --server-side --force-conflicts -n kafka -f - kubectl -n kafka set resources deploy/strimzi-cluster-operator \ - --requests=cpu=50m,memory=200Mi --limits=cpu=500m,memory=500Mi + --requests=cpu=50m,memory=200Mi --limits=cpu=500m,memory=400Mi helm repo add ot-helm https://ot-container-kit.github.io/helm-charts/ 2>/dev/null || true helm repo add mongodb https://mongodb.github.io/helm-charts 2>/dev/null || true @@ -96,19 +96,19 @@ helm repo update helm upgrade --install redis-operator ot-helm/redis-operator \ --version "${REDIS_OP_VERSION}" \ --namespace redis-operator --create-namespace \ - --set resources.requests.cpu=50m \ - --set resources.requests.memory=100Mi \ + --set resources.requests.cpu=20m \ + --set resources.requests.memory=30Mi \ --set resources.limits.cpu=500m \ - --set resources.limits.memory=500Mi + --set resources.limits.memory=150Mi helm upgrade --install mongodb-kubernetes mongodb/mongodb-kubernetes \ --version "${MONGODB_OP_VERSION}" \ --namespace mongodb-operator --create-namespace \ --set operator.watchNamespace=juwan \ - --set operator.resources.requests.cpu=50m \ - --set operator.resources.requests.memory=100Mi \ + --set operator.resources.requests.cpu=30m \ + --set operator.resources.requests.memory=50Mi \ --set operator.resources.limits.cpu=500m \ - --set operator.resources.limits.memory=300Mi + --set operator.resources.limits.memory=200Mi kubectl -n cnpg-system rollout status deploy/cnpg-controller-manager --timeout=300s kubectl -n kafka rollout status deploy/strimzi-cluster-operator --timeout=300s