From cd3bfbef96838cad33a835f77806678ecfdcad72 Mon Sep 17 00:00:00 2001
From: Hao Liu <haoli@redhat.com>
Date: Wed, 29 Mar 2023 20:20:13 -0400
Subject: [PATCH] Rename SUPERVISOR_WEB_CONFIG_PATH

SUPERVISOR_WEB_CONFIG_PATH is used in the old deployment for task container to reach into the web container and restart services

this is no longer possible/needed after splitting the deployment

renaming SUPERVISOR_WEB_CONFIG_PATH to SUPERVISOR_CONFIG_PATH
and setting it to the supervisor file for the container

this can still be useful to help run `supervisorctl -c $SUPERVISOR_CONFIG_PATH`
---
 roles/installer/templates/deployments/task.yaml.j2 | 6 +++---
 roles/installer/templates/deployments/web.yaml.j2  | 4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/roles/installer/templates/deployments/task.yaml.j2 b/roles/installer/templates/deployments/task.yaml.j2
index c9ac5bea..db3c59a9 100644
--- a/roles/installer/templates/deployments/task.yaml.j2
+++ b/roles/installer/templates/deployments/task.yaml.j2
@@ -240,8 +240,8 @@ spec:
           env:
             - name: AWX_COMPONENT
               value: "task"
-            - name: SUPERVISOR_WEB_CONFIG_PATH
-              value: "/etc/supervisord.conf"
+            - name: SUPERVISOR_CONFIG_PATH
+              value: "/etc/supervisord_task.conf"
             - name: AWX_SKIP_MIGRATIONS
               value: "1"
             - name: MY_POD_UID
@@ -361,7 +361,7 @@ spec:
               mountPath: "/awx_devel"
 {% endif %}
           env:
-            - name: SUPERVISOR_WEB_CONFIG_PATH
+            - name: SUPERVISOR_CONFIG_PATH
               value: "/etc/supervisor_rsyslog.conf"
 {% if development_mode | bool %}
             - name: AWX_KUBE_DEVEL
diff --git a/roles/installer/templates/deployments/web.yaml.j2 b/roles/installer/templates/deployments/web.yaml.j2
index 682f6322..b0ee702a 100644
--- a/roles/installer/templates/deployments/web.yaml.j2
+++ b/roles/installer/templates/deployments/web.yaml.j2
@@ -194,6 +194,8 @@ spec:
           env:
             - name: AWX_COMPONENT
               value: "web"
+            - name: SUPERVISOR_CONFIG_PATH
+              value: "/etc/supervisor_web.conf"
             - name: MY_POD_NAMESPACE
               valueFrom:
                 fieldRef:
@@ -243,7 +245,7 @@ spec:
               mountPath: "/awx_devel"
 {% endif %}
           env:
-            - name: SUPERVISOR_WEB_CONFIG_PATH
+            - name: SUPERVISOR_CONFIG_PATH
               value: "/etc/supervisor_rsyslog.conf"
 {% if development_mode | bool %}
             - name: AWX_KUBE_DEVEL