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.

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

[release-4.11] OCPBUGS-1720: Backport changes to ovnkube-trace #1436

Merged
merged 10 commits into from Dec 23, 2022
Merged

[release-4.11] OCPBUGS-1720: Backport changes to ovnkube-trace #1436

merged 10 commits into from Dec 23, 2022

Conversation

andreaskaris
Copy link
Contributor

@andreaskaris andreaskaris commented Dec 12, 2022 •
edited

Minimal conflicts in a couple of cherry-picks due to b0efc6b landing out of order.

ovnkube-trace is exactly the same now as for 4.12:

[akaris@linux ovnkube-trace (OCPBUGS-1720b)]$ pwd
/home/akaris/development/ovn-kubernetes/go-controller/cmd/ovnkube-trace
[akaris@linux ovnkube-trace (OCPBUGS-1720b)]$ ll
total 48
-rw-r--r--. 1 akaris akaris 48971 Dec 12 21:33 ovnkube-trace.go
[akaris@linux ovnkube-trace (OCPBUGS-1720b)]$ git diff downstream/release-4.12 -- ovnkube-trace.go
[akaris@linux ovnkube-trace (OCPBUGS-1720b)]$

andreaskaris and others added 9 commits December 12, 2022 21:20
@andreaskaris
ovnkube-trace only: Replace node-role.kubernetes.io/master
e0df088 
As per kubernetes/kubernetes#107533 applied
in kubernetes 1.24, replace all occurences of
node-role.kubernetes.io/master with
node-role.kubernetes.io/control-plane

Cherry-pick for ovnkube-trace.go only

Signed-off-by: Riccardo Ravaioli <rravaiol@redhat.com>
(cherry picked from commit 1094ec9)

Signed-off-by: Andreas Karis <ak.karis@gmail.com>
@andreaskaris
Use ovs-vsctl find interface to find interface veth name
be525e3 
ovnkube-trace no longer depends on bash inside the application pod and
instead gets all information that it needs from ovs/ovn commands inside
the ovnkube-node pods.

Reported-at: https://bugzilla.redhat.com/show_bug.cgi?id=2066891
Signed-off-by: Andreas Karis <ak.karis@gmail.com>
(cherry picked from commit a8e23b3)
@andreaskaris
ovnkube-trace improvements and refactor
7f95e11 
Add color coding to ovnkube-trace output for better readability.
Refactor large parts of main() and remove code duplication.
Fix issues with host networked pods and shared gateway mode.

Signed-off-by: Andreas Karis <ak.karis@gmail.com>
(cherry picked from commit 9a01dc8)

Conflicts:
	go-controller/cmd/ovnkube-trace/ovnkube-trace.go
@andreaskaris
Allow tracing to an external IP address.
9a72e38 
Add parameter -dst-ip to allow users of ovnkube-trace to run a trace to
an external IP address.

Reported-at: SDN-2336 | [Debugging] ovnkube-trace improvements: Implement pod2external traffic in ovnkube-trace
Signed-off-by: Andreas Karis <ak.karis@gmail.com>
(cherry picked from commit 21e2c75)
@andreaskaris
ovnkube-trace: Fix ofproto/trace for IPv6
e79809a 
Reported-at: https://issues.redhat.com/browse/SDN-3573
Signed-off-by: Andreas Karis <ak.karis@gmail.com>
(cherry picked from commit 1598b33)
(cherry picked from commit 5e0fbbf)
@kyrtapz @andreaskaris
Adapt ovnkube-trace to work with external controlplane
4280daf 
 - to accommodate scenarios where ovnkube-master is not present in the namespace use ovnkube-node pod to detect the db addresses
 - use ovn-sbctl instead of ovn-nbctl to enable environments without nbdb connectivity
 - run ovn-detrace only if connectivity to nbdb is available

Signed-off-by: Patryk Diak <pdiak@redhat.com>
(cherry picked from commit 9162f25)
(cherry picked from commit c985498)
@andreaskaris
ovnkube-trace: Fix some linter issues
1da6707 
Fix issues raised by golint -min_confidence 0.8 for ovnkube-trace.

Signed-off-by: Andreas Karis <ak.karis@gmail.com>
(cherry picked from commit 69b0701)
(cherry picked from commit d00b57c)
@andreaskaris
ovnkube-trace: Fail gracefully on failed ovn-detrace dependency check
6a8b7cd 
Instead of exiting with an error, exit gracefully with an info message.

