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.14] OCPBUGS-44098: backport SDN live migration #2469

Open
wants to merge 15 commits into
base: release-4.14
Choose a base branch
from

Conversation

pliurh
Copy link
Contributor

@pliurh pliurh commented Aug 12, 2024

No description provided.

@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Aug 12, 2024
@openshift-ci openshift-ci bot requested review from dougbtv and kyrtapz August 12, 2024 03:37
Copy link
Contributor

openshift-ci bot commented Aug 12, 2024

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: pliurh
Once this PR has been reviewed and has the lgtm label, please assign knobunc 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

@pliurh pliurh force-pushed the release-4.14 branch 2 times, most recently from be54ef7 to fd6b67e Compare October 9, 2024 14:14
@pliurh pliurh changed the title WIP: [Release 4.14] backport SDN live migration [Release 4.14] NP-1094: backport SDN live migration Oct 11, 2024
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Oct 11, 2024

@pliurh: This pull request references NP-1094 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 story to target the "4.14.z" version, but no target version was set.

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 openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Oct 11, 2024
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Oct 11, 2024
@pliurh
Copy link
Contributor Author

pliurh commented Oct 11, 2024

/hold
depends on openshift/api#1994

@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 Oct 11, 2024
Operconfig shouldn't own .Spec.Migration as it is not modifying it anywhere.
Setting the value to nil will ensure that the value of that field will stay unchanged (including the fieldManager).

Co-authored-by: Peng Liu <[email protected]>
Signed-off-by: Patryk Diak <[email protected]>
@pliurh pliurh force-pushed the release-4.14 branch 2 times, most recently from 3a7f3d7 to 923242b Compare October 29, 2024 03:22
pliurh and others added 12 commits October 31, 2024 23:49
Signed-off-by: Peng Liu <[email protected]>

Update network CRDs
In CNO, the network.operator CR can be updated by both operconfig
and clusterconfig controllers. There is a chance that these two
controllers may encounter a racing condition, resulting in conflict
error.

Normally, this type of error can be automatically recovered by
retrying the operation. Therefore, we don't set CNO to degrade
when encountering this error.

Signed-off-by: Peng Liu <[email protected]>
For the set of managed clusters excluding hypershift,
the namespace "dedicated-admin" shall exist.
Use this info to only enable live migration within that set.

Signed-off-by: Peng Liu <[email protected]>
Signed-off-by: Martin Kennelly <[email protected]>
In 4.16, we want to support SDN live migration for unmanaged
clusters.

Signed-off-by: Peng Liu <[email protected]>
Adds the following validations:
 - Do not allow migrating from OpenShiftSDN in multitenant mode.
 - Check whether any of the clusterNetwork/serviceNetwork subnets conflict
   the internal OVNKubernetes subnets(internal, transitstwitch and masquerade).
 - Do not allow migrating from OpenShiftSDN if there are any pods
   with pod.network.openshift.io/assign-macvlan annotation present in the cluster.

Signed-off-by: Patryk Diak <[email protected]>
…gration

During live migration, we run ovn-k and sdn in parallel. When new
nodes are added to the cluster, ovn-k and sdn may assign differnt
subnets to the nodes. This patch let ovn-k subject to sdn for the
node subnet allocation when both CNIs are deployed.

Signed-off-by: Peng Liu <[email protected]>
The NetworkTypeMigrationInProgress is set in operconfig controller
and not in the clusterconfig controller. Ensure that the live migration
is valid before initializing the condition.

Signed-off-by: Patryk Diak <[email protected]>
Add metric to publish the reason why live migration may not begin.
Add metric to publish the current live migration status condition type.

Signed-off-by: Martin Kennelly <[email protected]>
pliurh and others added 2 commits October 31, 2024 23:49
The configmap mtu is required by SDN live migration. It should be
created by the mtu-prober job at the installation time since 4.11.
But if the cluster was upgrade from a very early releases, it may
be absent.

Signed-off-by: Peng Liu <[email protected]>
@pliurh
Copy link
Contributor Author

pliurh commented Nov 1, 2024

/unhold

@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 Nov 1, 2024
@pliurh pliurh changed the title [Release 4.14] NP-1094: backport SDN live migration [Release 4.14] OCPBUGS-44098: backport SDN live migration Nov 1, 2024
@openshift-ci-robot
Copy link
Contributor

@pliurh: This pull request references Jira Issue OCPBUGS-44098, which is invalid:

  • expected Jira Issue OCPBUGS-44098 to depend on a bug targeting a version in 4.15.0, 4.15.z and in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but no dependents were found

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:

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/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label Nov 1, 2024
@pliurh
Copy link
Contributor Author

pliurh commented Nov 1, 2024

/jira refresh

@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/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Nov 1, 2024
@openshift-ci-robot
Copy link
Contributor

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

7 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.14.z) matches configured target version for branch (4.14.z)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
  • release note type set to "Release Note Not Required"
  • dependent bug Jira Issue OCPBUGS-44097 is in the state Closed (Done), which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
  • dependent Jira Issue OCPBUGS-44097 targets the "4.15.z" version, which is one of the valid target versions: 4.15.0, 4.15.z
  • bug has dependents

Requesting review from QA contact:
/cc @anuragthehatter

In response to this:

/jira refresh

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.

Copy link
Contributor

openshift-ci bot commented Nov 1, 2024

@pliurh: 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-vsphere-ovn-dualstack-primaryv6 e02a624 link false /test e2e-vsphere-ovn-dualstack-primaryv6
ci/prow/e2e-aws-hypershift-ovn-kubevirt e02a624 link false /test e2e-aws-hypershift-ovn-kubevirt
ci/prow/e2e-vsphere-ovn-dualstack e02a624 link false /test e2e-vsphere-ovn-dualstack
ci/prow/e2e-openstack-kuryr e02a624 link false /test e2e-openstack-kuryr
ci/prow/security e02a624 link false /test security

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants