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

[release-4.18] OCPBUGS-48389, SDN-4930: Backport UDN fixes from 4.19 into 4.18 #29478

Merged
merged 3 commits into from
Jan 26, 2025

Conversation

trozet
Copy link
Contributor

@trozet trozet commented Jan 24, 2025

No description provided.

@trozet
Copy link
Contributor Author

trozet commented Jan 24, 2025

/retitle [release-4.18] SDN-4930: Backport UDN fixes from 4.19 into 4.18

@openshift-ci openshift-ci bot changed the title Backport UDN fixes from 4.19 into 4.18 [release-4.18] SDN-4930: Backport UDN fixes from 4.19 into 4.18 Jan 24, 2025
@openshift-ci-robot
Copy link

openshift-ci-robot commented Jan 24, 2025

@trozet: This pull request references SDN-4930 which is a valid jira issue.

In response to this:

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.

@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 24, 2025
@trozet
Copy link
Contributor Author

trozet commented Jan 24, 2025

/test ?

Copy link
Contributor

openshift-ci bot commented Jan 24, 2025

@trozet: The following commands are available to trigger required jobs:

/test e2e-aws-jenkins
/test e2e-aws-ovn-edge-zones
/test e2e-aws-ovn-fips
/test e2e-aws-ovn-image-registry
/test e2e-aws-ovn-microshift
/test e2e-aws-ovn-microshift-serial
/test e2e-aws-ovn-serial
/test e2e-gcp-ovn
/test e2e-gcp-ovn-builds
/test e2e-gcp-ovn-image-ecosystem
/test e2e-gcp-ovn-upgrade
/test e2e-metal-ipi-ovn-ipv6
/test images
/test lint
/test okd-scos-images
/test unit
/test verify
/test verify-deps

The following commands are available to trigger optional jobs:

/test e2e-agnostic-ovn-cmd
/test e2e-aws
/test e2e-aws-csi
/test e2e-aws-disruptive
/test e2e-aws-etcd-certrotation
/test e2e-aws-etcd-recovery
/test e2e-aws-ovn
/test e2e-aws-ovn-cgroupsv2
/test e2e-aws-ovn-etcd-scaling
/test e2e-aws-ovn-ipsec-serial
/test e2e-aws-ovn-kube-apiserver-rollout
/test e2e-aws-ovn-kubevirt
/test e2e-aws-ovn-single-node
/test e2e-aws-ovn-single-node-serial
/test e2e-aws-ovn-single-node-techpreview
/test e2e-aws-ovn-single-node-techpreview-serial
/test e2e-aws-ovn-single-node-upgrade
/test e2e-aws-ovn-upgrade
/test e2e-aws-ovn-upgrade-rollback
/test e2e-aws-ovn-upi
/test e2e-aws-ovn-virt-techpreview
/test e2e-aws-proxy
/test e2e-azure
/test e2e-azure-ovn-etcd-scaling
/test e2e-azure-ovn-upgrade
/test e2e-baremetalds-kubevirt
/test e2e-external-aws
/test e2e-external-aws-ccm
/test e2e-external-vsphere-ccm
/test e2e-gcp-csi
/test e2e-gcp-disruptive
/test e2e-gcp-fips-serial
/test e2e-gcp-ovn-etcd-scaling
/test e2e-gcp-ovn-rt-upgrade
/test e2e-gcp-ovn-techpreview
/test e2e-gcp-ovn-techpreview-serial
/test e2e-metal-ipi-ovn
/test e2e-metal-ipi-ovn-dualstack
/test e2e-metal-ipi-ovn-dualstack-local-gateway
/test e2e-metal-ipi-ovn-kube-apiserver-rollout
/test e2e-metal-ipi-serial
/test e2e-metal-ipi-serial-ovn-ipv6
/test e2e-metal-ipi-virtualmedia
/test e2e-metal-ovn-single-node-live-iso
/test e2e-metal-ovn-single-node-with-worker-live-iso
/test e2e-openstack-ovn
/test e2e-openstack-serial
/test e2e-vsphere
/test e2e-vsphere-ovn-dualstack-primaryv6
/test e2e-vsphere-ovn-etcd-scaling
/test okd-scos-e2e-aws-ovn

Use /test all to run the following jobs that were automatically triggered:

pull-ci-openshift-origin-release-4.18-e2e-agnostic-ovn-cmd
pull-ci-openshift-origin-release-4.18-e2e-aws-csi
pull-ci-openshift-origin-release-4.18-e2e-aws-ovn-cgroupsv2
pull-ci-openshift-origin-release-4.18-e2e-aws-ovn-edge-zones
pull-ci-openshift-origin-release-4.18-e2e-aws-ovn-fips
pull-ci-openshift-origin-release-4.18-e2e-aws-ovn-kube-apiserver-rollout
pull-ci-openshift-origin-release-4.18-e2e-aws-ovn-microshift
pull-ci-openshift-origin-release-4.18-e2e-aws-ovn-microshift-serial
pull-ci-openshift-origin-release-4.18-e2e-aws-ovn-serial
pull-ci-openshift-origin-release-4.18-e2e-aws-ovn-single-node
pull-ci-openshift-origin-release-4.18-e2e-aws-ovn-single-node-serial
pull-ci-openshift-origin-release-4.18-e2e-aws-ovn-single-node-upgrade
pull-ci-openshift-origin-release-4.18-e2e-aws-ovn-upgrade
pull-ci-openshift-origin-release-4.18-e2e-gcp-csi
pull-ci-openshift-origin-release-4.18-e2e-gcp-ovn
pull-ci-openshift-origin-release-4.18-e2e-gcp-ovn-rt-upgrade
pull-ci-openshift-origin-release-4.18-e2e-gcp-ovn-upgrade
pull-ci-openshift-origin-release-4.18-e2e-metal-ipi-ovn
pull-ci-openshift-origin-release-4.18-e2e-metal-ipi-ovn-ipv6
pull-ci-openshift-origin-release-4.18-e2e-metal-ipi-ovn-kube-apiserver-rollout
pull-ci-openshift-origin-release-4.18-e2e-openstack-ovn
pull-ci-openshift-origin-release-4.18-images
pull-ci-openshift-origin-release-4.18-lint
pull-ci-openshift-origin-release-4.18-okd-scos-e2e-aws-ovn
pull-ci-openshift-origin-release-4.18-okd-scos-images
pull-ci-openshift-origin-release-4.18-unit
pull-ci-openshift-origin-release-4.18-verify
pull-ci-openshift-origin-release-4.18-verify-deps

In response to this:

/test ?

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.

@trozet
Copy link
Contributor Author

trozet commented Jan 24, 2025

/testwith openshift/origin/master/e2e-gcp-ovn-techpreview openshift/ovn-kubernetes#2422

Copy link
Contributor

openshift-ci bot commented Jan 24, 2025

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

no ref for requested test included in command

@trozet
Copy link
Contributor Author

trozet commented Jan 24, 2025

/testwith openshift/origin/release-4.18/e2e-gcp-ovn-techpreview openshift/ovn-kubernetes#2422

@trozet
Copy link
Contributor Author

trozet commented Jan 24, 2025

/test e2e-aws-ovn-virt-techpreview

@trozet
Copy link
Contributor Author

trozet commented Jan 24, 2025

/test e2e-gcp-ovn-techpreview

@trozet
Copy link
Contributor Author

trozet commented Jan 24, 2025

/test e2e-gcp-ovn-techpreview-serial

@trozet
Copy link
Contributor Author

trozet commented Jan 24, 2025

/payload-job periodic-ci-openshift-release-master-nightly-4.18-e2e-metal-ipi-ovn-dualstack-techpreview

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

Copy link
Contributor

openshift-ci bot commented Jan 24, 2025

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

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

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/bc0518b0-daae-11ef-8aa2-570c86f35148-0

@trozet
Copy link
Contributor Author

trozet commented Jan 24, 2025

/payload-job-with-prs periodic-ci-openshift-release-master-nightly-4.18-e2e-metal-ipi-ovn-dualstack-techpreview openshift/ovn-kubernetes#2422

Copy link
Contributor

openshift-ci bot commented Jan 24, 2025

@trozet: 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.18-e2e-metal-ipi-ovn-dualstack-techpreview

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/e8a33730-daae-11ef-88db-b4ddea624002-0

@trozet
Copy link
Contributor Author

trozet commented Jan 24, 2025

/payload-job-with-prs periodic-ci-openshift-release-master-nightly-4.18-e2e-metal-ipi-ovn-ipv6-techpreview openshift/ovn-kubernetes#2422

Copy link
Contributor

openshift-ci bot commented Jan 24, 2025

@trozet: 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.18-e2e-metal-ipi-ovn-ipv6-techpreview

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/246b2bb0-daaf-11ef-958b-05096a7a0c3b-0

@jluhrsen
Copy link
Contributor

jluhrsen commented Jan 25, 2025

/retitle [release-4.18] OCPBUGS-48389, SDN-4930: Backport UDN fixes from 4.19 into 4.18

@openshift-ci openshift-ci bot changed the title [release-4.18] SDN-4930: Backport UDN fixes from 4.19 into 4.18 [release-4.18] OCPBUGS-48389, SDN-4930: Backport UDN fixes from 4.19 into 4.18 Jan 25, 2025
@openshift-ci-robot openshift-ci-robot added the jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. label Jan 25, 2025
@openshift-ci-robot
Copy link

openshift-ci-robot commented Jan 25, 2025

@trozet: This pull request references Jira Issue OCPBUGS-48389, which is valid.

7 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.18.0) matches configured target version for branch (4.18.0)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)
  • release note type set to "Release Note Not Required"
  • dependent bug Jira Issue OCPBUGS-48391 is in the state Verified, which is one of the valid states (MODIFIED, ON_QA, VERIFIED)
  • dependent Jira Issue OCPBUGS-48391 targets the "4.19.0" version, which is one of the valid target versions: 4.19.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.

This pull request references SDN-4930 which is a valid jira issue.