Signed-off-by: Andreas Karis <ak.karis@gmail.com>
(cherry picked from commit ec58dd0)
(cherry picked from commit 0dd014d)
@andreaskaris
ovnkube-trace: Add flag to skip ovn-detrace
1d5d270 
Signed-off-by: Andreas Karis <ak.karis@gmail.com>
(cherry picked from commit 273bc3e)
(cherry picked from commit 4de725f)
@openshift-ci-robot openshift-ci-robot added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. labels Dec 12, 2022
@openshift-ci-robot
Copy link
Contributor

@andreaskaris: This pull request references Jira Issue OCPBUGS-1720, which is valid. The bug has been moved to the POST state.

6 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.11.z) matches configured target version for branch (4.11.z)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
  • dependent bug Jira Issue OCPBUGS-4361 is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE))
  • dependent Jira Issue OCPBUGS-4361 targets the "4.12.0" version, which is one of the valid target versions: 4.12.0
  • bug has dependents

Requesting review from QA contact:
/cc @anuragthehatter

The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

- What this PR does and why is it needed

- Special notes for reviewers

- How to verify it

- Description for the changelog

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/test-infra repository.

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Dec 12, 2022

@andreaskaris: No Bugzilla bug is referenced in the title of this pull request.
To reference a bug, add 'Bug XXX:' to the title of this pull request and request another bug refresh with /bugzilla refresh.

Retaining the bugzilla/valid-bug label as it was manually added.

In response to this:

[release-4.11] OCPBUGS-1720: Backport changes to ovnkube-trace

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/test-infra repository.

@openshift-ci-robot
Copy link
Contributor

@andreaskaris: This pull request references Jira Issue OCPBUGS-1720, which is valid.

6 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.11.z) matches configured target version for branch (4.11.z)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)
  • dependent bug Jira Issue OCPBUGS-4361 is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE))
  • dependent Jira Issue OCPBUGS-4361 targets the "4.12.0" version, which is one of the valid target versions: 4.12.0
  • bug has dependents

Requesting review from QA contact:
/cc @anuragthehatter

In response to this:

Minimal conflicts in a couple of cherry-picks due b0efc6b landing out of order.

ovnkube-trace is exactly the same now as for 4.12:

[akaris@linux ovnkube-trace (OCPBUGS-1720b)]$ pwd
/home/akaris/development/ovn-kubernetes/go-controller/cmd/ovnkube-trace
[akaris@linux ovnkube-trace (OCPBUGS-1720b)]$ ll
total 48
-rw-r--r--. 1 akaris akaris 48971 Dec 12 21:33 ovnkube-trace.go
[akaris@linux ovnkube-trace (OCPBUGS-1720b)]$ git diff downstream/release-4.12 -- ovnkube-trace.go
[akaris@linux ovnkube-trace (OCPBUGS-1720b)]$

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/test-infra repository.

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Dec 12, 2022

@andreaskaris: No Bugzilla bug is referenced in the title of this pull request.
To reference a bug, add 'Bug XXX:' to the title of this pull request and request another bug refresh with /bugzilla refresh.

Retaining the bugzilla/valid-bug label as it was manually added.

In response to this:

[release-4.11] OCPBUGS-1720: Backport changes to ovnkube-trace

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/test-infra repository.

@openshift-ci-robot
Copy link
Contributor

@andreaskaris: This pull request references Jira Issue OCPBUGS-1720, which is valid.

6 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.11.z) matches configured target version for branch (4.11.z)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)
  • dependent bug Jira Issue OCPBUGS-4361 is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE))
  • dependent Jira Issue OCPBUGS-4361 targets the "4.12.0" version, which is one of the valid target versions: 4.12.0
  • bug has dependents

Requesting review from QA contact:
/cc @anuragthehatter

In response to this:

Minimal conflicts in a couple of cherry-picks due to b0efc6b landing out of order.

ovnkube-trace is exactly the same now as for 4.12:

