From f7c88bdd0cd5fbd832e772a0abbdb7f5bb81be8a Mon Sep 17 00:00:00 2001 From: Michael Morello Date: Tue, 16 Jul 2019 11:07:41 +0200 Subject: [PATCH 01/11] Add resources and VPC templates documentation --- docs/managing-compute-resources.asciidoc | 112 +++++++++++++++++++++++ docs/volume-claim-templates.asciidoc | 2 + 2 files changed, 114 insertions(+) create mode 100644 docs/managing-compute-resources.asciidoc create mode 100644 docs/volume-claim-templates.asciidoc diff --git a/docs/managing-compute-resources.asciidoc b/docs/managing-compute-resources.asciidoc new file mode 100644 index 0000000000..63106ed22d --- /dev/null +++ b/docs/managing-compute-resources.asciidoc @@ -0,0 +1,112 @@ +[id="{p}-managing-compute-resources"] +== Managing compute resources + +When a Pod is created it may request CPU and RAM resources. It may also specify the maximum resources that the containers are allowed to consume. Both Pod `limits` and `requests` can be set in the object specifications. + +[float] +[id="{p}-default-behavior"] +=== Default behavior + +If there's no `resources` set in the specification of an object then no requests or limits will be applied on the pods, with the notable exception of Elasticsearch. +It is important to understand that by default, if no memory requirement is set in the specification of Elasticsearch then the operator will apply a default memory request of 2Gi. The reason is that it is critical for elasticsearch to have a minimum amount of memory to perform correctly. But this can be a problem if resources are managed at the namespace level with some LimitRanges and if a minimum memory constraints is imposed. + +For example you may want to apply a default request of 3Gi and enforce it as a minimum with a constraint: + +[source,yaml] +---- +apiVersion: v1 +kind: LimitRange +metadata: + name: default-mem-per-container +spec: + limits: + - min: + memory: "3Gi" + defaultRequest: + memory: "3Gi" + type: Container +---- + +But if there is no resources declared in the specification then The Pod can't be created and the following event is generated: + +................................... +default 0s Warning Unexpected elasticsearch/elasticsearch-sample Cannot create pod elasticsearch-sample-es-ldbgj48c7r: pods "elasticsearch-sample-es-ldbgj48c7r" is forbidden: minimum memory usage per Container is 3Gi, but request is 2Gi +................................... + +In order to solve this situation you can specify an empty `limits` section in the specification: + +[source,yaml] +---- +spec: + nodes: + - podTemplate: + spec: + containers: + - name: elasticsearch + resources: + # specify empty limits + limits: {} +---- + +The default `requests` will not be set by the operator and the Pod will be created. + +[float] +[id="{p}-custom-resources"] +=== Set custom resources + +The `resources` can be customized in the `podTemplate` of each object. + +Here is an example for Elasticsearch: + +[source,yaml] +---- +spec: + nodes: + - podTemplate: + spec: + containers: + - name: elasticsearch + env: + - name: ES_JAVA_OPTS + value: -Xms2048M -Xmx2048M + resources: + requests: + memory: 4Gi + cpu: 1 + limits: + memory: 4Gi + cpu: 1 +---- + +This example also demonstrates how to set the JVM memory options accordingly using the `ES_JAVA_OPTS` environment variable. + +The same apply for every object managed by the operator, here is how to set some custom resources for Kibana: + +[source,yaml] +---- +spec: + podTemplate: + spec: + containers: + - name: kibana + resources: + limits: + cpu: "1" + memory: 1Gi +---- + +And for the APM server: + +[source,yaml] +---- +spec: + podTemplate: + spec: + containers: + - name: apm-server + resources: + limits: + cpu: "1" + memory: 1Gi +---- + diff --git a/docs/volume-claim-templates.asciidoc b/docs/volume-claim-templates.asciidoc new file mode 100644 index 0000000000..e067d5420c --- /dev/null +++ b/docs/volume-claim-templates.asciidoc @@ -0,0 +1,2 @@ +[id="{p}-volume-claim-templates"] +== Volume Claim Templates \ No newline at end of file From 9d6b20b1a81f465baa368fe37c5482f121db09ba Mon Sep 17 00:00:00 2001 From: Michael Morello Date: Tue, 16 Jul 2019 12:50:48 +0200 Subject: [PATCH 02/11] merge volume claim template in ES spec documentation --- docs/elasticsearch-spec.asciidoc | 37 ++++++++++++++++++++++++++++ docs/volume-claim-templates.asciidoc | 2 -- 2 files changed, 37 insertions(+), 2 deletions(-) delete mode 100644 docs/volume-claim-templates.asciidoc diff --git a/docs/elasticsearch-spec.asciidoc b/docs/elasticsearch-spec.asciidoc index 8935e873e3..d6aceb68f2 100644 --- a/docs/elasticsearch-spec.asciidoc +++ b/docs/elasticsearch-spec.asciidoc @@ -50,6 +50,43 @@ spec: For more information on Elasticsearch settings, see https://www.elastic.co/guide/en/elasticsearch/reference/current/settings.html[Configuring Elasticsearch]. +[id="{p}-volume-claim-templates"] +== Volume Claim Templates + +By default the operator will create for each node in a cluster a `PVC` with a capacity of 1Gi. This is to ensure that there is no data loss if a Pod is deleted. + +You can customize the volume claim templates used by Elasticsearch to adjust the storage to your needs: + +[source,yaml] +---- +spec: + nodes: + - volumeClaimTemplates: + - metadata: + name: elasticsearch-data + spec: + accessModes: + - ReadWriteOnce + resources: + requests: + storage: 5Gi + storageClassName: standard +---- + +You may also want to use an `emptyDir` volume, this can be done by specifying the `elasticsearch-data` volume in the `podTemplate`: + +[source,yaml] +---- +spec: + nodes: + - config: + podTemplate: + spec: + volumes: + - name: elasticsearch-data + emptyDir: {} +---- + [id="{p}-http-settings-tls-sans"] === HTTP settings & TLS SANs diff --git a/docs/volume-claim-templates.asciidoc b/docs/volume-claim-templates.asciidoc deleted file mode 100644 index e067d5420c..0000000000 --- a/docs/volume-claim-templates.asciidoc +++ /dev/null @@ -1,2 +0,0 @@ -[id="{p}-volume-claim-templates"] -== Volume Claim Templates \ No newline at end of file From 0e8b5775b11d5c3b4f50f936a64ea93ab23e16df Mon Sep 17 00:00:00 2001 From: Michael Morello Date: Tue, 16 Jul 2019 13:03:59 +0200 Subject: [PATCH 03/11] switch sections --- docs/managing-compute-resources.asciidoc | 99 ++++++++++++------------ 1 file changed, 49 insertions(+), 50 deletions(-) diff --git a/docs/managing-compute-resources.asciidoc b/docs/managing-compute-resources.asciidoc index 63106ed22d..90d177b072 100644 --- a/docs/managing-compute-resources.asciidoc +++ b/docs/managing-compute-resources.asciidoc @@ -1,60 +1,13 @@ [id="{p}-managing-compute-resources"] == Managing compute resources -When a Pod is created it may request CPU and RAM resources. It may also specify the maximum resources that the containers are allowed to consume. Both Pod `limits` and `requests` can be set in the object specifications. - -[float] -[id="{p}-default-behavior"] -=== Default behavior - -If there's no `resources` set in the specification of an object then no requests or limits will be applied on the pods, with the notable exception of Elasticsearch. -It is important to understand that by default, if no memory requirement is set in the specification of Elasticsearch then the operator will apply a default memory request of 2Gi. The reason is that it is critical for elasticsearch to have a minimum amount of memory to perform correctly. But this can be a problem if resources are managed at the namespace level with some LimitRanges and if a minimum memory constraints is imposed. - -For example you may want to apply a default request of 3Gi and enforce it as a minimum with a constraint: - -[source,yaml] ----- -apiVersion: v1 -kind: LimitRange -metadata: - name: default-mem-per-container -spec: - limits: - - min: - memory: "3Gi" - defaultRequest: - memory: "3Gi" - type: Container ----- - -But if there is no resources declared in the specification then The Pod can't be created and the following event is generated: - -................................... -default 0s Warning Unexpected elasticsearch/elasticsearch-sample Cannot create pod elasticsearch-sample-es-ldbgj48c7r: pods "elasticsearch-sample-es-ldbgj48c7r" is forbidden: minimum memory usage per Container is 3Gi, but request is 2Gi -................................... - -In order to solve this situation you can specify an empty `limits` section in the specification: - -[source,yaml] ----- -spec: - nodes: - - podTemplate: - spec: - containers: - - name: elasticsearch - resources: - # specify empty limits - limits: {} ----- - -The default `requests` will not be set by the operator and the Pod will be created. +When a Pod is created it may request CPU and RAM resources. It may also specify the maximum resources that the containers are allowed to consume. Both Pod `limits` and `requests` can be set in the specification of any object managed by the operator (Elasticsearch, Kibana, APM server). For more information about how this is used by Kubernetes please see https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/[Managing Compute Resources for Containers] [float] [id="{p}-custom-resources"] === Set custom resources -The `resources` can be customized in the `podTemplate` of each object. +The `resources` can be customized in the `podTemplate` of an object. Here is an example for Elasticsearch: @@ -95,7 +48,7 @@ spec: memory: 1Gi ---- -And for the APM server: +And here is how to set custom resources on the APM server: [source,yaml] ---- @@ -110,3 +63,49 @@ spec: memory: 1Gi ---- +[float] +[id="{p}-default-behavior"] +=== Default behavior + +If there's no `resources` set in the specification of an object then no `requests` or `limits` will be applied on the containers, with the notable exception of Elasticsearch. +It is important to understand that by default, if no memory requirement is set in the specification of Elasticsearch then the operator will apply a default memory request of 2Gi. The reason is that it is critical for elasticsearch to have a minimum amount of memory to perform correctly. But this can be a problem if resources are https://kubernetes.io/docs/tasks/administer-cluster/manage-resources/memory-default-namespace/[managed with some LimitRanges at the namespace level] and if a minimum memory constraints is imposed. + +For example you may want to apply a default request of 3Gi and enforce it as a minimum with a constraint: + +[source,yaml] +---- +apiVersion: v1 +kind: LimitRange +metadata: + name: default-mem-per-container +spec: + limits: + - min: + memory: "3Gi" + defaultRequest: + memory: "3Gi" + type: Container +---- + +But if there is no `resources` declared in the specification then Pod can't be created and the following event is generated: + +................................... +default 0s Warning Unexpected elasticsearch/elasticsearch-sample Cannot create pod elasticsearch-sample-es-ldbgj48c7r: pods "elasticsearch-sample-es-ldbgj48c7r" is forbidden: minimum memory usage per Container is 3Gi, but request is 2Gi +................................... + +In order to solve this situation you can specify an empty `limits` section in the specification: + +[source,yaml] +---- +spec: + nodes: + - podTemplate: + spec: + containers: + - name: elasticsearch + resources: + # specify empty limits + limits: {} +---- + +The default `requests` will not be set by the operator and the Pod will be created. \ No newline at end of file From 5bb94b5302c90b821bea9879b4b6d29aac1f36c5 Mon Sep 17 00:00:00 2001 From: Michael Morello Date: Tue, 16 Jul 2019 13:10:39 +0200 Subject: [PATCH 04/11] Add managing-compute-resources.asciidoc to the index --- docs/index.asciidoc | 1 + docs/managing-compute-resources.asciidoc | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/index.asciidoc b/docs/index.asciidoc index fcd147c800..6214cf3d9c 100644 --- a/docs/index.asciidoc +++ b/docs/index.asciidoc @@ -10,4 +10,5 @@ include::overview.asciidoc[] include::k8s-quickstart.asciidoc[] include::accessing-services.asciidoc[] include::advanced-node-scheduling.asciidoc[] +include::managing-compute-resources.asciidoc[] include::snapshots.asciidoc[] diff --git a/docs/managing-compute-resources.asciidoc b/docs/managing-compute-resources.asciidoc index 90d177b072..2c86697c40 100644 --- a/docs/managing-compute-resources.asciidoc +++ b/docs/managing-compute-resources.asciidoc @@ -1,7 +1,7 @@ [id="{p}-managing-compute-resources"] == Managing compute resources -When a Pod is created it may request CPU and RAM resources. It may also specify the maximum resources that the containers are allowed to consume. Both Pod `limits` and `requests` can be set in the specification of any object managed by the operator (Elasticsearch, Kibana, APM server). For more information about how this is used by Kubernetes please see https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/[Managing Compute Resources for Containers] +When a Pod is created it may request CPU and RAM resources. It may also specify the maximum resources that the containers are allowed to consume. Both Pod `limits` and `requests` can be set in the specification of any object managed by the operator (Elasticsearch, Kibana or the APM server). For more information about how this is used by Kubernetes please see https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/[Managing Compute Resources for Containers] [float] [id="{p}-custom-resources"] From 15e77a76ab863a3a2a8240a031e42d6073983a52 Mon Sep 17 00:00:00 2001 From: Michael Morello Date: Tue, 16 Jul 2019 13:12:56 +0200 Subject: [PATCH 05/11] fix title level --- docs/elasticsearch-spec.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/elasticsearch-spec.asciidoc b/docs/elasticsearch-spec.asciidoc index d6aceb68f2..46d122d81c 100644 --- a/docs/elasticsearch-spec.asciidoc +++ b/docs/elasticsearch-spec.asciidoc @@ -51,7 +51,7 @@ spec: For more information on Elasticsearch settings, see https://www.elastic.co/guide/en/elasticsearch/reference/current/settings.html[Configuring Elasticsearch]. [id="{p}-volume-claim-templates"] -== Volume Claim Templates +=== Volume Claim Templates By default the operator will create for each node in a cluster a `PVC` with a capacity of 1Gi. This is to ensure that there is no data loss if a Pod is deleted. From fda08d7207d6adfa627bae6dbb9b04b46b7a88b3 Mon Sep 17 00:00:00 2001 From: Michael Morello Date: Tue, 16 Jul 2019 13:16:02 +0200 Subject: [PATCH 06/11] fix plur. --- docs/managing-compute-resources.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/managing-compute-resources.asciidoc b/docs/managing-compute-resources.asciidoc index 2c86697c40..76734690c7 100644 --- a/docs/managing-compute-resources.asciidoc +++ b/docs/managing-compute-resources.asciidoc @@ -68,7 +68,7 @@ spec: === Default behavior If there's no `resources` set in the specification of an object then no `requests` or `limits` will be applied on the containers, with the notable exception of Elasticsearch. -It is important to understand that by default, if no memory requirement is set in the specification of Elasticsearch then the operator will apply a default memory request of 2Gi. The reason is that it is critical for elasticsearch to have a minimum amount of memory to perform correctly. But this can be a problem if resources are https://kubernetes.io/docs/tasks/administer-cluster/manage-resources/memory-default-namespace/[managed with some LimitRanges at the namespace level] and if a minimum memory constraints is imposed. +It is important to understand that by default, if no memory requirement is set in the specification of Elasticsearch then the operator will apply a default memory request of 2Gi. The reason is that it is critical for elasticsearch to have a minimum amount of memory to perform correctly. But this can be a problem if resources are https://kubernetes.io/docs/tasks/administer-cluster/manage-resources/memory-default-namespace/[managed with some LimitRanges at the namespace level] and if a minimum memory constraint is imposed. For example you may want to apply a default request of 3Gi and enforce it as a minimum with a constraint: From cac6d8eb6b5d0061147a608be2b2b1fcf5c6147f Mon Sep 17 00:00:00 2001 From: Michael Morello Date: Tue, 16 Jul 2019 13:17:24 +0200 Subject: [PATCH 07/11] typo --- docs/managing-compute-resources.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/managing-compute-resources.asciidoc b/docs/managing-compute-resources.asciidoc index 76734690c7..beeddadb88 100644 --- a/docs/managing-compute-resources.asciidoc +++ b/docs/managing-compute-resources.asciidoc @@ -87,7 +87,7 @@ spec: type: Container ---- -But if there is no `resources` declared in the specification then Pod can't be created and the following event is generated: +But if there is no `resources` declared in the specification then the Pod can't be created and the following event is generated: ................................... default 0s Warning Unexpected elasticsearch/elasticsearch-sample Cannot create pod elasticsearch-sample-es-ldbgj48c7r: pods "elasticsearch-sample-es-ldbgj48c7r" is forbidden: minimum memory usage per Container is 3Gi, but request is 2Gi From c713cf1acb527b8471812b774b78e2a0aaafd575 Mon Sep 17 00:00:00 2001 From: Michael Morello Date: Tue, 16 Jul 2019 13:25:54 +0200 Subject: [PATCH 08/11] formatting --- docs/elasticsearch-spec.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/elasticsearch-spec.asciidoc b/docs/elasticsearch-spec.asciidoc index 46d122d81c..d34c0e756e 100644 --- a/docs/elasticsearch-spec.asciidoc +++ b/docs/elasticsearch-spec.asciidoc @@ -53,7 +53,7 @@ For more information on Elasticsearch settings, see https://www.elastic.co/guide [id="{p}-volume-claim-templates"] === Volume Claim Templates -By default the operator will create for each node in a cluster a `PVC` with a capacity of 1Gi. This is to ensure that there is no data loss if a Pod is deleted. +By default the operator will create a `PVC` with a capacity of 1Gi for every Pod in an Elasticsearch cluster. This is to ensure that there is no data loss if a Pod is deleted. You can customize the volume claim templates used by Elasticsearch to adjust the storage to your needs: From d49e72eb3d5ad60cfd04525fe9f0895574804100 Mon Sep 17 00:00:00 2001 From: Michael Morello Date: Wed, 17 Jul 2019 18:03:43 +0200 Subject: [PATCH 09/11] changes from review --- docs/elasticsearch-spec.asciidoc | 6 ++++-- docs/managing-compute-resources.asciidoc | 6 +++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/docs/elasticsearch-spec.asciidoc b/docs/elasticsearch-spec.asciidoc index d34c0e756e..c266466bd6 100644 --- a/docs/elasticsearch-spec.asciidoc +++ b/docs/elasticsearch-spec.asciidoc @@ -53,7 +53,7 @@ For more information on Elasticsearch settings, see https://www.elastic.co/guide [id="{p}-volume-claim-templates"] === Volume Claim Templates -By default the operator will create a `PVC` with a capacity of 1Gi for every Pod in an Elasticsearch cluster. This is to ensure that there is no data loss if a Pod is deleted. +By default the operator creates a `PVC` with a capacity of 1Gi for every Pod in an Elasticsearch cluster. This is to ensure that there is no data loss if a Pod is deleted. You can customize the volume claim templates used by Elasticsearch to adjust the storage to your needs: @@ -73,7 +73,7 @@ spec: storageClassName: standard ---- -You may also want to use an `emptyDir` volume, this can be done by specifying the `elasticsearch-data` volume in the `podTemplate`: +For some reasons you may want to use an `emptyDir` volume, this can be done by specifying the `elasticsearch-data` volume in the `podTemplate`: [source,yaml] ---- @@ -87,6 +87,8 @@ spec: emptyDir: {} ---- +Keep in mind that using `emptyDir` may result in data loss and is highly deprecated. + [id="{p}-http-settings-tls-sans"] === HTTP settings & TLS SANs diff --git a/docs/managing-compute-resources.asciidoc b/docs/managing-compute-resources.asciidoc index beeddadb88..3c6ec07bab 100644 --- a/docs/managing-compute-resources.asciidoc +++ b/docs/managing-compute-resources.asciidoc @@ -1,7 +1,7 @@ [id="{p}-managing-compute-resources"] == Managing compute resources -When a Pod is created it may request CPU and RAM resources. It may also specify the maximum resources that the containers are allowed to consume. Both Pod `limits` and `requests` can be set in the specification of any object managed by the operator (Elasticsearch, Kibana or the APM server). For more information about how this is used by Kubernetes please see https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/[Managing Compute Resources for Containers] +When a Pod is created it may request CPU and RAM resources. It may also specify the maximum resources that the containers are allowed to consume. Both Pod `limits` and `requests` can be set in the specification of any object managed by the operator (Elasticsearch, Kibana or the APM server). For more information about how this is used by Kubernetes please see https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/[Managing Compute Resources for Containers]. [float] [id="{p}-custom-resources"] @@ -33,7 +33,7 @@ spec: This example also demonstrates how to set the JVM memory options accordingly using the `ES_JAVA_OPTS` environment variable. -The same apply for every object managed by the operator, here is how to set some custom resources for Kibana: +The same applies for every object managed by the operator, here is how to set some custom resources for Kibana: [source,yaml] ---- @@ -68,7 +68,7 @@ spec: === Default behavior If there's no `resources` set in the specification of an object then no `requests` or `limits` will be applied on the containers, with the notable exception of Elasticsearch. -It is important to understand that by default, if no memory requirement is set in the specification of Elasticsearch then the operator will apply a default memory request of 2Gi. The reason is that it is critical for elasticsearch to have a minimum amount of memory to perform correctly. But this can be a problem if resources are https://kubernetes.io/docs/tasks/administer-cluster/manage-resources/memory-default-namespace/[managed with some LimitRanges at the namespace level] and if a minimum memory constraint is imposed. +It is important to understand that by default, if no memory requirement is set in the specification of Elasticsearch then the operator will apply a default memory request of 2Gi. The reason is that it is critical for Elasticsearch to have a minimum amount of memory to perform correctly. But this can be a problem if resources are https://kubernetes.io/docs/tasks/administer-cluster/manage-resources/memory-default-namespace/[managed with some LimitRanges at the namespace level] and if a minimum memory constraint is imposed. For example you may want to apply a default request of 3Gi and enforce it as a minimum with a constraint: From 65d8b6d5028e976c919934e695180dafe18da037 Mon Sep 17 00:00:00 2001 From: Michael Morello Date: Thu, 18 Jul 2019 08:08:21 +0200 Subject: [PATCH 10/11] changes from review --- docs/elasticsearch-spec.asciidoc | 6 +++--- docs/managing-compute-resources.asciidoc | 18 ++++++++++++------ 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/docs/elasticsearch-spec.asciidoc b/docs/elasticsearch-spec.asciidoc index c266466bd6..fa74183eb1 100644 --- a/docs/elasticsearch-spec.asciidoc +++ b/docs/elasticsearch-spec.asciidoc @@ -53,9 +53,9 @@ For more information on Elasticsearch settings, see https://www.elastic.co/guide [id="{p}-volume-claim-templates"] === Volume Claim Templates -By default the operator creates a `PVC` with a capacity of 1Gi for every Pod in an Elasticsearch cluster. This is to ensure that there is no data loss if a Pod is deleted. +By default the operator creates a https://kubernetes.io/docs/concepts/storage/persistent-volumes/[`PersistentVolumeClaim`] with a capacity of 1Gi for every Pod in an Elasticsearch cluster. This is to ensure that there is no data loss if a Pod is deleted. -You can customize the volume claim templates used by Elasticsearch to adjust the storage to your needs: +You can customize the volume claim templates used by Elasticsearch to adjust the storage to your needs, the name in the template must be `elasticsearch-data`: [source,yaml] ---- @@ -87,7 +87,7 @@ spec: emptyDir: {} ---- -Keep in mind that using `emptyDir` may result in data loss and is highly deprecated. +Keep in mind that using `emptyDir` may result in data loss and is not recommended. [id="{p}-http-settings-tls-sans"] === HTTP settings & TLS SANs diff --git a/docs/managing-compute-resources.asciidoc b/docs/managing-compute-resources.asciidoc index 3c6ec07bab..e33c971992 100644 --- a/docs/managing-compute-resources.asciidoc +++ b/docs/managing-compute-resources.asciidoc @@ -24,11 +24,11 @@ spec: value: -Xms2048M -Xmx2048M resources: requests: - memory: 4Gi + memory: 2Gi cpu: 1 limits: memory: 4Gi - cpu: 1 + cpu: 2 ---- This example also demonstrates how to set the JVM memory options accordingly using the `ES_JAVA_OPTS` environment variable. @@ -43,9 +43,12 @@ spec: containers: - name: kibana resources: - limits: - cpu: "1" + requests: memory: 1Gi + cpu: 1 + limits: + cpu: 2 + memory: 2Gi ---- And here is how to set custom resources on the APM server: @@ -58,9 +61,12 @@ spec: containers: - name: apm-server resources: - limits: - cpu: "1" + requests: memory: 1Gi + cpu: 1 + limits: + cpu: 2 + memory: 2Gi ---- [float] From 998e55b019fc9ac13000a6fa22bd6fc7269a2bf5 Mon Sep 17 00:00:00 2001 From: Michael Morello Date: Mon, 22 Jul 2019 07:29:06 +0200 Subject: [PATCH 11/11] update mem/cpu order --- docs/managing-compute-resources.asciidoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/managing-compute-resources.asciidoc b/docs/managing-compute-resources.asciidoc index e33c971992..1b337bae8f 100644 --- a/docs/managing-compute-resources.asciidoc +++ b/docs/managing-compute-resources.asciidoc @@ -47,8 +47,8 @@ spec: memory: 1Gi cpu: 1 limits: - cpu: 2 memory: 2Gi + cpu: 2 ---- And here is how to set custom resources on the APM server: @@ -65,8 +65,8 @@ spec: memory: 1Gi cpu: 1 limits: - cpu: 2 memory: 2Gi + cpu: 2 ---- [float]