diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-10-20 16:57:58 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-20 16:57:58 -0400 |
| commit | ac2af73540c957aedd74e523646645cd36e8c130 (patch) | |
| tree | f6ebe672125033d50e329eb88bd46e7ae82b51c8 /roles/openshift_logging_mux/templates | |
| parent | e758bbe9739596f5e50b5a861198e5060d830d9b (diff) | |
| parent | 578ac5b348fa3e9c7d0d05e3a0f579839ecd79dd (diff) | |
| download | openshift-ac2af73540c957aedd74e523646645cd36e8c130.tar.gz openshift-ac2af73540c957aedd74e523646645cd36e8c130.tar.bz2 openshift-ac2af73540c957aedd74e523646645cd36e8c130.tar.xz openshift-ac2af73540c957aedd74e523646645cd36e8c130.zip | |
Merge pull request #5748 from portante/fix-cpu-limits
Use "requests" for CPU resources instead of limits
Diffstat (limited to 'roles/openshift_logging_mux/templates')
| -rw-r--r-- | roles/openshift_logging_mux/templates/mux.j2 | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/roles/openshift_logging_mux/templates/mux.j2 b/roles/openshift_logging_mux/templates/mux.j2 index 4cc48139f..7e88e3964 100644 --- a/roles/openshift_logging_mux/templates/mux.j2 +++ b/roles/openshift_logging_mux/templates/mux.j2 @@ -37,17 +37,26 @@ spec: - name: "mux" image: {{image}} imagePullPolicy: Always -{% if (mux_memory_limit is defined and mux_memory_limit is not none) or (mux_cpu_limit is defined and mux_cpu_limit is not none) %} +{% if (mux_memory_limit is defined and mux_memory_limit is not none) or (mux_cpu_limit is defined and mux_cpu_limit is not none) or (mux_cpu_request is defined and mux_cpu_request is not none) %} resources: +{% if (mux_memory_limit is defined and mux_memory_limit is not none) or (mux_cpu_limit is defined and mux_cpu_limit is not none) %} limits: -{% if mux_cpu_limit is not none %} +{% if mux_cpu_limit is not none %} cpu: "{{mux_cpu_limit}}" -{% endif %} -{% if mux_memory_limit is not none %} +{% endif %} +{% if mux_memory_limit is not none %} memory: "{{mux_memory_limit}}" +{% endif %} +{% endif %} +{% if (mux_memory_limit is defined and mux_memory_limit is not none) or (mux_cpu_request is defined and mux_cpu_request is not none) %} requests: +{% if mux_cpu_request is not none %} + cpu: "{{mux_cpu_request}}" +{% endif %} +{% if mux_memory_limit is not none %} memory: "{{mux_memory_limit}}" -{% endif %} +{% endif %} +{% endif %} {% endif %} ports: - containerPort: "{{ openshift_logging_mux_port }}" |