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.

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

[release-4.16] OCPBUGS-43803: Start feature migration when the cluster CNI is changed to the target type #2552

Open
wants to merge 1 commit into
base: release-4.16
Choose a base branch
from
+21 −18
Open

[release-4.16] OCPBUGS-43803: Start feature migration when the cluster CNI is changed to the target type #2552

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
39 changes: 21 additions & 18 deletions pkg/controller/operconfig/operconfig_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -540,26 +540,29 @@ func (r *ReconcileOperConfig) Reconcile(ctx context.Context, request reconcile.R
return reconcile.Result{}, err
}

migration := operConfig.Spec.Migration
if migration.Features == nil || migration.Features.EgressFirewall {
err = migrateEgressFirewallCRs(ctx, operConfig, r.client)
if err != nil {
log.Printf("Could not migrate EgressFirewall CRs: %v", err)
return reconcile.Result{}, err
// start feature migration when the cluster CNI is changed to the target type
if operConfig.Spec.Migration.NetworkType == string(operConfig.Spec.DefaultNetwork.Type) {
migration := operConfig.Spec.Migration
if migration.Features == nil || migration.Features.EgressFirewall {
err = migrateEgressFirewallCRs(ctx, operConfig, r.client)
if err != nil {
log.Printf("Could not migrate EgressFirewall CRs: %v", err)
return reconcile.Result{}, err
}
}
}
if migration.Features == nil || migration.Features.Multicast {
err = migrateMulticastEnablement(ctx, operConfig, r.client)
if err != nil {
log.Printf("Could not migrate Multicast settings: %v", err)
return reconcile.Result{}, err
if migration.Features == nil || migration.Features.Multicast {
err = migrateMulticastEnablement(ctx, operConfig, r.client)
if err != nil {
log.Printf("Could not migrate Multicast settings: %v", err)
return reconcile.Result{}, err
}
}
}
if migration.Features == nil || migration.Features.EgressIP {
err = migrateEgressIpCRs(ctx, operConfig, r.client)
if err != nil {
log.Printf("Could not migrate EgressIP CRs: %v", err)
return reconcile.Result{}, err
if migration.Features == nil || migration.Features.EgressIP {
err = migrateEgressIpCRs(ctx, operConfig, r.client)
if err != nil {
log.Printf("Could not migrate EgressIP CRs: %v", err)
return reconcile.Result{}, err
}
}
}
}
Expand Down