chore: adjust resource

This commit is contained in:
DarkSky
2026-02-10 14:41:43 +08:00
parent 52c7b04a01
commit 03b1d15a8f
4 changed files with 26 additions and 3 deletions

View File

@@ -25,7 +25,9 @@ const buildType = BUILD_TYPE || 'canary';
const isProduction = buildType === 'stable'; const isProduction = buildType === 'stable';
const isBeta = buildType === 'beta'; const isBeta = buildType === 'beta';
const isCanary = buildType === 'canary';
const isInternal = buildType === 'internal'; const isInternal = buildType === 'internal';
const isSpotEnabled = isBeta || isCanary;
const replicaConfig = { const replicaConfig = {
stable: { stable: {
@@ -72,6 +74,9 @@ const createHelmCommand = ({ isDryRun }) => {
`--set-string global.indexer.endpoint="${AFFINE_INDEXER_SEARCH_ENDPOINT}"`, `--set-string global.indexer.endpoint="${AFFINE_INDEXER_SEARCH_ENDPOINT}"`,
`--set-string global.indexer.apiKey="${AFFINE_INDEXER_SEARCH_API_KEY}"`, `--set-string global.indexer.apiKey="${AFFINE_INDEXER_SEARCH_API_KEY}"`,
]; ];
const cloudSqlNodeSelector = isBeta
? `{ \\"iam.gke.io/gke-metadata-server-enabled\\": \\"true\\", \\"cloud.google.com/gke-spot\\": \\"true\\" }`
: `{ \\"iam.gke.io/gke-metadata-server-enabled\\": \\"true\\" }`;
const serviceAnnotations = [ const serviceAnnotations = [
`--set-json front.serviceAccount.annotations="{ \\"iam.gke.io/gcp-service-account\\": \\"${APP_IAM_ACCOUNT}\\" }"`, `--set-json front.serviceAccount.annotations="{ \\"iam.gke.io/gcp-service-account\\": \\"${APP_IAM_ACCOUNT}\\" }"`,
`--set-json graphql.serviceAccount.annotations="{ \\"iam.gke.io/gcp-service-account\\": \\"${APP_IAM_ACCOUNT}\\" }"`, `--set-json graphql.serviceAccount.annotations="{ \\"iam.gke.io/gcp-service-account\\": \\"${APP_IAM_ACCOUNT}\\" }"`,
@@ -84,10 +89,18 @@ const createHelmCommand = ({ isDryRun }) => {
`--set-json front.services.renderer.annotations="{ \\"cloud.google.com/neg\\": \\"{\\\\\\"ingress\\\\\\": true}\\" }"`, `--set-json front.services.renderer.annotations="{ \\"cloud.google.com/neg\\": \\"{\\\\\\"ingress\\\\\\": true}\\" }"`,
`--set-json graphql.service.annotations="{ \\"cloud.google.com/neg\\": \\"{\\\\\\"ingress\\\\\\": true}\\" }"`, `--set-json graphql.service.annotations="{ \\"cloud.google.com/neg\\": \\"{\\\\\\"ingress\\\\\\": true}\\" }"`,
`--set-json cloud-sql-proxy.serviceAccount.annotations="{ \\"iam.gke.io/gcp-service-account\\": \\"${CLOUD_SQL_IAM_ACCOUNT}\\" }"`, `--set-json cloud-sql-proxy.serviceAccount.annotations="{ \\"iam.gke.io/gcp-service-account\\": \\"${CLOUD_SQL_IAM_ACCOUNT}\\" }"`,
`--set-json cloud-sql-proxy.nodeSelector="{ \\"iam.gke.io/gke-metadata-server-enabled\\": \\"true\\" }"`, `--set-json cloud-sql-proxy.nodeSelector="${cloudSqlNodeSelector}"`,
] ]
: [] : []
); );
const spotNodeSelector = `{ \\"cloud.google.com/gke-spot\\": \\"true\\" }`;
const spotScheduling = isSpotEnabled
? [
`--set-json front.nodeSelector="${spotNodeSelector}"`,
`--set-json graphql.nodeSelector="${spotNodeSelector}"`,
`--set-json doc.nodeSelector="${spotNodeSelector}"`,
]
: [];
const cpu = cpuConfig[buildType]; const cpu = cpuConfig[buildType];
const memory = memoryConfig[buildType]; const memory = memoryConfig[buildType];
@@ -146,6 +159,7 @@ const createHelmCommand = ({ isDryRun }) => {
`--set-string doc.app.host="${primaryHost}"`, `--set-string doc.app.host="${primaryHost}"`,
`--set doc.replicaCount=${replica.doc}`, `--set doc.replicaCount=${replica.doc}`,
...serviceAnnotations, ...serviceAnnotations,
...spotScheduling,
...resources, ...resources,
`--timeout 10m`, `--timeout 10m`,
flag, flag,

View File

@@ -30,9 +30,12 @@ podSecurityContext:
fsGroup: 2000 fsGroup: 2000
resources: resources:
requests: limits:
cpu: '1' cpu: '1'
memory: 4Gi memory: 4Gi
requests:
cpu: '1'
memory: 2Gi
probe: probe:
initialDelaySeconds: 20 initialDelaySeconds: 20

View File

@@ -29,6 +29,9 @@ podSecurityContext:
fsGroup: 2000 fsGroup: 2000
resources: resources:
limits:
cpu: '1'
memory: 2Gi
requests: requests:
cpu: '1' cpu: '1'
memory: 2Gi memory: 2Gi

View File

@@ -27,8 +27,11 @@ podSecurityContext:
fsGroup: 2000 fsGroup: 2000
resources: resources:
limits:
cpu: '1'
memory: 4Gi
requests: requests:
cpu: '2' cpu: '1'
memory: 2Gi memory: 2Gi
probe: probe: