From 0ddc926ed4759992427fca64b1b157d9e304f121 Mon Sep 17 00:00:00 2001 From: Periyasamy Palanisamy Date: Thu, 19 Mar 2026 11:08:21 +0100 Subject: [PATCH 1/2] Fix FRR image override reverted by CNO reconciliation The CNO was still reconciling and reverting image changes after being set to Unmanaged. Restart the network-operator deployment and wait for it to complete before updating frr-k8s image. Signed-off-by: Periyasamy Palanisamy --- .../ovn/bgp/pre/baremetalds-e2e-ovn-bgp-pre-commands.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/ci-operator/step-registry/baremetalds/e2e/ovn/bgp/pre/baremetalds-e2e-ovn-bgp-pre-commands.sh b/ci-operator/step-registry/baremetalds/e2e/ovn/bgp/pre/baremetalds-e2e-ovn-bgp-pre-commands.sh index 5095d09801ff7..90170563821fe 100644 --- a/ci-operator/step-registry/baremetalds/e2e/ovn/bgp/pre/baremetalds-e2e-ovn-bgp-pre-commands.sh +++ b/ci-operator/step-registry/baremetalds/e2e/ovn/bgp/pre/baremetalds-e2e-ovn-bgp-pre-commands.sh @@ -12,6 +12,8 @@ set -o errexit set -o pipefail set -x +echo "[$(date +'%Y-%m-%d %H:%M:%S')] Starting baremetalds-e2e-ovn-bgp-pre setup" + FRR_K8S_VERSION=v0.0.21 FRR_TMP_DIR=$(mktemp -d -u) @@ -288,10 +290,15 @@ done # This is used while waiting for OCP builds with FRR 10. # This will be removed once OCP builds with FRR 10 are available. if [ -n "${FRR_IMAGE:-}" ]; then - echo "Overriding FRR-K8s frr and reloader containers with custom FRR image..." + echo "Setting CNO to Unmanaged and waiting for reconciliation to stop..." oc patch Network.operator.openshift.io cluster --type='merge' -p='{"spec":{"managementState":"Unmanaged"}}' + oc rollout restart deployment/network-operator -n openshift-network-operator + until oc rollout status deployment/network-operator -n openshift-network-operator --timeout=2m &> /dev/null; do + sleep 5 + done # Update the FRR and reloader container images + echo "Overriding FRR-K8s frr and reloader containers with custom FRR image..." oc set image daemonset/frr-k8s -n openshift-frr-k8s frr="${FRR_IMAGE}" reloader="${FRR_IMAGE}" echo "Waiting for daemonset 'frr-k8s' to rollout with new image..." From 91d4338ebf05d1f64608f76c467265636ea59654 Mon Sep 17 00:00:00 2001 From: Periyasamy Palanisamy Date: Fri, 20 Mar 2026 14:40:12 +0100 Subject: [PATCH 2/2] Avoid CNO restart that resets managementState to Managed Signed-off-by: Periyasamy Palanisamy --- .../bgp/pre/baremetalds-e2e-ovn-bgp-pre-commands.sh | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/ci-operator/step-registry/baremetalds/e2e/ovn/bgp/pre/baremetalds-e2e-ovn-bgp-pre-commands.sh b/ci-operator/step-registry/baremetalds/e2e/ovn/bgp/pre/baremetalds-e2e-ovn-bgp-pre-commands.sh index 90170563821fe..f5558b174d736 100644 --- a/ci-operator/step-registry/baremetalds/e2e/ovn/bgp/pre/baremetalds-e2e-ovn-bgp-pre-commands.sh +++ b/ci-operator/step-registry/baremetalds/e2e/ovn/bgp/pre/baremetalds-e2e-ovn-bgp-pre-commands.sh @@ -292,10 +292,14 @@ done if [ -n "${FRR_IMAGE:-}" ]; then echo "Setting CNO to Unmanaged and waiting for reconciliation to stop..." oc patch Network.operator.openshift.io cluster --type='merge' -p='{"spec":{"managementState":"Unmanaged"}}' - oc rollout restart deployment/network-operator -n openshift-network-operator - until oc rollout status deployment/network-operator -n openshift-network-operator --timeout=2m &> /dev/null; do - sleep 5 - done + # Wait for CNO to complete any in-flight reconciliation after being set to Unmanaged. + # Note: Cannot restart CNO deployment as it resets managementState back to Managed + # (tracked in https://redhat.atlassian.net/browse/OCPBUGS-78974). + sleep 60s + # oc rollout restart deployment/network-operator -n openshift-network-operator + # until oc rollout status deployment/network-operator -n openshift-network-operator --timeout=2m &> /dev/null; do + # sleep 5 + # done # Update the FRR and reloader container images echo "Overriding FRR-K8s frr and reloader containers with custom FRR image..."