internet/awx-operator
3
0
Fork 0
mirror of https://github.com/ansible/awx-operator.git synced 2026-03-26 21:33:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename SUPERVISOR_WEB_CONFIG_PATH

Browse Source 
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`
This commit is contained in:
Hao Liu
2023-03-29 20:20:13 -04:00
parent 02328076e5
commit cd3bfbef96
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
roles/installer/templates/deployments/task.yaml.j2
View File

@@ -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

4
roles/installer/templates/deployments/web.yaml.j2
View File

@@ -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