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

SDN-4930: networksegmentation, udn: Wait for NetworkCreated or NetworkReady condition #29381

Merged
merged 1 commit into from
Jan 9, 2025
Merged

SDN-4930: networksegmentation, udn: Wait for NetworkCreated or NetworkReady condition #29381

merged 1 commit into from
Jan 9, 2025

Conversation

ormergi
Copy link
Contributor

@ormergi ormergi commented Dec 17, 2024

Following the incoming changes of UserDefinedNetwork CRD condition type [1], tests that assert on the NetworkReady condition type should take in account the renamed type NetworkCreated to avoid CI breakage in the following scenarios:

  • Production code changes reached D/S before tests code changes: Having the UDN CRD produce the new condition type (NetworkCreated), while e2e tests assert on the old condition type (NetworkReady).
  • Tests code changes reached D/S before production code changes: Having the UDN CRD produce the old condition type (NetworkReady), while tests assert on the new condition type (NetworkCreated).

Change assertions on UDN condition type NetworkReady, expect condition type NetworkReady or NetworkCreated.

[1] ovn-kubernetes/ovn-kubernetes#4884

@ormergi
networksegmentation, udn: Wait for NetworkCreated or NetworkReady con…
00deba7 
…dition

Following the incoming changes of UserDefinedNetwork CRD condition type
[1], tests that assert on the NetworkReady condition type should
take in account the renamed type NetworkCreated to avoid CI breakage
in the following scenarios:
- Production code changes reached D/S before tests code changes:
  Having the UDN CRD produce the new condition type (NetworkCreated),
  while e2e tests assert on the old condition type (NetworkReady).
- Tests code changes reached D/S before production code changes:
  Having the UDN CRD produce the old condition type (NetworkReady),
  while tests assert on the new condition type (NetworkCreated).

Change assertions on UDN condition type NetworkReady, expect condition type
NetworkReady or NetworkCreated.

[1] ovn-kubernetes/ovn-kubernetes#4884

Signed-off-by: Or Mergi <[email protected]>
@ormergi
Copy link
Contributor Author

ormergi commented Dec 17, 2024

/cc @npinaeva

@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Dec 17, 2024 •
edited
Loading

@ormergi: 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-aws-ovn-single-node-serial 00deba7 link false /test e2e-aws-ovn-single-node-serial
ci/prow/e2e-aws-ovn-single-node-upgrade 00deba7 link false /test e2e-aws-ovn-single-node-upgrade
ci/prow/okd-scos-e2e-aws-ovn 00deba7 link false /test okd-scos-e2e-aws-ovn
ci/prow/e2e-aws-ovn-cgroupsv2 00deba7 link false /test e2e-aws-ovn-cgroupsv2

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

@npinaeva
Copy link
Member

we should run this after ovn-k d/s merge is done to make sure the test works, otherwise it lgtm

@ormergi ormergi mentioned this pull request Dec 20, 2024
Merged
5 tasks
@ormergi
Copy link
Contributor Author

ormergi commented Dec 20, 2024 •
edited
Loading

we should run this after ovn-k d/s merge is done to make sure the test works, otherwise it lgtm

I think the U/S PR wont pass on D/S w/o this PR changes, the D/S merge PR wont pass D/S CI

@npinaeva
Copy link
Member

yep, you can build a cluster with cluster-bot using an ovn-k PR (d/s merge or your own tmp PR) with the status change and run this test against it

@tssurya
Copy link
Contributor

tssurya commented Jan 6, 2025

@ormergi : did you have a chance to test this with a sample DS PR?

@ormergi
Copy link
Contributor Author

ormergi commented Jan 6, 2025 •
edited
Loading

@tssurya @npinaeva
Verified the affected tests (listed below) against OCP 4.18, cluster was built using bits from original PR openshift/ovn-kubernetes#2405 and openshift/api#1997.

[sig-network][OCPFeatureGate:NetworkSegmentation][Feature:UserDefinedPrimaryNetworks] EndpointSlices mirroring when using openshift ovn-kubernetes created using UserDefinedNetwork does not mirror EndpointSlices in namespaces not using user defined primary networks L2 dualstack primary UDN [Suite:openshift/conformance/parallel]
[sig-network][OCPFeatureGate:NetworkSegmentation][Feature:UserDefinedPrimaryNetworks] EndpointSlices mirroring when using openshift ovn-kubernetes created using UserDefinedNetwork does not mirror EndpointSlices in namespaces not using user defined primary networks L3 dualstack primary UDN [Suite:openshift/conformance/parallel]
[sig-network][OCPFeatureGate:NetworkSegmentation][Feature:UserDefinedPrimaryNetworks] EndpointSlices mirroring when using openshift ovn-kubernetes created using UserDefinedNetwork mirrors EndpointSlices managed by the default controller for namespaces with user defined primary networks L2 primary UDN, cluster-networked pods [Suite:openshift/conformance/parallel]
[sig-network][OCPFeatureGate:NetworkSegmentation][Feature:UserDefinedPrimaryNetworks] EndpointSlices mirroring when using openshift ovn-kubernetes created using UserDefinedNetwork mirrors EndpointSlices managed by the default controller for namespaces with user defined primary networks L3 primary UDN, host-networked pods [Suite:openshift/conformance/parallel]
[sig-network][OCPFeatureGate:NetworkSegmentation][Feature:UserDefinedPrimaryNetworks] EndpointSlices mirroring when using openshift ovn-kubernetes created using UserDefinedNetwork mirrors EndpointSlices managed by the default controller for namespaces with user defined primary networks L2 primary UDN, host-networked pods [Suite:openshift/conformance/parallel]
[sig-network][OCPFeatureGate:NetworkSegmentation][Feature:UserDefinedPrimaryNetworks] EndpointSlices mirroring when using openshift ovn-kubernetes created using UserDefinedNetwork mirrors EndpointSlices managed by the default controller for namespaces with user defined primary networks L3 primary UDN, cluster-networked pods [Suite:openshift/conformance/parallel]
[sig-network][OCPFeatureGate:NetworkSegmentation][Feature:UserDefinedPrimaryNetworks] when using openshift ovn-kubernetes UserDefinedNetwork pod connected to UserDefinedNetwork cannot be deleted when being used [Suite:openshift/conformance/parallel]
[sig-network][OCPFeatureGate:NetworkSegmentation][Feature:UserDefinedPrimaryNetworks] when using openshift ovn-kubernetes UserDefinedNetwork should create NetworkAttachmentDefinition according to spec [Suite:openshift/conformance/parallel]
[sig-network][OCPFeatureGate:NetworkSegmentation][Feature:UserDefinedPrimaryNetworks] when using openshift ovn-kubernetes UserDefinedNetwork should delete NetworkAttachmentDefinition when UserDefinedNetwork is deleted [Suite:openshift/conformance/parallel]
[sig-network][OCPFeatureGate:NetworkSegmentation][Feature:UserDefinedPrimaryNetworks] when using openshift ovn-kubernetes created using UserDefinedNetwork can perform east/west traffic between nodes for two pods connected over a L2 primary UDN [Suite:openshift/conformance/parallel]
[sig-network][OCPFeatureGate:NetworkSegmentation][Feature:UserDefinedPrimaryNetworks] when using openshift ovn-kubernetes created using UserDefinedNetwork can perform east/west traffic between nodes two pods connected over a L3 primary UDN [Suite:openshift/conformance/parallel]
[sig-network][OCPFeatureGate:NetworkSegmentation][Feature:UserDefinedPrimaryNetworks] when using openshift ovn-kubernetes created using UserDefinedNetwork is isolated from the default network with L2 primary UDN [Suite:openshift/conformance/parallel]
[sig-network][OCPFeatureGate:NetworkSegmentation][Feature:UserDefinedPrimaryNetworks] when using openshift ovn-kubernetes created using UserDefinedNetwork is isolated from the default network with L3 primary UDN [Suite:openshift/conformance/parallel]
[sig-network][OCPFeatureGate:NetworkSegmentation][Feature:UserDefinedPrimaryNetworks] when using openshift ovn-kubernetes created using UserDefinedNetwork isolates overlapping CIDRs with L2 primary UDN [Suite:openshift/conformance/parallel]
[sig-network][OCPFeatureGate:NetworkSegmentation][Feature:UserDefinedPrimaryNetworks] when using openshift ovn-kubernetes created using UserDefinedNetwork isolates overlapping CIDRs with L3 primary UDN [Suite:openshift/conformance/parallel]
[sig-network][OCPFeatureGate:NetworkSegmentation][Feature:UserDefinedPrimaryNetworks] when using openshift ovn-kubernetes when primary network exist, UserDefinedNetwork status should report not-ready [Suite:openshift/conformance/parallel]

tssurya
tssurya approved these changes Jan 7, 2025
View reviewed changes
Copy link
Contributor

@tssurya tssurya left a comment

Choose a reason for hiding this comment

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

/lgtm

let's also make sure we revert this change later on after our required PRs merge
this needs to be backported also to 4.18/4.17 in the same order

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jan 7, 2025
@tssurya
Copy link
Contributor

tssurya commented Jan 7, 2025

/test e2e-gcp-ovn-techpreview

@tssurya
Copy link
Contributor

tssurya commented Jan 7, 2025

/payload-job periodic-ci-openshift-release-master-nightly-4.19-e2e-aws-ovn-hypershift-conformance-techpreview
/payload-job periodic-ci-openshift-release-master-nightly-4.19-e2e-azure-ovn-techpreview
/payload-job periodic-ci-openshift-release-master-nightly-4.19-e2e-metal-ipi-ovn-dualstack-techpreview
/payload-job periodic-ci-openshift-release-master-nightly-4.19-e2e-vsphere-ovn-techpreview
/payload-job periodic-ci-openshift-release-master-nightly-4.19-e2e-aws-ovn-techpreview
/payload-job periodic-ci-openshift-release-master-nightly-4.19-e2e-gcp-ovn-techpreview
/payload-job periodic-ci-openshift-release-master-nightly-4.19-e2e-metal-ipi-ovn-techpreview

@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Jan 7, 2025

@tssurya: trigger 3 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command

  • periodic-ci-openshift-release-master-nightly-4.19-e2e-metal-ipi-ovn-dualstack-techpreview
  • periodic-ci-openshift-release-master-nightly-4.19-e2e-vsphere-ovn-techpreview
  • periodic-ci-openshift-release-master-nightly-4.19-e2e-metal-ipi-ovn-techpreview

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/524eb8e0-ccc1-11ef-9a15-e97806386c3b-0

@tssurya
Copy link
Contributor

tssurya commented Jan 7, 2025

/payload-job periodic-ci-openshift-release-master-nightly-4.19-e2e-metal-ipi-ovn-ipv6-techpreview

@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Jan 7, 2025

@tssurya: trigger 1 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command

  • periodic-ci-openshift-release-master-nightly-4.19-e2e-metal-ipi-ovn-ipv6-techpreview

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/789f8790-ccc1-11ef-9dfb-a16a526a77ad-0

trozet
trozet approved these changes Jan 8, 2025
View reviewed changes
Copy link
Contributor

@trozet trozet left a comment

Choose a reason for hiding this comment

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

/approve

@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Jan 8, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ormergi, trozet, tssurya

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 Jan 8, 2025
@ormergi
Copy link
Contributor Author

ormergi commented Jan 8, 2025

The payload job https://pr-payload-tests.ci.openshift.org/runs/ci/789f8790-ccc1-11ef-9dfb-a16a526a77ad-0 failed due to unrelated reasons of this PR changes.
The relevant UDN CRD tests passed.

@tssurya
Copy link
Contributor

tssurya commented Jan 8, 2025 •
edited by openshift-ci bot
Loading

/retitle SDN-4930: networksegmentation, udn: Wait for NetworkCreated or NetworkReady condition

@openshift-ci openshift-ci bot changed the title networksegmentation, udn: Wait for NetworkCreated or NetworkReady condition SDN-4930: networksegmentation, udn: Wait for NetworkCreated or NetworkReady condition Jan 8, 2025
@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 8, 2025
@openshift-ci-robot
Copy link

openshift-ci-robot commented Jan 8, 2025 •
edited by openshift-ci bot
Loading

@ormergi: This pull request references SDN-4930 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 epic to target either version "4.19." or "openshift-4.19.", but it targets "openshift-4.18" instead.

In response to this:

Following the incoming changes of UserDefinedNetwork CRD condition type [1], tests that assert on the NetworkReady condition type should take in account the renamed type NetworkCreated to avoid CI breakage in the following scenarios:

  • Production code changes reached D/S before tests code changes: Having the UDN CRD produce the new condition type (NetworkCreated), while e2e tests assert on the old condition type (NetworkReady).
  • Tests code changes reached D/S before production code changes: Having the UDN CRD produce the old condition type (NetworkReady), while tests assert on the new condition type (NetworkCreated).

Change assertions on UDN condition type NetworkReady, expect condition type NetworkReady or NetworkCreated.

[1] ovn-kubernetes/ovn-kubernetes#4884

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.

@tssurya
Copy link
Contributor

tssurya commented Jan 8, 2025

/tide refresh

@tssurya
Copy link
Contributor

tssurya commented Jan 8, 2025

/test e2e-aws-ovn-serial

@tssurya
Copy link
Contributor

tssurya commented Jan 8, 2025

/tide refresh

@tssurya tssurya mentioned this pull request Jan 8, 2025
Merged
@tssurya
Copy link
Contributor

tssurya commented Jan 8, 2025

/tide refresh

@tssurya
Copy link
Contributor

tssurya commented Jan 9, 2025

/label acknowledge-critical-fixes-only

@openshift-ci openshift-ci bot added the acknowledge-critical-fixes-only Indicates if the issuer of the label is OK with the policy. label Jan 9, 2025
@tssurya
Copy link
Contributor

tssurya commented Jan 9, 2025

/tide refresh

@openshift-merge-bot openshift-merge-bot bot merged commit 727cacc into openshift:master Jan 9, 2025
26 of 30 checks passed
@ormergi ormergi deleted the udn-network-created-condition branch January 9, 2025 08:58
@openshift-bot
Copy link
Contributor

[ART PR BUILD NOTIFIER]

Distgit: openshift-enterprise-tests
This PR has been included in build openshift-enterprise-tests-container-v4.19.0-202501091040.p0.g727cacc.assembly.stream.el9.
All builds following this will include this PR.

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

@trozet trozet trozet approved these changes

@tssurya tssurya tssurya approved these changes

@npinaeva npinaeva Awaiting requested review from npinaeva

@knobunc knobunc Awaiting requested review from knobunc

Assignees

@tssurya tssurya

Labels
acknowledge-critical-fixes-only Indicates if the issuer of the label is OK with the policy. approved Indicates a PR has been approved by an approver from all required OWNERS files. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. 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.
6 participants
@ormergi @npinaeva @tssurya @openshift-ci-robot @openshift-bot @trozet