Skip to content

Bug 1937594: Respect status.Migration in network.config when exsits #2518

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.

Sign up for GitHub

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

Merged
openshift-merge-robot merged 1 commit into from
Apr 16, 2021
Merged

Bug 1937594: Respect status.Migration in network.config when exsits #2518

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions pkg/operator/render.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,9 @@ func createDiscoveredControllerConfigSpec(infra *configv1.Infrastructure, networ
if network.Status.NetworkType == "" {
// At install time, when CNO has not started, status is unset, use the value in spec.
ccSpec.NetworkType = network.Spec.NetworkType
} else if network.Status.Migration != nil {
// At sdn migration prepare phase, use the value in status.migration to prepare the node.
ccSpec.NetworkType = network.Status.Migration.NetworkType
} else {
// After installation, the MCO should not assume the network is changing just because the spec changed, it needs to wait until CNO updates the status.
ccSpec.NetworkType = network.Status.NetworkType
Expand Down