From ba7dc4258d2c403adb50d1eb1f9834918f2e014e Mon Sep 17 00:00:00 2001
From: Ryan Lerch <rlerch@redhat.com>
Date: Thu, 21 Mar 2024 09:23:24 +1000
Subject: [PATCH] kerneltest: use kerneltest.fedoraproject.org instead

Signed-off-by: Ryan Lerch <rlerch@redhat.com>
---
 playbooks/include/proxies-reverseproxy.yml                    | 4 +---
 playbooks/openshift-apps/kerneltest.yml                       | 3 +--
 roles/openshift-apps/kerneltest/templates/client_secrets.json | 4 ++--
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/playbooks/include/proxies-reverseproxy.yml b/playbooks/include/proxies-reverseproxy.yml
index b20996630a..3d2e7338c4 100644
--- a/playbooks/include/proxies-reverseproxy.yml
+++ b/playbooks/include/proxies-reverseproxy.yml
@@ -244,10 +244,8 @@
     proxyurl: http://localhost:10032
 
   - role: httpd/reverseproxy
-    website: apps.fedoraproject.org
+    website: kerneltest{{ env_suffix }}.fedoraproject.org
     destname: kerneltest
-    remotepath: /kerneltest
-    localpath: /kerneltest
     balancer_name: apps-ocp
     balancer_members: "{{ (env == 'staging')|ternary(ocp_nodes_stg, ocp_nodes) }}"
     targettype: openshift
diff --git a/playbooks/openshift-apps/kerneltest.yml b/playbooks/openshift-apps/kerneltest.yml
index 61c7c9b2ff..cab886d4ae 100644
--- a/playbooks/openshift-apps/kerneltest.yml
+++ b/playbooks/openshift-apps/kerneltest.yml
@@ -95,8 +95,7 @@
   - role: openshift/route
     app: kerneltest
     routename: kerneltest
-    host: "apps{{ env_suffix }}.fedoraproject.org"
-    path: "/kerneltest"
+    host: "kerneltest{{ env_suffix }}.fedoraproject.org"
     serviceport: web
     servicename: kerneltest-web
     annotations:
diff --git a/roles/openshift-apps/kerneltest/templates/client_secrets.json b/roles/openshift-apps/kerneltest/templates/client_secrets.json
index 8ac3bebffb..885536c7b1 100644
--- a/roles/openshift-apps/kerneltest/templates/client_secrets.json
+++ b/roles/openshift-apps/kerneltest/templates/client_secrets.json
@@ -1,6 +1,6 @@
 {% if env == 'staging' %}
 {"web": {
-  "redirect_uris": ["https://apps.stg.fedoraproject.org/kerneltest/oidc_callback"],
+  "redirect_uris": ["https://kerneltest.stg.fedoraproject.org/oidc_callback"],
   "token_uri": "https://id.stg.fedoraproject.org/openidc/Token",
   "auth_uri": "https://id.stg.fedoraproject.org/openidc/Authorization",
   "client_id": "kerneltest-stg",
@@ -12,7 +12,7 @@
 }
 {% else %}
 {"web": {
-  "redirect_uris": ["https://apps.fedoraproject.org/kerneltest/oidc_callback"],
+  "redirect_uris": ["https://kerneltest.fedoraproject.org/oidc_callback"],
   "token_uri": "https://id.fedoraproject.org/openidc/Token",
   "auth_uri": "https://id.fedoraproject.org/openidc/Authorization",
   "client_id": "kerneltest",