templates/composer: fix cpu request/limits
The fluentd sidecar had the same request/limit as the service container, and the migrate init-container had the fluentd request/limit. It should be the other way round.
This commit is contained in:
parent
5bb9d414a2
commit
3a9bcded32
1 changed files with 5 additions and 5 deletions
|
|
@ -127,10 +127,10 @@ objects:
|
||||||
name: fluentd-sidecar
|
name: fluentd-sidecar
|
||||||
resources:
|
resources:
|
||||||
requests:
|
requests:
|
||||||
cpu: "${CPU_REQUEST}"
|
cpu: "${FLUENTD_CPU_REQUEST}"
|
||||||
memory: "${MEMORY_REQUEST}"
|
memory: "${MEMORY_REQUEST}"
|
||||||
limits:
|
limits:
|
||||||
cpu: "${CPU_REQUEST}"
|
cpu: "${FLUENTD_CPU_LIMIT}"
|
||||||
memory: "${MEMORY_LIMIT}"
|
memory: "${MEMORY_LIMIT}"
|
||||||
env:
|
env:
|
||||||
- name: SPLUNK_HEC_TOKEN
|
- name: SPLUNK_HEC_TOKEN
|
||||||
|
|
@ -166,10 +166,10 @@ objects:
|
||||||
command: [ "/opt/migrate/tern", "migrate", "-m", "/opt/migrate/schemas" ]
|
command: [ "/opt/migrate/tern", "migrate", "-m", "/opt/migrate/schemas" ]
|
||||||
resources:
|
resources:
|
||||||
requests:
|
requests:
|
||||||
cpu: "${FLUENTD_CPU_REQUEST}"
|
cpu: "${CPU_REQUEST}"
|
||||||
memory: "${MEMORY_REQUEST}"
|
memory: "${MEMORY_REQUEST}"
|
||||||
limits:
|
limits:
|
||||||
cpu: "${FLUENTD_CPU_LIMIT}"
|
cpu: "${CPU_LIMIT}"
|
||||||
memory: "${MEMORY_LIMIT}"
|
memory: "${MEMORY_LIMIT}"
|
||||||
env:
|
env:
|
||||||
- name: PGHOST
|
- name: PGHOST
|
||||||
|
|
@ -481,7 +481,7 @@ parameters:
|
||||||
value: "50m"
|
value: "50m"
|
||||||
- name: FLUENTD_CPU_LIMIT
|
- name: FLUENTD_CPU_LIMIT
|
||||||
description: CPU limit per container
|
description: CPU limit per container
|
||||||
value: "50m"
|
value: "100m"
|
||||||
- name: MAINTENANCE_CPU_REQUEST
|
- name: MAINTENANCE_CPU_REQUEST
|
||||||
description: CPU request per container
|
description: CPU request per container
|
||||||
value: "50m"
|
value: "50m"
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue