From 920f62a5ab945c7c3815bce53533b2e290704d0c Mon Sep 17 00:00:00 2001
From: Philippe Caseiro <pcaseiro@cadoles.com>
Date: Fri, 17 Mar 2023 11:32:26 +0100
Subject: [PATCH] fup maester must be in the same pod

---
 resources/hydra/kustomization.yaml                             | 1 +
 .../{ => hydra/resources}/hydra-maester/kustomization.yaml     | 0
 .../hydra-maester/resources/hydra-maester-deployment.yaml      | 3 +++
 .../resources}/hydra-maester/resources/hydra-maester-rbac.yaml | 0
 4 files changed, 4 insertions(+)
 rename resources/{ => hydra/resources}/hydra-maester/kustomization.yaml (100%)
 rename resources/{ => hydra/resources}/hydra-maester/resources/hydra-maester-deployment.yaml (94%)
 rename resources/{ => hydra/resources}/hydra-maester/resources/hydra-maester-rbac.yaml (100%)

diff --git a/resources/hydra/kustomization.yaml b/resources/hydra/kustomization.yaml
index c300b4b..4744cfb 100644
--- a/resources/hydra/kustomization.yaml
+++ b/resources/hydra/kustomization.yaml
@@ -8,6 +8,7 @@ resources:
   - ./resources/hydra-rolebinding.yaml
   - ./resources/hydra-serviceaccount.yaml
   - ./resources/hydra-migrate-job.yaml
+  - ./resources/hydra-maester
 
 secretGenerator:
   - name: hydra-secret
diff --git a/resources/hydra-maester/kustomization.yaml b/resources/hydra/resources/hydra-maester/kustomization.yaml
similarity index 100%
rename from resources/hydra-maester/kustomization.yaml
rename to resources/hydra/resources/hydra-maester/kustomization.yaml
diff --git a/resources/hydra-maester/resources/hydra-maester-deployment.yaml b/resources/hydra/resources/hydra-maester/resources/hydra-maester-deployment.yaml
similarity index 94%
rename from resources/hydra-maester/resources/hydra-maester-deployment.yaml
rename to resources/hydra/resources/hydra-maester/resources/hydra-maester-deployment.yaml
index 73da4e6..c4277a2 100644
--- a/resources/hydra-maester/resources/hydra-maester-deployment.yaml
+++ b/resources/hydra/resources/hydra-maester/resources/hydra-maester-deployment.yaml
@@ -28,6 +28,9 @@ spec:
         - name: hydra-maester
           image: reg.cadoles.com/proxy_cache/oryd/hydra-maester:v0.0.25
           imagePullPolicy: IfNotPresent
+          envFrom:
+            - configMapRef:
+                name: hydra-maester-env
           command:
             - /manager
           args:
diff --git a/resources/hydra-maester/resources/hydra-maester-rbac.yaml b/resources/hydra/resources/hydra-maester/resources/hydra-maester-rbac.yaml
similarity index 100%
rename from resources/hydra-maester/resources/hydra-maester-rbac.yaml
rename to resources/hydra/resources/hydra-maester/resources/hydra-maester-rbac.yaml