From 65546b42e60890ab8364b93b9508626d5d6c7f43 Mon Sep 17 00:00:00 2001 From: Jeff Geerling Date: Fri, 8 Nov 2019 16:51:38 -0600 Subject: [PATCH] Fixes #1: Add configuration files to task pod. --- roles/tower/templates/tower_postgres.yaml.j2 | 4 +-- roles/tower/templates/tower_rabbitmq.yaml.j2 | 2 +- roles/tower/templates/tower_task.yaml.j2 | 34 +++++++++++++++++++- 3 files changed, 36 insertions(+), 4 deletions(-) diff --git a/roles/tower/templates/tower_postgres.yaml.j2 b/roles/tower/templates/tower_postgres.yaml.j2 index 219b5e69..a58f21e9 100644 --- a/roles/tower/templates/tower_postgres.yaml.j2 +++ b/roles/tower/templates/tower_postgres.yaml.j2 @@ -4,9 +4,9 @@ apiVersion: v1 kind: Secret metadata: name: '{{ meta.name }}-postgres-pass' - namespace: {{ meta.namespace }} + namespace: '{{ meta.namespace }}' data: - password: {{ tower_postgres_pass | b64encode }} + password: '{{ tower_postgres_pass | b64encode }}' # Postgres StatefulSet. --- diff --git a/roles/tower/templates/tower_rabbitmq.yaml.j2 b/roles/tower/templates/tower_rabbitmq.yaml.j2 index 71c1481d..0aa4f5dd 100644 --- a/roles/tower/templates/tower_rabbitmq.yaml.j2 +++ b/roles/tower/templates/tower_rabbitmq.yaml.j2 @@ -4,7 +4,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: '{{ meta.name }}-rabbitmq' - namespace: {{ meta.namespace }} + namespace: '{{ meta.namespace }}' labels: app: tower-rabbitmq spec: diff --git a/roles/tower/templates/tower_task.yaml.j2 b/roles/tower/templates/tower_task.yaml.j2 index 6dccc97d..a9d3e51d 100644 --- a/roles/tower/templates/tower_task.yaml.j2 +++ b/roles/tower/templates/tower_task.yaml.j2 @@ -4,7 +4,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: '{{ meta.name }}-tower-task' - namespace: {{ meta.namespace }} + namespace: '{{ meta.namespace }}' labels: app: tower-task spec: @@ -25,3 +25,35 @@ spec: name: '{{ meta.name }}-tower-configmap' - secretRef: name: '{{ meta.name }}-tower-secret' + volumeMounts: + - name: secret-key + mountPath: /etc/tower/SECRET_KEY + subPath: SECRET_KEY + readOnly: true + - name: environment + mountPath: /etc/tower/conf.d/environment.sh + subPath: environment.sh + readOnly: true + - name: settings + mountPath: /etc/tower/settings.py + subPath: settings.py + readOnly: true + volumes: + - name: secret-key + secret: + secretName: '{{ meta.name }}-tower-secret' + items: + - key: secret_key + path: SECRET_KEY + - name: environment + configMap: + name: '{{ meta.name }}-tower-configmap' + items: + - key: environment + path: environment.sh + - name: settings + configMap: + name: '{{ meta.name }}-tower-configmap' + items: + - key: settings + path: settings.py