kubernetes-sigs
/
kubespray
mirror of https://github.com/kubernetes-sigs/kubespray.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2653 from kidk/fixed-incorrect-mem-tag 

Replaced 'mem' with 'memory/ in elasticsearch and kibana deployment
pull/2726/head
Andreas Krüger 2018-04-30 09:14:15 +02:00 committed by GitHub
parent 06cdb260f6 296b92dbd4
commit 4fb8e6d455
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
roles/kubernetes-apps/efk/elasticsearch/templates/elasticsearch-deployment.yml.j2
View File

@ -30,12 +30,12 @@ spec:
limits: limits:
cpu: {{ elasticsearch_cpu_limit }} cpu: {{ elasticsearch_cpu_limit }}
{% if elasticsearch_mem_limit is defined and elasticsearch_mem_limit != "0M" %} {% if elasticsearch_mem_limit is defined and elasticsearch_mem_limit != "0M" %}
mem: {{ elasticsearch_mem_limit }} memory: "{{ elasticsearch_mem_limit }}"
{% endif %} {% endif %}
requests: requests:
cpu: {{ elasticsearch_cpu_requests }} cpu: {{ elasticsearch_cpu_requests }}
{% if elasticsearch_mem_requests is defined and elasticsearch_mem_requests != "0M" %} {% if elasticsearch_mem_requests is defined and elasticsearch_mem_requests != "0M" %}
mem: {{ elasticsearch_mem_requests }} memory: "{{ elasticsearch_mem_requests }}"
{% endif %} {% endif %}
ports: ports:
- containerPort: 9200 - containerPort: 9200

4
roles/kubernetes-apps/efk/kibana/templates/kibana-deployment.yml.j2
View File

@ -26,12 +26,12 @@ spec:
limits: limits:
cpu: {{ kibana_cpu_limit }} cpu: {{ kibana_cpu_limit }}
{% if kibana_mem_limit is defined and kibana_mem_limit != "0M" %} {% if kibana_mem_limit is defined and kibana_mem_limit != "0M" %}
mem: {{ kibana_mem_limit }} memory: "{{ kibana_mem_limit }}"
{% endif %} {% endif %}
requests: requests:
cpu: {{ kibana_cpu_requests }} cpu: {{ kibana_cpu_requests }}
{% if kibana_mem_requests is defined and kibana_mem_requests != "0M" %} {% if kibana_mem_requests is defined and kibana_mem_requests != "0M" %}
mem: {{ kibana_mem_requests }} memory: "{{ kibana_mem_requests }}"
{% endif %} {% endif %}
env: env:
- name: "ELASTICSEARCH_URL" - name: "ELASTICSEARCH_URL"