cerc-io
/
stack-orchestrator
mirror of https://github.com/cerc-io/stack-orchestrator
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Fix helpers.py to use Caddy ingress instead of nginx 

The helm-charts-with-caddy branch had the Caddy manifest file but was still
using nginx in the code. This change:

- Switch install_ingress_for_kind() to use ingress-caddy-kind-deploy.yaml
- Update wait_for_ingress_in_kind() to watch caddy-system namespace
- Use correct label selector for Caddy ingress controller pods

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
helm-charts-with-caddy
A. F. Dudley 2026-01-22 03:22:07 -05:00
parent ffa00767d4
commit 97a85359ff
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
stack_orchestrator/deploy/k8s/helpers.py
View File

@ -71,8 +71,11 @@ def wait_for_ingress_in_kind():
w = watch.Watch() w = watch.Watch()
for event in w.stream( for event in w.stream(
func=core_v1.list_namespaced_pod, func=core_v1.list_namespaced_pod,
namespace="ingress-nginx", namespace="caddy-system",
label_selector="app.kubernetes.io/component=controller", label_selector=(
"app.kubernetes.io/name=caddy-ingress-controller,"
"app.kubernetes.io/component=controller"
),
timeout_seconds=30, timeout_seconds=30,
): ):
event_dict = cast(dict, event) event_dict = cast(dict, event)
@ -80,22 +83,22 @@ def wait_for_ingress_in_kind():
if pod and pod.status and pod.status.container_statuses: if pod and pod.status and pod.status.container_statuses:
if pod.status.container_statuses[0].ready is True: if pod.status.container_statuses[0].ready is True:
if warned_waiting: if warned_waiting:
print("Ingress controller is ready") print("Caddy ingress controller is ready")
return return
print("Waiting for ingress controller to become ready...") print("Waiting for Caddy ingress controller to become ready...")
warned_waiting = True warned_waiting = True
error_exit("ERROR: Timed out waiting for ingress to become ready") error_exit("ERROR: Timed out waiting for Caddy ingress to become ready")
def install_ingress_for_kind(): def install_ingress_for_kind():
api_client = client.ApiClient() api_client = client.ApiClient()
ingress_install = os.path.abspath( ingress_install = os.path.abspath(
get_k8s_dir().joinpath( get_k8s_dir().joinpath(
"components", "ingress", "ingress-nginx-kind-deploy.yaml" "components", "ingress", "ingress-caddy-kind-deploy.yaml"
) )
) )
if opts.o.debug: if opts.o.debug:
print("Installing nginx ingress controller in kind cluster") print("Installing Caddy ingress controller in kind cluster")
utils.create_from_yaml(api_client, yaml_file=ingress_install) utils.create_from_yaml(api_client, yaml_file=ingress_install)