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-48710: DownStream Merge Sync from 4.19 [02-13-2025] #2470

Open
wants to merge 16 commits into
base: release-4.18
Choose a base branch
from

Conversation

openshift-cherrypick-robot

This is an automated cherry-pick of #2459

/assign jluhrsen

@openshift-ci-robot
Copy link
Contributor

@openshift-cherrypick-robot: Jira Issue OCPBUGS-49598 has been cloned as Jira Issue OCPBUGS-51143. Will retitle bug to link to clone.

Jira Issue OCPBUGS-49393 has been cloned as Jira Issue OCPBUGS-51144. Will retitle bug to link to clone.
/retitle [release-4.18] OCPBUGS-51143, OCPBUGS-51144: [DownstreamMerge] 13 feb 2025

In response to this:

This is an automated cherry-pick of #2459

/assign jluhrsen

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 openshift-ci bot changed the title [release-4.18] OCPBUGS-49598, OCPBUGS-49393: [DownstreamMerge] 13 feb 2025 [release-4.18] OCPBUGS-51143, OCPBUGS-51144: [DownstreamMerge] 13 feb 2025 Feb 21, 2025
@openshift-ci-robot openshift-ci-robot added jira/severity-critical Referenced Jira bug's severity is critical for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Feb 21, 2025
@openshift-ci-robot
Copy link
Contributor

@openshift-cherrypick-robot: This pull request references Jira Issue OCPBUGS-51143, which is invalid:

  • release note text must be set and not match the template OR release note type must be set to "Release Note Not Required". For more information you can reference the OpenShift Bug Process.

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

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

This pull request references Jira Issue OCPBUGS-51144, which is invalid:

  • release note text must be set and not match the template OR release note type must be set to "Release Note Not Required". For more information you can reference the OpenShift Bug Process.

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

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

In response to this:

This is an automated cherry-pick of #2459

/assign jluhrsen

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.

@jluhrsen
Copy link
Contributor

/hold
not trying to get this in right now before 4.18 GA. just getting a head start on the sync

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 21, 2025
@jluhrsen
Copy link
Contributor

/retitle [release-4.18] OCPBUGS-48710: DownStream Merge Sync from 4.19 [02-13-2025]

@openshift-ci openshift-ci bot changed the title [release-4.18] OCPBUGS-51143, OCPBUGS-51144: [DownstreamMerge] 13 feb 2025 [release-4.18] OCPBUGS-48710: DownStream Merge Sync from 4.19 [02-13-2025] Feb 21, 2025
@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. and removed jira/severity-critical Referenced Jira bug's severity is critical for the branch this PR is targeting. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Feb 21, 2025
@openshift-ci-robot
Copy link
Contributor

@openshift-cherrypick-robot: This pull request references Jira Issue OCPBUGS-48710, 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-48709 is in the state Verified, which is one of the valid states (MODIFIED, ON_QA, VERIFIED)
  • dependent Jira Issue OCPBUGS-48709 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.

In response to this:

This is an automated cherry-pick of #2459

/assign jluhrsen

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.

RamLavi and others added 11 commits February 24, 2025 10:20
The document is refactored to meet the ovn-org feature template [0].

[0]
https://github.com/ovn-org/ovn-kubernetes/blob/master/docs/features/template.md

Signed-off-by: Ram Lavi <[email protected]>
Fixes a null pointer exception when network policy port has no protocol.
If the protocol is missing in the network policy port definition, it
should be assumed to be TCP.

Signed-off-by: Tim Rozet <[email protected]>
Add a few more missing `Expect(err).NotTo(HaveOccurred())` to nftables
checks so they'll actually fail if the rules are wrong.

Signed-off-by: Dan Winship <[email protected]>
One of UDN local gateway masquerade rules was using an IP/length (eg.
169.254.0.2/29) rather than subnet/length (169.254.0.0/29). This is
ambiguous and we shouldn't depend on iptables interpreting it the way
we wanted.

Also, the corresponding unit test ended up being sort of silly because
it wasn't overriding the masquerade subnet to be "UDN-sized", so the
rules it output failed to actually distinguish the UDN and non-UDN
parts of the masquerade subnet. Fix that too.

Signed-off-by: Dan Winship <[email protected]>
We want to use "k8s.io/api/core/v1.ObjectReference" for event reporting.
At the same time "k8s.io/kubernetes/pkg/apis/core.ObjectReference"
exists.
The fun part is that in default_node_network_controller.go we import
  kapi "k8s.io/api/core/v1"
and in udn_isolation.go
  v1 "k8s.io/api/core/v1"
  kapi "k8s.io/kubernetes/pkg/apis/core"

so when the tested code was moved to another file, it started using the
wrong type.

Signed-off-by: Nadia Pinaeva <[email protected]>
I am trying to debug an issue where this error occurs
and I dont easily know what pod UIDs that were compared.

Signed-off-by: Martin Kennelly <[email protected]>
Signed-off-by: Dan Winship <[email protected]>
Co-authored-by: Martin Kennelly <[email protected]>
npinaeva and others added 5 commits February 24, 2025 10:20
Fix issue introduced in 3275d49

