From 0c074e09883ec28239e87eeb37312074e7aed754 Mon Sep 17 00:00:00 2001 From: Corey Wanless Date: Fri, 11 Jan 2019 19:54:05 -0600 Subject: [PATCH] * adds persistence.storageClass and limits to postgress helm install * adds new variables to the inventory Signed-off-by: Corey Wanless --- installer/inventory | 4 ++++ installer/roles/kubernetes/tasks/main.yml | 3 +++ 2 files changed, 7 insertions(+) diff --git a/installer/inventory b/installer/inventory index 847ba60a2c..f314e462d8 100644 --- a/installer/inventory +++ b/installer/inventory @@ -21,6 +21,10 @@ dockerhub_base=ansible # kubernetes_context=test-cluster # kubernetes_namespace=awx # tiller_namespace=kube-system +# Optional Kubernetes Variables +# pg_persistence_storageClass=StorageClassName +# pg_cpu_limit=1000 +# pg_mem_limit=2 # Kubernetes and Openshift Install Resource Requests # This is the request value for a pod's "task" container, which is the container diff --git a/installer/roles/kubernetes/tasks/main.yml b/installer/roles/kubernetes/tasks/main.yml index ec857ab2e4..f757587d7f 100644 --- a/installer/roles/kubernetes/tasks/main.yml +++ b/installer/roles/kubernetes/tasks/main.yml @@ -86,6 +86,9 @@ --set postgresqlDatabase={{ pg_database }} \ --set persistence.size={{ pg_volume_capacity|default('5')}}Gi \ --tiller-namespace={{ tiller_namespace | default('kube-system') }} \ + {{ '--set persistence.storageClass='+pg_persistence_storageClass if pg_persistence_storageClass is defined else ' ' }} \ + {{ '--set resources.limits.cpu='+(pg_cpu_limit | string)+'m' if pg_cpu_limit is defined else ' ' }} \ + {{ '--set resources.limits.memory='+(pg_mem_limit | string)+'Gi' if pg_mem_limit is defined else ' ' }} \ stable/postgresql when: - pg_hostname is not defined or pg_hostname == ''