From 0b96d617ac41697b1cdeaf7c271dea47aa2be6b5 Mon Sep 17 00:00:00 2001 From: Rick Elrod Date: Tue, 13 Dec 2022 15:07:15 -0600 Subject: [PATCH] Fix BROADCAST_WEBSOCKET_PORT for Kube dev (#13243) - `settings/minikube.py` gets imported conditionally, when the environment variable `AWX_KUBE_DEVEL` is set. In this imported file, we set `BROADCAST_WEBSOCKET_PORT = 8013`, but 8013 is only used in the docker-compose dev environment. In Kubernetes environments, 8052 is used for everything. This is hardcoded awx-operator's ConfigMap. - Also rename `minikube.py` because it is used for every kind of development Kube environment, including Kind. Signed-off-by: Rick Elrod --- awx/settings/development.py | 2 +- awx/settings/{minikube.py => development_kube.py} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename awx/settings/{minikube.py => development_kube.py} (80%) diff --git a/awx/settings/development.py b/awx/settings/development.py index bd76582aa6..1be4b72956 100644 --- a/awx/settings/development.py +++ b/awx/settings/development.py @@ -114,7 +114,7 @@ if 'sqlite3' not in DATABASES['default']['ENGINE']: # noqa # this needs to stay at the bottom of this file try: if os.getenv('AWX_KUBE_DEVEL', False): - include(optional('minikube.py'), scope=locals()) + include(optional('development_kube.py'), scope=locals()) else: include(optional('local_*.py'), scope=locals()) except ImportError: diff --git a/awx/settings/minikube.py b/awx/settings/development_kube.py similarity index 80% rename from awx/settings/minikube.py rename to awx/settings/development_kube.py index 0ac81875bc..c30a7fe025 100644 --- a/awx/settings/minikube.py +++ b/awx/settings/development_kube.py @@ -1,4 +1,4 @@ BROADCAST_WEBSOCKET_SECRET = '🤖starscream🤖' -BROADCAST_WEBSOCKET_PORT = 8013 +BROADCAST_WEBSOCKET_PORT = 8052 BROADCAST_WEBSOCKET_VERIFY_CERT = False BROADCAST_WEBSOCKET_PROTOCOL = 'http'