Merge pull request #2995 from coreywan/postgres_helm

adds persistence.storageClass and limits to postgress helm install

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]

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

installer/roles/kubernetes/tasks/main.yml

@@ -89,6 +89,9 @@
       --set persistence.size={{ pg_volume_capacity|default('5')}}Gi \
       --version="2.0.0" \
       --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 == ''