Skip to content

CNF-20883: Align templates frrk8s #2874

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

Jump to bottom
Open
andreaskaris wants to merge 1 commit into
base: master
Choose a base branch
from
Open

CNF-20883: Align templates frrk8s #2874

andreaskaris wants to merge 1 commit into from

Conversation

@andreaskaris
Copy link
Contributor

@andreaskaris andreaskaris commented Jan 12, 2026

Align frr-k8s templates with downsteam merge
openshift/frr#118

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Jan 12, 2026
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Jan 12, 2026 •
edited by openshift-ci bot
Loading

@andreaskaris: This pull request references CNF-20976 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the task to target the "4.22.0" version, but no target version was set.

Details

In response to this:

Align frr-k8s templates with downsteam merge
openshift/frr#118

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@coderabbitai
Copy link

coderabbitai bot commented Jan 12, 2026 •
edited
Loading

Walkthrough

Redirected FRR logging from a file to stdout and simplified the container startup by replacing a log-file wait-and-tail shell sequence with a direct /sbin/tini -- /usr/lib/frr/docker-start invocation.

Changes

Cohort / File(s) Summary
FRR config
bindata/network/frr-k8s/config.yaml		 Changed FRR logging destination from log file /etc/frr/frr.log informational to log stdout informational.
FRR Kubernetes manifest / startup
bindata/network/frr-k8s/frr-k8s.yaml		 Replaced multi-step shell command that waited for and tailed /etc/frr/frr.log with a single command: /sbin/tini -- /usr/lib/frr/docker-start. Removed related wait/tail logic and comments.

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~15 minutes

📜 Recent review details

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

Cache: Disabled due to data retention organization setting

Knowledge base: Disabled due to Reviews -> Disable Knowledge Base setting

📥 Commits

Reviewing files that changed from the base of the PR and between f9a57a7 and 5e9c628.

📒 Files selected for processing (2)
  • bindata/network/frr-k8s/config.yaml
  • bindata/network/frr-k8s/frr-k8s.yaml
🧰 Additional context used
📓 Path-based instructions (1)
**

⚙️ CodeRabbit configuration file

-Focus on major issues impacting performance, readability, maintainability and security. Avoid nitpicks and avoid verbosity.

Files:

  • bindata/network/frr-k8s/frr-k8s.yaml
  • bindata/network/frr-k8s/config.yaml
🔇 Additional comments (2)
bindata/network/frr-k8s/config.yaml (1)

98-98: LGTM!

Logging to stdout is the correct approach for containerized FRR. This aligns with Kubernetes logging conventions and eliminates the need for the previous log-file wait-and-tail workaround in the startup sequence.

bindata/network/frr-k8s/frr-k8s.yaml (1)

183-186: LGTM!

The simplified startup using tini as the init process is correct. Combined with TINI_SUBREAPER=true (line 172-173), this properly handles zombie process reaping and signal forwarding. Removing the log-wait-and-tail shell logic in favor of direct stdout logging is cleaner and eliminates potential race conditions.

Comment @coderabbitai help to get the list of available commands and usage tips.

@andreaskaris
Copy link
Contributor Author

andreaskaris commented Jan 12, 2026

/testwith openshift/frr#118

@openshift-ci openshift-ci bot requested review from bpickard22 and kyrtapz January 12, 2026 16:27
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jan 12, 2026

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: andreaskaris
Once this PR has been reviewed and has the lgtm label, please assign oribon for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@andreaskaris andreaskaris changed the title CNF-20976: Align templates frrk8s CNF-20883: Align templates frrk8s Jan 12, 2026
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Jan 12, 2026 •
edited by openshift-ci bot
Loading

@andreaskaris: This pull request references CNF-20883 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.22.0" version, but no target version was set.

Details

In response to this:

Align frr-k8s templates with downsteam merge
openshift/frr#118

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@andreaskaris
CNF-20883: Align templates frrk8s
5e9c628 
Align frr-k8s templates with downsteam merge
openshift/frr#118

Reported-at: https://issues.redhat.com/browse/CNF-20883
Signed-off-by: Andreas Karis <ak.karis@gmail.com>
@andreaskaris
Copy link
Contributor Author

andreaskaris commented Jan 13, 2026

/testwith openshift/cluster-network-operator/master/frrk8s-e2e openshift/frr#118

@andreaskaris
Copy link
Contributor Author

andreaskaris commented Jan 13, 2026

/test frrk8s-e2e

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jan 13, 2026

@andreaskaris: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/frrk8s-e2e 5e9c628 link false /test frrk8s-e2e
ci/prow/hypershift-e2e-aks 5e9c628 link true /test hypershift-e2e-aks
ci/prow/e2e-aws-ovn-serial-1of2 5e9c628 link true /test e2e-aws-ovn-serial-1of2
ci/prow/4.22-upgrade-from-stable-4.21-e2e-azure-ovn-upgrade 5e9c628 link false /test 4.22-upgrade-from-stable-4.21-e2e-azure-ovn-upgrade
ci/prow/security 5e9c628 link false /test security

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

@andreaskaris
Copy link
Contributor Author

andreaskaris commented Jan 13, 2026

/testwith openshift/cluster-network-operator/master/frrk8s-e2e openshift/frr#118

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jan 13, 2026

@andreaskaris, testwith: could not generate prow job. ERROR:

BUG: test 'hypershit-e2e-aks' not found in injected config

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jan 13, 2026

@andreaskaris, testwith: could not generate prow job. ERROR:

BUG: test 'e2e-aws-ovn-serial-1of2' not found in injected config

1 similar comment
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jan 13, 2026

@andreaskaris, testwith: could not generate prow job. ERROR:

BUG: test 'e2e-aws-ovn-serial-1of2' not found in injected config

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jan 13, 2026

@andreaskaris, testwith: could not generate prow job. ERROR:

BUG: test 'hypershit-e2e-aks' not found in injected config

@andreaskaris
Copy link
Contributor Author

andreaskaris commented Jan 13, 2026

/testwith openshift/cluster-network-operator/master/e2e-aws-ovn-serial-1of2 openshift/frr#118

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jan 13, 2026

@andreaskaris, testwith: could not generate prow job. ERROR:

BUG: test 'e2e-aws-ovn-serial-1of2' not found in injected config

@andreaskaris
Copy link
Contributor Author

andreaskaris commented Jan 13, 2026

/testwith openshift/cluster-network-operator/master/4.22-upgrade-from-stable-4.21-e2e-azure-ovn-upgrade openshift/frr#118

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jan 13, 2026

@andreaskaris, testwith: could not generate prow job. ERROR:

BUG: test '4.22-upgrade-from-stable-4.21-e2e-azure-ovn-upgrade' not found in injected config

@andreaskaris
Copy link
Contributor Author

andreaskaris commented Jan 13, 2026

/testwith openshift/cluster-network-operator/master/security openshift/frr#118

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@bpickard22 bpickard22 Awaiting requested review from bpickard22

@kyrtapz kyrtapz Awaiting requested review from kyrtapz

Assignees

No one assigned

Labels

jira/valid-reference Indicates that this PR references a valid Jira ticket of any type.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@andreaskaris @openshift-ci-robot