[WIP] Two stage update hypershift IC rebase#1860
Closed
flavio-fernandes wants to merge 9 commits intoopenshift:masterfrom
Closed
[WIP] Two stage update hypershift IC rebase#1860flavio-fernandes wants to merge 9 commits intoopenshift:masterfrom
flavio-fernandes wants to merge 9 commits intoopenshift:masterfrom
Conversation
- 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>
Beware: this goes with https://github.com/openshift/ovn-kubernetes/pull/1727/commits Signed-off-by: Riccardo Ravaioli <rravaiol@redhat.com>
here I rename the yaml files and change them to work for hypershift-IC (cherry picked from commit 7b78d2b)
The major difference between managed and self hosted IC upgrade is the stateful set on the master side. patch the update so the commit works for this too. HACK to get the stateful set updated was to remove it when safe to do so in order to allow the CNO to create a version updated as we need to in phase 2 (cherry picked from commit 2f12a1d)
…troller (cherry picked from commit fa71de3)
openshift-ci
bot
added
the
do-not-merge/work-in-progress
Contributor
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: flavio-fernandes The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
Contributor
|
@flavio-fernandes: The following tests failed, say
Full PR test history. Your PR dashboard. DetailsInstructions 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
commented
Jul 7, 2023
| @@ -393,8 +393,15 @@ func renderOVNKubernetes(conf *operv1.NetworkSpec, bootstrapResult *bootstrap.Bo | |||
| manifestDirs = append(manifestDirs, filepath.Join(manifestDir, "network/ovn-kubernetes/common")) | |||
|
|
|||
| if bootstrapResult.OVN.OVNKubernetesConfig.HyperShiftConfig.Enabled { | |||
openshift-merge-robot
added
the
needs-rebase
Contributor
|
PR needs rebase. DetailsInstructions 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. |
Contributor
Author
|
no longer needed see #1874 |
Contributor
|
@flavio-fernandes: Closed this PR. DetailsIn 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 kubernetes/test-infra repository. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This combines ricky-rav's PR #1838 and
JacobTanenbaum's PR #1857
It should be used with latest ovnk8's downstream to upgrade from 4.13 to 4.14 in Hypershift deployments.