In response to this:

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 and others added 3 commits January 25, 2025 13:16
Signed-off-by: Tim Rozet <[email protected]>
Co-authored-by: Surya Seetharaman <[email protected]>
Now that we create the namespace for the tests NewCLIWithoutNamespace,
implicitly another function is not called:

SetupProject->setupProject/setupNamespace->ChangeUser

ChangeUser will generate kubeconfig for the namespace user and set
CLI.configPath. However we dont setup project, so we dont have a proper
user account and the other scaffolding for a project. Therefore calling
oc.DynamicClient or other OC commands that would use the user
CLI.configPath wont work.

Just use admin for now.

Signed-off-by: Tim Rozet <[email protected]>
(cherry picked from commit 82c142d)
Since we create our own namespaces for UDN, we need to wait for the
cluster manager to annotate the namespace before we can try to create
pods.

Signed-off-by: Tim Rozet <[email protected]>
(cherry picked from commit 7e54d82)
@trozet
Copy link
Contributor Author

trozet commented Jan 25, 2025

/payload-job-with-prs periodic-ci-openshift-release-master-nightly-4.18-e2e-metal-ipi-ovn-ipv6-techpreview openshift/ovn-kubernetes#2422

Copy link
Contributor

openshift-ci bot commented Jan 25, 2025

@trozet: 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.18-e2e-metal-ipi-ovn-ipv6-techpreview

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/4e696e90-db4a-11ef-97fc-196032f4373d-0

@trozet
Copy link
Contributor Author

trozet commented Jan 25, 2025

/payload-job-with-prs periodic-ci-openshift-release-master-nightly-4.18-e2e-metal-ipi-ovn-dualstack-techpreview openshift/ovn-kubernetes#2422

Copy link
Contributor

openshift-ci bot commented Jan 25, 2025

@trozet: 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.18-e2e-metal-ipi-ovn-dualstack-techpreview

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/66ba8f60-db4a-11ef-9d35-4def0cade6fb-0

@trozet
Copy link
Contributor Author

trozet commented Jan 25, 2025

/label backport-risk-assessed

Copy link
Contributor

openshift-ci bot commented Jan 25, 2025

@trozet: Can not set label backport-risk-assessed: Must be member in one of these teams: [openshift-staff-engineers]

In response to this:

/label backport-risk-assessed

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.

@trozet
Copy link
Contributor Author

trozet commented Jan 25, 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 25, 2025
@knobunc
Copy link
Contributor

knobunc commented Jan 25, 2025

/lgtm
/label backport-risk-assessed
/label cherry-pick-approved

@openshift-ci openshift-ci bot added backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. labels Jan 25, 2025
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jan 25, 2025
Copy link
Contributor

openshift-ci bot commented Jan 25, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: knobunc, trozet

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-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 0fd2e36 and 2 for PR HEAD f7dec48 in total

Copy link
Contributor

openshift-ci bot commented Jan 26, 2025

@trozet: 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-upgrade f7dec48 link false /test e2e-aws-ovn-single-node-upgrade
ci/prow/e2e-agnostic-ovn-cmd f7dec48 link false /test e2e-agnostic-ovn-cmd
ci/prow/e2e-gcp-ovn-rt-upgrade f7dec48 link false /test e2e-gcp-ovn-rt-upgrade
ci/prow/e2e-gcp-ovn-techpreview-serial f7dec48 link false /test e2e-gcp-ovn-techpreview-serial
ci/prow/e2e-aws-ovn-virt-techpreview f7dec48 link false /test e2e-aws-ovn-virt-techpreview

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.

@openshift-merge-bot openshift-merge-bot bot merged commit 0e267a1 into openshift:release-4.18 Jan 26, 2025
27 of 33 checks passed
@openshift-ci-robot
Copy link

@trozet: Jira Issue OCPBUGS-48389: Some pull requests linked via external trackers have merged:

The following pull requests linked via external trackers have not merged:

These pull request must merge or be unlinked from the Jira bug in order for it to move to the next state. Once unlinked, request a bug refresh with /jira refresh.

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

In response to this:

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.

@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.18.0-202501260137.p0.g0e267a1.assembly.stream.el9.
All builds following this will include this PR.

@jluhrsen
Copy link
Contributor

/cherry-pick release-4.17

@openshift-cherrypick-robot

@jluhrsen: #29478 failed to apply on top of branch "release-4.17":

Applying: Backport UDN fixes from 4.19 into 4.18
.git/rebase-apply/patch:1095: trailing whitespace.
    ` + params.topology + `: 
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
A	test/extended/networking/livemigration.go
M	test/extended/networking/network_segmentation.go
Falling back to patching base and 3-way merge...
Auto-merging test/extended/networking/network_segmentation.go
CONFLICT (content): Merge conflict in test/extended/networking/network_segmentation.go
CONFLICT (modify/delete): test/extended/networking/livemigration.go deleted in HEAD and modified in Backport UDN fixes from 4.19 into 4.18. Version Backport UDN fixes from 4.19 into 4.18 of test/extended/networking/livemigration.go left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Backport UDN fixes from 4.19 into 4.18

In response to this:

/cherry-pick release-4.17

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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. backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. 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. 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
Development

Successfully merging this pull request may close these issues.