From 50b374daf79c68197c087ae704e7fd31c77e2d6e Mon Sep 17 00:00:00 2001 From: Matt Verran Date: Thu, 16 Jul 2026 13:08:43 +0100 Subject: [PATCH 1/2] fix: check for config in /etc/cni --- sunbeam-python/sunbeam/commands/prepare_node.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sunbeam-python/sunbeam/commands/prepare_node.py b/sunbeam-python/sunbeam/commands/prepare_node.py index 6009f3598..693db266b 100644 --- a/sunbeam-python/sunbeam/commands/prepare_node.py +++ b/sunbeam-python/sunbeam/commands/prepare_node.py @@ -96,6 +96,13 @@ /etc/environment done fi + +# Ensure there is no existing/leftover config in /etc/cni +# These will prevent k8s starting the load balancer if present +if [[ -d /etc/cni ]]; then + echo 'ERROR: existing CNI config detected in /etc/cni' + exit 1 +fi """ COMMON_TEMPLATE = f""" From ee137aac139b83301a95196fb1262b664dd8ddff Mon Sep 17 00:00:00 2001 From: Matt Verran Date: Thu, 16 Jul 2026 13:27:50 +0100 Subject: [PATCH 2/2] fix: change test approach --- sunbeam-python/sunbeam/commands/prepare_node.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sunbeam-python/sunbeam/commands/prepare_node.py b/sunbeam-python/sunbeam/commands/prepare_node.py index 693db266b..95f53accc 100644 --- a/sunbeam-python/sunbeam/commands/prepare_node.py +++ b/sunbeam-python/sunbeam/commands/prepare_node.py @@ -97,9 +97,10 @@ done fi -# Ensure there is no existing/leftover config in /etc/cni -# These will prevent k8s starting the load balancer if present -if [[ -d /etc/cni ]]; then +# Ensure there is no existing/leftover multus config in /etc/cni +# from testing amphora loadbalancer +# These will prevent k8s starting the k8s load balancer if present +if [[ $(sudo find /etc/cni -name '*multus*') ]]; then echo 'ERROR: existing CNI config detected in /etc/cni' exit 1 fi