From 8d7aed92eb3c40f0f393bedb5ad4fb5cd482a3dc Mon Sep 17 00:00:00 2001
From: Varac <varac@varac.net>
Date: Thu, 5 Dec 2019 14:44:57 +0100
Subject: [PATCH] Deploy app secrets to right namespace
---
ansible/roles/apps/tasks/cert-manager.yml | 1 +
ansible/roles/apps/tasks/flux_secret.yml | 2 +-
ansible/roles/apps/tasks/local-storage.yml | 1 +
ansible/roles/apps/tasks/nginx.yml | 1 +
ansible/roles/apps/tasks/prometheus.yml | 1 +
5 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/ansible/roles/apps/tasks/cert-manager.yml b/ansible/roles/apps/tasks/cert-manager.yml
index 7d78b5ac4..73757a6fc 100644
--- a/ansible/roles/apps/tasks/cert-manager.yml
+++ b/ansible/roles/apps/tasks/cert-manager.yml
@@ -53,4 +53,5 @@
vars:
flux:
name: "cert-manager-settings"
+ namespace: "oas"
include_tasks: flux_secret.yml
diff --git a/ansible/roles/apps/tasks/flux_secret.yml b/ansible/roles/apps/tasks/flux_secret.yml
index dcfc0e41d..23cac6b5b 100644
--- a/ansible/roles/apps/tasks/flux_secret.yml
+++ b/ansible/roles/apps/tasks/flux_secret.yml
@@ -10,7 +10,7 @@
api_version: v1
kind: Secret
metadata:
- namespace: "oas"
+ namespace: "{{ flux.namespace | default('oas-apps') }}"
name: "{{ flux.name }}"
data:
values.yaml: "{{ lookup('template','{{ flux.name }}.yaml') | b64encode }}"
diff --git a/ansible/roles/apps/tasks/local-storage.yml b/ansible/roles/apps/tasks/local-storage.yml
index b39bbd1da..99b67ed82 100644
--- a/ansible/roles/apps/tasks/local-storage.yml
+++ b/ansible/roles/apps/tasks/local-storage.yml
@@ -7,4 +7,5 @@
vars:
flux:
name: "local-storage-settings"
+ namespace: "oas"
include_tasks: flux_secret.yml
diff --git a/ansible/roles/apps/tasks/nginx.yml b/ansible/roles/apps/tasks/nginx.yml
index f206843a7..4e4f75bc6 100644
--- a/ansible/roles/apps/tasks/nginx.yml
+++ b/ansible/roles/apps/tasks/nginx.yml
@@ -8,4 +8,5 @@
vars:
flux:
name: "ingress-settings"
+ namespace: "oas"
include_tasks: flux_secret.yml
diff --git a/ansible/roles/apps/tasks/prometheus.yml b/ansible/roles/apps/tasks/prometheus.yml
index 08c09909c..2e2ef3987 100644
--- a/ansible/roles/apps/tasks/prometheus.yml
+++ b/ansible/roles/apps/tasks/prometheus.yml
@@ -40,4 +40,5 @@
vars:
flux:
name: "monitoring-settings"
+ namespace: "oas"
include_tasks: flux_secret.yml
--
GitLab