Skip to content

Commit 213938f

Browse files
committed
Drop network type migration support
1 parent 02e33fd commit 213938f

14 files changed

+7
-2955
lines changed

pkg/controller/clusterconfig/clusterconfig_controller.go

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -106,16 +106,6 @@ func (r *ReconcileClusterConfig) Reconcile(ctx context.Context, request reconcil
106106
}
107107
network.MergeClusterConfig(&operConfig.Spec, clusterConfig.Spec)
108108

109-
if _, ok := clusterConfig.Annotations[names.NetworkTypeMigrationAnnotation]; ok {
110-
// https://github.com/openshift/enhancements/blob/master/enhancements/network/sdn-live-migration.md#api
111-
if err := r.processNetworkTypeLiveMigration(ctx, request, clusterConfig, operConfig); err != nil {
112-
log.Printf("Failed to process SDN live migration: %v", err)
113-
r.status.SetDegraded(statusmanager.ClusterConfig, "NetworkTypeMigrationFailed",
114-
fmt.Sprintf("Failed to process SDN live migration (%v). Use 'oc edit network.config.openshift.io cluster' to fix.", err))
115-
return reconcile.Result{}, err
116-
}
117-
}
118-
119109
if err := apply.ApplyObject(ctx, r.client, operConfig, "clusterconfig"); err != nil {
120110
// not set degraded if the err is a version conflict, but return a reconcile err for retry.
121111
if !apierrors.IsConflict(err) {

pkg/controller/clusterconfig/migration.go

Lines changed: 0 additions & 164 deletions
This file was deleted.

0 commit comments

Comments
 (0)