[akaris@linux ovnkube-trace (OCPBUGS-1720b)]$ pwd
/home/akaris/development/ovn-kubernetes/go-controller/cmd/ovnkube-trace
[akaris@linux ovnkube-trace (OCPBUGS-1720b)]$ ll
total 48
-rw-r--r--. 1 akaris akaris 48971 Dec 12 21:33 ovnkube-trace.go
[akaris@linux ovnkube-trace (OCPBUGS-1720b)]$ git diff downstream/release-4.12 -- ovnkube-trace.go
[akaris@linux ovnkube-trace (OCPBUGS-1720b)]$

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/test-infra repository.

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Dec 12, 2022

@andreaskaris: No Bugzilla bug is referenced in the title of this pull request.
To reference a bug, add 'Bug XXX:' to the title of this pull request and request another bug refresh with /bugzilla refresh.

Retaining the bugzilla/valid-bug label as it was manually added.

In response to this:

[release-4.11] OCPBUGS-1720: Backport changes to ovnkube-trace

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/test-infra repository.

@andreaskaris
Add script that allows testing of ovnkube-trace
d83f95a 
Signed-off-by: Andreas Karis <ak.karis@gmail.com>
(cherry picked from commit 59818fb)
@andreaskaris
Copy link
Contributor Author

/retest-required

@dcbw
Copy link
Member

dcbw commented Dec 13, 2022

/approve
/lgtm

@openshift-ci openshift-ci bot added lgtm Indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Dec 13, 2022
@andreaskaris
Copy link
Contributor Author

/retest-required

3 similar comments
@andreaskaris
Copy link
Contributor Author

/retest-required

@andreaskaris
Copy link
Contributor Author

/retest-required

@andreaskaris
Copy link
Contributor Author

/retest-required

@andreaskaris
Copy link
Contributor Author

/retest-required

@andreaskaris
Copy link
Contributor Author

/retest

@jcaamano
Copy link
Contributor

/lgtm
/approve
/label backport-risk-assessed

@openshift-ci openshift-ci bot added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Dec 20, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Dec 20, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: andreaskaris, dcbw, jcaamano

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

@andreaskaris
Copy link
Contributor Author

/retest

@qiowang721
Copy link

/label cherry-pick-approved

@openshift-ci openshift-ci bot added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Dec 23, 2022
@openshift-ci-robot
Copy link
Contributor

/retest-required

Remaining retests: 0 against base HEAD beae3d0 and 2 for PR HEAD d83f95a in total

@andreaskaris
Copy link
Contributor Author

/retest-required

@andreaskaris
Copy link
Contributor Author

/retest

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Dec 23, 2022

@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/e2e-hypershift d83f95a link false /test e2e-hypershift
ci/prow/e2e-vsphere-windows d83f95a link false /test e2e-vsphere-windows

Full PR test history. Your PR dashboard.

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/test-infra repository. I understand the commands that are listed here.

@openshift-merge-robot openshift-merge-robot merged commit 76ab6e3 into openshift:release-4.11 Dec 23, 2022
@openshift-ci-robot
Copy link
Contributor

@andreaskaris: All pull requests linked via external trackers have merged:

Jira Issue OCPBUGS-1720 has been moved to the MODIFIED state.

In response to this:

Minimal conflicts in a couple of cherry-picks due to b0efc6b landing out of order.

ovnkube-trace is exactly the same now as for 4.12:

[akaris@linux ovnkube-trace (OCPBUGS-1720b)]$ pwd
/home/akaris/development/ovn-kubernetes/go-controller/cmd/ovnkube-trace
[akaris@linux ovnkube-trace (OCPBUGS-1720b)]$ ll
total 48
-rw-r--r--. 1 akaris akaris 48971 Dec 12 21:33 ovnkube-trace.go
[akaris@linux ovnkube-trace (OCPBUGS-1720b)]$ git diff downstream/release-4.12 -- ovnkube-trace.go
[akaris@linux ovnkube-trace (OCPBUGS-1720b)]$

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/test-infra repository.

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

@anuragthehatter anuragthehatter Awaiting requested review from anuragthehatter

@abhat abhat Awaiting requested review from abhat

@jcaamano jcaamano Awaiting requested review from jcaamano

Assignees

@mffiedler mffiedler

@rbbratta rbbratta

@dcbw dcbw

@weliang1 weliang1

@anuragthehatter anuragthehatter

@huiran0826 huiran0826

@asood-rh asood-rh

@jechen0648 jechen0648

@yingwang-0320 yingwang-0320

@qiowang721 qiowang721

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet