Skip to content
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.

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

pkg/ocicni: Use 'ifconfig -j' to access jail network state #180

Merged
merged 2 commits into from
Dec 14, 2023

Conversation

dfr
Copy link
Contributor

@dfr dfr commented Dec 10, 2023

The use of 'jexec' for this requires a compatible ifconfig binary inside the jail which owns the network state and using 'ifconfig -j' lets us merge the jail which owns the pod network with the infra container.

This also fixes some parsing bugs in getContainerDetails which were not noticed before since most of the time we get the information from cni's CheckNetworkList.

This is consistent with the other shell scripts in this directory and
lets ocicnitool build on FreeBSD.

Signed-off-by: Doug Rabson <[email protected]>
@openshift-ci openshift-ci bot added dco-signoff: yes Indicates the PR's author has DCO signed all their commits. do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Dec 10, 2023
@openshift-ci openshift-ci bot requested review from dcbw and saschagrunert December 10, 2023 13:20
@kwilczynski
Copy link
Member

/approve

@kwilczynski
Copy link
Member

/ok-to-test

@openshift-ci openshift-ci bot added the ok-to-test Indicates a non-member PR verified by an org member that is safe to test. label Dec 11, 2023
Copy link
Member

@saschagrunert saschagrunert left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/release-note-none

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Dec 11, 2023
Copy link
Contributor

openshift-ci bot commented Dec 11, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dfr, kwilczynski, saschagrunert

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

The pull request process is described here

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

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 11, 2023
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Dec 11, 2023
The use of 'jexec' for this requires a compatible ifconfig binary inside
the jail which owns the network state and using 'ifconfig -j' lets us
merge the jail which owns the pod network with the infra container.

This also fixes some parsing bugs in getContainerDetails which were not
noticed before since most of the time we get the information from cni's
CheckNetworkList.

Signed-off-by: Doug Rabson <[email protected]>
@kwilczynski
Copy link
Member

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Dec 14, 2023
@kwilczynski
Copy link
Member

/release-note-none

@openshift-ci openshift-ci bot added release-note-none Denotes a PR that doesn't merit a release note. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Dec 14, 2023
@openshift-merge-bot openshift-merge-bot bot merged commit e3223f5 into cri-o:master Dec 14, 2023
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. dco-signoff: yes Indicates the PR's author has DCO signed all their commits. lgtm Indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. release-note-none Denotes a PR that doesn't merit a release note.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants