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

4.16 sandbox sync from 4.17 #2382

Open
wants to merge 610 commits into
base: sandbox-release-4.16
Choose a base branch
from

Conversation

jluhrsen
Copy link
Contributor

@jluhrsen jluhrsen commented Dec 7, 2024

πŸ“‘ Description

Fixes #

Additional Information for reviewers

βœ… Checks

  • My code requires changes to the documentation
  • if so, I have updated the documentation as required
  • My code requires tests
  • if so, I have added and/or updated the tests as required
  • All the tests have passed in the CI

How to verify it

qinqon and others added 30 commits July 29, 2024 13:58
Signed-off-by: Enrique Llorente <ellorent@redhat.com>
Signed-off-by: Enrique Llorente <ellorent@redhat.com>
Signed-off-by: Enrique Llorente <ellorent@redhat.com>
Signed-off-by: Enrique Llorente <ellorent@redhat.com>
Signed-off-by: Enrique Llorente <ellorent@redhat.com>
Signed-off-by: Enrique Llorente <ellorent@redhat.com>
udn: Add events to primary role network related problems
258c5cd forgot to update the hybrid
overlay case of using the annotation.

Signed-off-by: Tim Rozet <trozet@redhat.com>
…july"

This reverts commit 2489a11, reversing
changes made to 9168abf.
go mod edit -go=1.22
update k8s v1.30.2
update k8s libraries to v0.30.2
go mod tidy && go mod vendor

Signed-off-by: Jacob Tanenbaum <jtanenba@redhat.com>
Signed-off-by: Jacob Tanenbaum <jtanenba@redhat.com>
sigs.k8s.io/controller-runtime to v0.18.4
and corresponding k8s libraries to v0.30.2

Signed-off-by: Jacob Tanenbaum <jtanenba@redhat.com>
Signed-off-by: Jacob Tanenbaum <jtanenba@redhat.com>
k8s.io/kubernetes -> v1.30.2
sigs.k8s.io/controller-runtime -> v0.18.4
all other supporting k8s.io packages to 0.30.2

Signed-off-by: Jacob Tanenbaum <jtanenba@redhat.com>
remove depricated ExpectNotEqual() from e2e_suite_test.go
correct call to Logf with too many arguments
correct call to Logf with the wrong type

Signed-off-by: Jacob Tanenbaum <jtanenba@redhat.com>
Signed-off-by: Jacob Tanenbaum <jtanenba@redhat.com>
Fixes hybrid overlay from deprecated annotation
OCPBUGS-37709: Revert openshift#2233 DownStream Merge: 24th July 2024
This commit adds a new annotation
"k8s.ovn.org/node-mgmt-port-mac-addresses"
which will contain management port MAC
addresses obtained from host side for
each network including default.
This annotation is used by node to
communicate to controller side what
MAC to use while creating the OVN
mpX ports on ovnkube-controller side.

Signed-off-by: Surya Seetharaman <suryaseetharaman.9@gmail.com>
Signed-off-by: Surya Seetharaman <suryaseetharaman.9@gmail.com>
Signed-off-by: Surya Seetharaman <suryaseetharaman.9@gmail.com>
This commit deprecates the older annotation
in favor of the new one.
It also fixes the piece in ovnkube-controller
to read the mac address on a per network
basis and fix the plumbing to work properly
and have same mac as the netdevice created
on the host side using the new annotation
that is now network aware.

Signed-off-by: Surya Seetharaman <suryaseetharaman.9@gmail.com>
Signed-off-by: Surya Seetharaman <suryaseetharaman.9@gmail.com>
The test was sending service traffic via UDN
which will start to work on this PR in LGW.
So let's change the test to really send
KAPI traffic via default pod interface.

Signed-off-by: Surya Seetharaman <suryaseetharaman.9@gmail.com>
Signed-off-by: Surya Seetharaman <suryaseetharaman.9@gmail.com>
Signed-off-by: Surya Seetharaman <suryaseetharaman.9@gmail.com>
…-aware

UDN: Make mpX MAC address annotation network aware
Signed-off-by: arkadeepsen <arsen@redhat.com>
Signed-off-by: arkadeepsen <arsen@redhat.com>
UT flake: fix panic in node IP handler tests
arghosh93 and others added 25 commits September 25, 2024 09:56
This PR is to emit error and terminate ovnkube startup if
transit switch subnet is being used as either join switch
or masquerade subnet.

Signed-off-by: Arnab Ghosh <arnabghosh89@gmail.com>
(cherry picked from commit 46d35e6)
…lt_subnet_overlap_check

[release-4.16] OCPBUGS-41551: Add subnet overlap check for transit switch subnet
When users attach pod to a secondary network and override the default
route pod. It will cause the assymetric routing for service haripin
traffic.

We add static routes to ensure the traffic to the hairpin masquerade
IP always goes to OVN.

Signed-off-by: Peng Liu <pliu@redhat.com>
re-labeling gateway pod. It uses different handlers for update and
delete pod internally.
Remove external.gateway from the dual-stack exclusion, as it is
supported for ipv6.

Signed-off-by: Nadia Pinaeva <n.m.pinaeva@gmail.com>
(cherry picked from commit 4b9c42b)
For local zone pods, deleteLogicalPort cleans this up, but before IC
this function was called for all non-host-network pods, hence this
logic. After IC, deleteLogicalPort won't be called for all remote zone
pods, so condition is not needed.

