diff --git a/deploy/helm_charts/mixer/templates/deployment.yaml b/deploy/helm_charts/mixer/templates/deployment.yaml index 009490b2f..d631d370b 100644 --- a/deploy/helm_charts/mixer/templates/deployment.yaml +++ b/deploy/helm_charts/mixer/templates/deployment.yaml @@ -351,11 +351,22 @@ spec: - name: esp image: "{{ $.Values.esp.image.repository }}{{- if $.Values.esp.image.tag -}}:{{ $.Values.esp.image.tag }}{{- end }}" imagePullPolicy: {{ $.Values.esp.image.pullPolicy }} + {{- $espResources := $group.espResources | default dict }} + {{- $espGlobalResources := dict }} + {{- if $.Values.esp }} + {{- $espGlobalResources = $.Values.esp.resources | default dict }} + {{- end }} resources: limits: - memory: "300M" + memory: {{ $espResources.memoryLimit | default $espGlobalResources.memoryLimit | default "300M" | quote }} + {{- if or $espResources.cpuLimit $espGlobalResources.cpuLimit }} + cpu: {{ $espResources.cpuLimit | default $espGlobalResources.cpuLimit | quote }} + {{- end }} requests: - memory: "300M" + memory: {{ $espResources.memoryRequest | default $espGlobalResources.memoryRequest | default "300M" | quote }} + {{- if or $espResources.cpuRequest $espGlobalResources.cpuRequest }} + cpu: {{ $espResources.cpuRequest | default $espGlobalResources.cpuRequest | quote }} + {{- end }} volumeMounts: - mountPath: /etc/espv2_config name: service-config-volume diff --git a/deploy/helm_charts/mixer/values.yaml b/deploy/helm_charts/mixer/values.yaml index 765eb7de7..65fe5932b 100644 --- a/deploy/helm_charts/mixer/values.yaml +++ b/deploy/helm_charts/mixer/values.yaml @@ -366,11 +366,14 @@ esp: repository: gcr.io/endpoints-release/endpoints-runtime pullPolicy: IfNotPresent tag: "2" + resources: + memoryRequest: "300Mi" + memoryLimit: "300Mi" embeddingsSidecar: image: - # NOTE: This repository does not actually exist! - # It is an alias used by Skaffold to map the datacommons-nl image + # NOTE: This repository does not actually exist! + # It is an alias used by Skaffold to map the datacommons-nl image # (tagged as mixer-sidecar) to this specific sidecar container. # The actual image is injected by Cloud Build/Skaffold during deployment. repository: gcr.io/datcom-ci/datacommons-embeddings-sidecar @@ -434,8 +437,9 @@ serviceGroups: - "/v2/bulk/info/variable-group" replicas: 1 resources: - memoryRequest: "8G" - memoryLimit: "8G" + memoryRequest: "8Gi" + memoryLimit: "8Gi" + cpuRequest: "125m" cacheSVG: true # If the name of the recon service is changed here, # please also change the name in the deployment.yaml template. @@ -446,8 +450,9 @@ serviceGroups: - "/v2/resolve" replicas: 1 resources: - memoryRequest: "2G" - memoryLimit: "2G" + memoryRequest: "2Gi" + memoryLimit: "2Gi" + cpuRequest: "300m" observation: urlPaths: - "/bulk/stats" @@ -457,8 +462,13 @@ serviceGroups: - "/v2/observation" replicas: 1 resources: - memoryRequest: "4G" - memoryLimit: "8G" + memoryRequest: "8Gi" + memoryLimit: "8Gi" + cpuRequest: "1" + espResources: + # Higher memory to accomodate larger payloads + memoryRequest: "512Mi" + memoryLimit: "2Gi" node: urlPaths: - "/node/*" @@ -471,13 +481,15 @@ serviceGroups: - "/v2/node" replicas: 1 resources: - memoryRequest: "8G" - memoryLimit: "8G" + memoryRequest: "8Gi" + memoryLimit: "8Gi" + cpuRequest: "300m" cacheSVG: true default: urlPaths: - "/*" replicas: 1 resources: - memoryRequest: "2G" - memoryLimit: "2G" + memoryRequest: "2Gi" + memoryLimit: "2Gi" + cpuRequest: "50m"