Skip to content

Fix unit test issues in pr 1838#1

Open
flavio-fernandes wants to merge 8 commits intoricky-rav:ICinstallfrom
flavio-fernandes:ricky_pr1838
Open

Fix unit test issues in pr 1838#1
flavio-fernandes wants to merge 8 commits intoricky-rav:ICinstallfrom
flavio-fernandes:ricky_pr1838

Conversation

@flavio-fernandes
Copy link

@ricky-rav may you merge this to ricky-rav:ICinstall ?

openshift#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>
@ricky-rav ricky-rav force-pushed the ICinstall branch 4 times, most recently from faf5244 to 5816049 Compare July 21, 2023 15:31
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.

2 participants