From f27a34cd1c73dd1f80bba4c99f5a715135a8c830 Mon Sep 17 00:00:00 2001 From: jmferrer Date: Mon, 15 Oct 2018 18:27:49 +0200 Subject: [PATCH 1/2] Change openshift vars path. --- INSTALL.md | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/INSTALL.md b/INSTALL.md index 61b667368c..a4b7d3976d 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -119,12 +119,7 @@ To complete a deployment to OpenShift, you will obviously need access to an Open You will also need to have the `oc` command in your PATH. The `install.yml` playbook will call out to `oc` when logging into, and creating objects on the cluster. -The default resource requests per-pod requires: - -> Memory: 6GB -> CPU: 3 cores - -This can be tuned by overriding the variables found in [/installer/openshift/defaults/main.yml](/installer/openshift/defaults/main.yml). Special care should be taken when doing this as undersized instances will experience crashes and resource exhaustion. +The default resource requests per-pod can be tuned by overriding the variables found in [/installer/roles/kubernetes/defaults/main.yml](/installer/roles/kubernetes/defaults/main.yml). Special care should be taken when doing this as undersized instances will experience crashes and resource exhaustion. For more detail on how resource requests are formed see: [https://docs.openshift.com/container-platform/latest/dev_guide/compute_resources.html#dev-compute-resources](https://docs.openshift.com/container-platform/latest/dev_guide/compute_resources.html#dev-compute-resources) From d65a3fa037b5f4b7cfd3f60f45d6e9478d15e067 Mon Sep 17 00:00:00 2001 From: jmferrer Date: Tue, 16 Oct 2018 09:59:11 +0200 Subject: [PATCH 2/2] Restore per-deployment requirements. --- INSTALL.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/INSTALL.md b/INSTALL.md index a4b7d3976d..4af8aa29b4 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -119,7 +119,12 @@ To complete a deployment to OpenShift, you will obviously need access to an Open You will also need to have the `oc` command in your PATH. The `install.yml` playbook will call out to `oc` when logging into, and creating objects on the cluster. -The default resource requests per-pod can be tuned by overriding the variables found in [/installer/roles/kubernetes/defaults/main.yml](/installer/roles/kubernetes/defaults/main.yml). Special care should be taken when doing this as undersized instances will experience crashes and resource exhaustion. +The default resource requests per-deployment requires: + +> Memory: 6GB +> CPU: 3 cores + +This can be tuned by overriding the variables found in [/installer/roles/kubernetes/defaults/main.yml](/installer/roles/kubernetes/defaults/main.yml). Special care should be taken when doing this as undersized instances will experience crashes and resource exhaustion. For more detail on how resource requests are formed see: [https://docs.openshift.com/container-platform/latest/dev_guide/compute_resources.html#dev-compute-resources](https://docs.openshift.com/container-platform/latest/dev_guide/compute_resources.html#dev-compute-resources)