Skip to content

Fix FRR image override reverted by CNO reconciliation #76529

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 2 commits into from
Mar 21, 2026
Merged

Fix FRR image override reverted by CNO reconciliation #76529

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0ddc926
Fix FRR image override reverted by CNO reconciliation
pperiyasamy Mar 19, 2026
91d4338
Avoid CNO restart that resets managementState to Managed
pperiyasamy Mar 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion ...perator/step-registry/baremetalds/e2e/ovn/bgp/pre/baremetalds-e2e-ovn-bgp-pre-commands.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down Expand Up @@ -288,10 +290,19 @@ 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"}}'
# 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..."
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..."
Expand Down