From 80b75a163a98eb45f6f79c1053144d723cde307b Mon Sep 17 00:00:00 2001 From: Martin Adema <_madema@pmgtansible.binckbank.nv> Date: Wed, 20 Nov 2019 14:15:59 +0100 Subject: [PATCH] Configurable image registry and service account for Postgres deployment. --- installer/inventory | 3 +++ .../kubernetes/templates/postgresql-values.yml.j2 | 15 +++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/installer/inventory b/installer/inventory index 5feb244cbf..28cfb62efc 100644 --- a/installer/inventory +++ b/installer/inventory @@ -22,6 +22,9 @@ dockerhub_base=ansible # kubernetes_namespace=awx # tiller_namespace=kube-system # Optional Kubernetes Variables +# pg_image_registry=docker.io +# pg_serviceaccount=awx +# pg_volume_capacity=5 # pg_persistence_storageClass=StorageClassName # pg_cpu_limit=1000 # pg_mem_limit=2 diff --git a/installer/roles/kubernetes/templates/postgresql-values.yml.j2 b/installer/roles/kubernetes/templates/postgresql-values.yml.j2 index fcf4a06d6b..83a0a1d578 100644 --- a/installer/roles/kubernetes/templates/postgresql-values.yml.j2 +++ b/installer/roles/kubernetes/templates/postgresql-values.yml.j2 @@ -31,3 +31,18 @@ master: {{ affinity | to_nice_yaml(indent=2) | indent(width=4, indentfirst=True) }} {% endif %} {% endif %} +{% if pg_image_registry is defined %} +image: + registry: {{ pg_image_registry }} +volumePermissions: + image: + registry: {{ pg_image_registry }} +metrics: + image: + registry: {{ pg_image_registry }} +{% endif %} +{% if pg_serviceaccount is defined %} +serviceAccount: + enabled: true + name: {{ pg_serviceaccount }} +{% endif %}