Signed-off-by: Nadia Pinaeva <n.m.pinaeva@gmail.com>
(cherry picked from commit 839842b)
[release-4.16] OCPBUGS-36210: Implementation required to enable Forwarding if it is already disabled
Signed-off-by: Peng Liu <pliu@redhat.com>
OCPBUGS-42940: Fix egress gateway pod cleanup for remote zone pods.
…e-labeling gateway pod. It uses different handlers for update and delete pod internally. Remove external.gateway from the dual-stack exclusion, as it is supported for ipv6.

Signed-off-by: Nadia Pinaeva <n.m.pinaeva@gmail.com>
(cherry picked from commit 4b9c42b)
…alPort cleans this up, but before IC this function was called for all non-host-network pods, hence this logic. After IC, deleteLogicalPort won't be called for all remote zone pods, so condition is not needed.

Signed-off-by: Nadia Pinaeva <n.m.pinaeva@gmail.com>
(cherry picked from commit 839842b)
…rry-pick-2273-to-release-4.17

[release-4.17] OCPBUGS-39200: Dockerfile: Bump OVS to 3.4.0-1
[release-4.17] OCPBUGS-42931: Add static route to the hairpin masquerade IPs to pod
During live SDN migration, host-to-pod traffic originating from
SDN nodes will use the first IP address of the hybrid overlay node
subnet. These IPs are being added to ensure proper functionality of
host network policies.

Signed-off-by: Peng Liu <pliu@redhat.com>
…rry-pick-2316-to-release-4.16

[release-4.16] OCPBUGS-42942: Fix egress gateway pod cleanup for remote zone pods.
[release-4.16] OCPBUGS-43344: Add SDN node subnet gateway IP to host-network address_set
[release-4.17] OCPBUGS-44303: Add hybird overlay pod IPs to the namespace address_set
Signed-off-by: Peng Liu <pliu@redhat.com>
…rry-pick-2340-to-release-4.16

[release-4.16] OCPBUGS-42244: Add hybird overlay pod IPs to the namespace address_set
Correct the code comment set in the `Start` method.

Signed-off-by: Miguel Duarte Barroso <mdbarroso@redhat.com>
(cherry picked from commit 5827107)
The cluster manager was returning these `ErrNetworkControllerTopologyNotManaged`
errors on the initial sync of the cluster's networks.

Thus, if a customer had a localnet network without subnets provisioned, they
would be locked out of a 4.16 to 4.17 upgrade.

The node network controllers do **not** return these errors (actually, only the
`secondaryNetworkClusterManager` does ...), hence, we can safely swallow and log
the error at the network controller manager layer.

Signed-off-by: Miguel Duarte Barroso <mdbarroso@redhat.com>
(cherry picked from commit a5ac6a3)
…3454

[release-4.17] OCPBUGS-43454: Ignore cluster manager topology not managed errors for localnet with no subnets
It is the most recent release of 24.03 with all the latest bug fixes.

Signed-off-by: Ilya Maximets <i.maximets@ovn.org>
OCPBUGS-45339: Dockerfile: Update OVN to the 24.03.2-32.el9fdp minor release.
not all merges were fully clean. The merge came in bulk from
upstream/release4.17 to release-4.16 with this
command:

git merge -s recursive -X theirs upstream/release-4.17
(I think recursive is default)

-X theirs means all conflict resolution was made to pick
the changes coming in from upstream/release-4.17

The changes in this commit were deduced by fxing the build
and executing the tests and determining what seemed
like the likely best way forward.

Signed-off-by: Jamo Luhrsen <jluhrsen@gmail.com>
Copy link
Contributor

openshift-ci bot commented Dec 7, 2024

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: jluhrsen
Once this PR has been reviewed and has the lgtm label, please assign jacobtanenbaum for approval. For more information see the Kubernetes Code Review Process.

The full list of commands accepted by this bot can be found 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

@jluhrsen
Copy link
Contributor Author

jluhrsen commented Dec 7, 2024

/payload 4.16 ci blocking
/payload 4.16 nightly blocking

Copy link
Contributor

openshift-ci bot commented Dec 7, 2024

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

  • periodic-ci-openshift-release-master-ci-4.16-upgrade-from-stable-4.15-e2e-aws-ovn-upgrade
  • periodic-ci-openshift-release-master-ci-4.16-e2e-aws-sdn-serial
  • periodic-ci-openshift-release-master-ci-4.16-upgrade-from-stable-4.15-e2e-azure-sdn-upgrade
  • periodic-ci-openshift-release-master-ci-4.16-e2e-gcp-ovn-upgrade
  • periodic-ci-openshift-hypershift-release-4.16-periodics-e2e-aws-ovn

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/d3cd7b10-b45a-11ef-961c-c9d998b455f3-0

trigger 9 job(s) of type blocking for the nightly release of OCP 4.16

  • periodic-ci-openshift-release-master-nightly-4.16-e2e-aws-ovn-serial
  • periodic-ci-openshift-release-master-ci-4.16-e2e-aws-ovn-upgrade
  • periodic-ci-openshift-release-master-nightly-4.16-e2e-aws-sdn-upgrade
  • periodic-ci-openshift-release-master-ci-4.16-e2e-azure-ovn-upgrade
  • periodic-ci-openshift-release-master-nightly-4.16-fips-payload-scan
  • periodic-ci-openshift-release-master-ci-4.16-upgrade-from-stable-4.15-e2e-gcp-ovn-rt-upgrade
  • periodic-ci-openshift-hypershift-release-4.16-periodics-e2e-aws-ovn-conformance
  • periodic-ci-openshift-release-master-nightly-4.16-e2e-metal-ipi-ovn-bm
  • periodic-ci-openshift-release-master-nightly-4.16-e2e-metal-ipi-ovn-ipv6

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/d3cd7b10-b45a-11ef-961c-c9d998b455f3-1

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.