$ make lint
...
level=info msg="[linters_context/goanalysis] analyzers took 4m3.270244378s with top 10 stages: buildir: 2m29.130860339s, nilness: 5.955006101s, printf: 3.859331341s, fact_deprecated: 3.799388364s, ctrlflow: 3.482855272s, inspect: 3.316943625s, fact_purity: 2.391957936s, S1038: 2.121120295s, gofmt: 2.089813745s, unused: 2.075213702s"
pkg/node/base_node_network_controller_dpu.go:1: : # github.com/ovn-org/ovn-kubernetes/go-controller/pkg/node [github.com/ovn-org/ovn-kubernetes/go-controller/pkg/node.test]
pkg/node/udn_isolation_test.go:364:52: not enough arguments in call to NewUDNHostIsolationManager
        have (bool, bool, "k8s.io/client-go/informers/core/v1".PodInformer)
        want (bool, bool, "k8s.io/client-go/informers/core/v1".PodInformer, string, record.EventRecorder) (typecheck)
package node

Signed-off-by: Flavio Fernandes <[email protected]>
Currently, IPV6 deployment of Kind with RUN_IN_CONTAINER flag [1] fails,
the root cause seems to be setting of IPV4 address of master node in
the server field in Kubeconfig [2] instead of the IPV6 address.

This PR sets the server IP address in Kubeconfig considering IP family type.

[1] KIND_IPV4_SUPPORT=false KIND_IPV6_SUPPORT=true
    RUN_IN_CONTAINER=true ./contrib/kind.sh

[2]
https://github.com/ovn-kubernetes/ovn-kubernetes/blob/master/contrib/kind.sh#L1078

Signed-off-by: Yossi Boaron <[email protected]>
During UDN we added syncEgressIPMarkAllocator
that causes an extra patch operation that
causes an extra event. So update the test to
reflect that.

Signed-off-by: Surya Seetharaman <[email protected]>
@openshift-cherrypick-robot openshift-cherrypick-robot force-pushed the cherry-pick-2459-to-release-4.18 branch from 86b4eb7 to ee20311 Compare February 24, 2025 10:20
@jluhrsen
Copy link
Contributor

/retest

Copy link
Contributor

openshift-ci bot commented Feb 24, 2025

@openshift-cherrypick-robot: 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-azure-ovn-techpreview ee20311 link false /test e2e-azure-ovn-techpreview
ci/prow/e2e-metal-ipi-ovn-ipv4 ee20311 link false /test e2e-metal-ipi-ovn-ipv4
ci/prow/e2e-metal-ipi-ovn-ipv6-techpreview ee20311 link false /test e2e-metal-ipi-ovn-ipv6-techpreview
ci/prow/security ee20311 link false /test security
ci/prow/e2e-aws-ovn-single-node-techpreview ee20311 link false /test e2e-aws-ovn-single-node-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.

@jluhrsen
Copy link
Contributor

/retest
/payload 4.18 ci blocking
/payload 4.18 nightly blocking

Copy link
Contributor

openshift-ci bot commented Feb 26, 2025

@jluhrsen: trigger 4 job(s) of type blocking for the ci release of OCP 4.18

  • periodic-ci-openshift-release-master-ci-4.18-upgrade-from-stable-4.17-e2e-aws-ovn-upgrade
  • periodic-ci-openshift-release-master-ci-4.18-upgrade-from-stable-4.17-e2e-azure-ovn-upgrade
  • periodic-ci-openshift-release-master-ci-4.18-e2e-gcp-ovn-upgrade
  • periodic-ci-openshift-hypershift-release-4.18-periodics-e2e-aws-ovn

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/693cee10-f470-11ef-8df3-4aa9ab84d6ec-0

trigger 13 job(s) of type blocking for the nightly release of OCP 4.18

  • periodic-ci-openshift-release-master-nightly-4.18-e2e-aws-ovn-serial
  • periodic-ci-openshift-release-master-ci-4.18-e2e-aws-upgrade-ovn-single-node
  • periodic-ci-openshift-release-master-ci-4.18-e2e-aws-ovn-techpreview
  • periodic-ci-openshift-release-master-ci-4.18-e2e-aws-ovn-techpreview-serial
  • periodic-ci-openshift-release-master-ci-4.18-e2e-aws-ovn-upgrade
  • periodic-ci-openshift-release-master-ci-4.18-e2e-azure-ovn-upgrade
  • periodic-ci-openshift-release-master-nightly-4.18-fips-payload-scan
  • periodic-ci-openshift-release-master-ci-4.18-upgrade-from-stable-4.17-e2e-gcp-ovn-rt-upgrade
  • periodic-ci-openshift-hypershift-release-4.18-periodics-e2e-aws-ovn-conformance
  • periodic-ci-openshift-release-master-nightly-4.18-e2e-metal-ipi-ovn-bm
  • periodic-ci-openshift-release-master-nightly-4.18-e2e-metal-ipi-ovn-ipv6
  • periodic-ci-openshift-microshift-release-4.18-periodics-e2e-aws-ovn-ocp-conformance
  • periodic-ci-openshift-microshift-release-4.18-periodics-e2e-aws-ovn-ocp-conformance-serial

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/693cee10-f470-11ef-8df3-4aa9ab84d6ec-1

@trozet
Copy link
Contributor

trozet commented Feb 26, 2025

4.18 GA'ed

/hold cancel

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 26, 2025
@trozet
Copy link
Contributor

trozet commented Feb 26, 2025

/label backport-risk-assessed
/approve

@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 Feb 26, 2025
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 26, 2025
@jluhrsen
Copy link
Contributor

4.18 GA'ed

/hold cancel

@trozet , I feel like we should always get payload jobs on branches that have z release possibility though. no?

@npinaeva
Copy link
Member

/lgtm

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

openshift-ci bot commented Feb 27, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: npinaeva, openshift-cherrypick-robot, 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

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. backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. 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.