From acc40816b73d9b9924548c1bcd08a4f0f1d7e1f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20Bompard?= <aurelien@bompard.org>
Date: Tue, 3 Dec 2024 11:24:58 +0100
Subject: [PATCH] Rewrite prefixes when forwarding vars in openshift roles
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Aurélien Bompard <aurelien@bompard.org>
---
 roles/openshift/imagestream/tasks/main.yml | 1 +
 roles/openshift/keytab/tasks/main.yml      | 1 +
 roles/openshift/project/tasks/main.yml     | 7 +++++++
 roles/openshift/route/tasks/main.yml       | 1 +
 4 files changed, 10 insertions(+)

diff --git a/roles/openshift/imagestream/tasks/main.yml b/roles/openshift/imagestream/tasks/main.yml
index de82ba05ed..eda34bf69f 100644
--- a/roles/openshift/imagestream/tasks/main.yml
+++ b/roles/openshift/imagestream/tasks/main.yml
@@ -3,5 +3,6 @@
   include_role:
     name: openshift/object
   vars:
+    object_app: "{{imagestream_app}}"
     object_objectname: imagestream-{{imagestream_imagename}}.yml
     template_fullpath: "{{roles_path}}/openshift/imagestream/templates/imagestream.yml"
diff --git a/roles/openshift/keytab/tasks/main.yml b/roles/openshift/keytab/tasks/main.yml
index 9764f7187a..4914df2e25 100644
--- a/roles/openshift/keytab/tasks/main.yml
+++ b/roles/openshift/keytab/tasks/main.yml
@@ -3,6 +3,7 @@
   include_role:
     name: keytab/service
   vars:
+    object_app: "{{keytab_app}}"
     kt_location: "/etc/openshift_apps/{{keytab_app}}/{{keytab_key}}.kt"
 
 - name: Call `oc secrets new` on the copied file
diff --git a/roles/openshift/project/tasks/main.yml b/roles/openshift/project/tasks/main.yml
index a318b7fe51..61665eafa7 100644
--- a/roles/openshift/project/tasks/main.yml
+++ b/roles/openshift/project/tasks/main.yml
@@ -26,6 +26,7 @@
   include_role:
     name: openshift/object
   vars:
+    object_app: "{{project_app}}"
     object_objectname: deployer.yml
     object_template_fullpath: "{{roles_path}}/openshift/project/templates/deployer.yml"
 
@@ -33,6 +34,7 @@
   include_role:
     name: openshift/object
   vars:
+    object_app: "{{project_app}}"
     object_objectname: imagebuilder.yml
     object_template_fullpath: "{{roles_path}}/openshift/project/templates/imagebuilder.yml"
 
@@ -40,6 +42,7 @@
   include_role:
     name: openshift/object
   vars:
+    object_app: "{{project_app}}"
     object_objectname: imagepuller.yml
     object_template_fullpath: "{{roles_path}}/openshift/project/templates/imagepuller.yml"
 
@@ -47,6 +50,7 @@
   include_role:
     name: openshift/object
   vars:
+    object_app: "{{project_app}}"
     object_objectname: role-appowners.yml
     object_template_fullpath: "{{roles_path}}/openshift/project/templates/role-appowners.yml"
 
@@ -54,6 +58,7 @@
   include_role:
     name: openshift/object
   vars:
+    object_app: "{{project_app}}"
     object_objectname: appowners.yml
     object_template_fullpath: "{{roles_path}}/openshift/project/templates/appowners.yml"
 
@@ -61,6 +66,7 @@
   include_role:
     name: openshift/object
   vars:
+    object_app: "{{project_app}}"
     object_objectname: alertmanager.yml
     object_template_fullpath: "{{roles_path}}/openshift/project/templates/alertmanager.yml"
 
@@ -68,6 +74,7 @@
   include_role:
     name: openshift/object
   vars:
+    object_app: "{{project_app}}"
     object_objectname: prometheusRules.yml
     object_template_fullpath: "{{roles_path}}/openshift/project/templates/prometheusRules.yml"
   when: project_alerting
diff --git a/roles/openshift/route/tasks/main.yml b/roles/openshift/route/tasks/main.yml
index 1930a7310b..b30b04eea1 100644
--- a/roles/openshift/route/tasks/main.yml
+++ b/roles/openshift/route/tasks/main.yml
@@ -3,5 +3,6 @@
   include_role:
     name: openshift/object
   vars:
+    object_app: "{{route_app}}"
     object_objectname: route-{{route_routename}}.yml
     object_template_fullpath: "{{roles_path}}/openshift/route/templates/route.yml"