Skip to content

[WIP] Ricky pr1838 plus UT fix#1882

Closed
flavio-fernandes wants to merge 8 commits intoopenshift:masterfrom
flavio-fernandes:ricky_pr1838
Closed

[WIP] Ricky pr1838 plus UT fix#1882
flavio-fernandes wants to merge 8 commits intoopenshift:masterfrom
flavio-fernandes:ricky_pr1838

Conversation

@flavio-fernandes
Copy link
Contributor

This is a WIP PR that fixes the UT issues we currently have in Ricky PR.

Ref: #1838

ricky-rav and others added 8 commits July 10, 2023 17:55
- Determine OVN interconnect zone mode by inspecting an (optional) configMap; apply the desired zone mode.
- upgrade from non-IC to IC OVN-K by going through an intermediate step with 1-zone
- Switch from IC single zone to IC multizone (as in upgrades) and back (not fully supported yet, for internal use only)

Avoid clashes between single-zone ovnkube-master (using ports 9102, 9641, 9642, 29102) and multizone ovnkube-node (initially using ports 9103, 9105, 9102, 29102, 29103) during upgrade from 4.13 and avoid using ports reserved for the storage components, as described in https://github.com/openshift/enhancements/blob/master/dev-guide/host-port-registry.md  This caused the storage operator to never be available after installation of or upgrade to 4.14.

In multizone ovnkube-node let's now have:
- 9103, 9105, 29103 (which don't collide with single-zone ovnkube-master)
- 9112, 9112 9113, 29113 so as to not collide with single-zone ovnkube-master

Signed-off-by: Riccardo Ravaioli <rravaiol@redhat.com>
Signed-off-by: Riccardo Ravaioli <rravaiol@redhat.com>
Signed-off-by: Riccardo Ravaioli <rravaiol@redhat.com>
In the very last step of the 2-phase upgrade to OVN interconnect, we remove the IC configmap.
At this point, SetFromPods from pod_status.go won't be called any more, because all changes to the daemonsets have been processed. Patch the ovnk master daemonset with a dummy annotation to trigger status recalculation.

TODO: find a better way to run SetFromPods instead of updating ovnk master annotations

Signed-off-by: Riccardo Ravaioli <rravaiol@redhat.com>
Signed-off-by: Riccardo Ravaioli <rravaiol@redhat.com>
Signed-off-by: Riccardo Ravaioli <rravaiol@redhat.com>
Signed-off-by: Flavio Fernandes <flaviof@redhat.com>
@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 Jul 10, 2023
@openshift-ci openshift-ci bot requested review from abhat and dougbtv July 10, 2023 21:32
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jul 10, 2023

[APPROVALNOTIFIER] This PR is NOT APPROVED

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

The full list of commands accepted by this bot can be found here.

Details 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
Copy link
Contributor

openshift-ci bot commented Jul 11, 2023

@flavio-fernandes: 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-network-mtu-migration-ovn-ipv4 b40574d link false /test e2e-network-mtu-migration-ovn-ipv4
ci/prow/e2e-gcp-ovn b40574d link true /test e2e-gcp-ovn
ci/prow/e2e-aws-sdn-multi b40574d link true /test e2e-aws-sdn-multi
ci/prow/e2e-aws-ovn-single-node b40574d link false /test e2e-aws-ovn-single-node
ci/prow/e2e-network-mtu-migration-ovn-ipv6 b40574d link false /test e2e-network-mtu-migration-ovn-ipv6
ci/prow/e2e-aws-ovn-network-migration b40574d link true /test e2e-aws-ovn-network-migration
ci/prow/e2e-vsphere-ovn b40574d link false /test e2e-vsphere-ovn
ci/prow/e2e-aws-sdn-network-migration-rollback b40574d link true /test e2e-aws-sdn-network-migration-rollback
ci/prow/e2e-ovn-hybrid-step-registry b40574d link false /test e2e-ovn-hybrid-step-registry
ci/prow/e2e-openstack-ovn b40574d link false /test e2e-openstack-ovn
ci/prow/e2e-ovn-ipsec-step-registry b40574d link false /test e2e-ovn-ipsec-step-registry
ci/prow/e2e-vsphere-ovn-windows b40574d link true /test e2e-vsphere-ovn-windows
ci/prow/e2e-aws-ovn-windows b40574d link true /test e2e-aws-ovn-windows
ci/prow/e2e-ovn-step-registry b40574d link false /test e2e-ovn-step-registry
ci/prow/e2e-hypershift-ovn b40574d link true /test e2e-hypershift-ovn
ci/prow/e2e-metal-ipi-ovn-ipv6-ipsec b40574d link false /test e2e-metal-ipi-ovn-ipv6-ipsec
ci/prow/e2e-aws-sdn-network-reverse-migration b40574d link true /test e2e-aws-sdn-network-reverse-migration
ci/prow/e2e-gcp-ovn-upgrade b40574d link false /test e2e-gcp-ovn-upgrade
ci/prow/e2e-aws-ovn-serial b40574d link false /test e2e-aws-ovn-serial
ci/prow/e2e-vsphere-ovn-dualstack b40574d link false /test e2e-vsphere-ovn-dualstack
ci/prow/e2e-metal-ipi-ovn-ipv6 b40574d link true /test e2e-metal-ipi-ovn-ipv6
ci/prow/e2e-azure-ovn b40574d link false /test e2e-azure-ovn

Full PR test history. Your PR dashboard.

Details

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

@flavio-fernandes
Copy link
Contributor Author

no longer needed see #1874
/close

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jul 13, 2023

@flavio-fernandes: Closed this PR.

Details

In response to this:

no longer needed see #1874
/close

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/test-infra repository.

@openshift-ci openshift-ci bot closed this Jul 13, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants