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

Jump to bottom

[migration] Remove OCP 4.1 -> 4.2 migrator #291

Merged
merged 2 commits into from
Mar 16, 2020
Merged

[migration] Remove OCP 4.1 -> 4.2 migrator #291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cc83832
[migration] Remove OCP 4.1 -> 4.2 migrator
anik120 Mar 16, 2020
b32255f
[dep] Remove dependency on k8s.io/kubernetes
anik120 Mar 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
9 changes: 0 additions & 9 deletions Gopkg.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions Gopkg.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,3 @@ required = [
branch = "release-4.2"
name = "github.com/openshift/client-go"

[[constraint]]
name = "k8s.io/kubernetes"
version = "1.14.0"
21 changes: 2 additions & 19 deletions cmd/manager/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,13 @@ import (
"context"
"flag"
"fmt"
"github.com/operator-framework/operator-marketplace/pkg/metrics"
"net/http"
"os"
"runtime"
"time"

"github.com/operator-framework/operator-marketplace/pkg/metrics"

apiconfigv1 "github.com/openshift/api/config/v1"
olm "github.com/operator-framework/operator-lifecycle-manager/pkg/api/apis/operators/v1alpha1"
"github.com/operator-framework/operator-lifecycle-manager/pkg/lib/signals"
Expand All @@ -19,7 +20,6 @@ import (
"github.com/operator-framework/operator-marketplace/pkg/controller"
"github.com/operator-framework/operator-marketplace/pkg/controller/options"
"github.com/operator-framework/operator-marketplace/pkg/defaults"
"github.com/operator-framework/operator-marketplace/pkg/migrator"
"github.com/operator-framework/operator-marketplace/pkg/operatorhub"
"github.com/operator-framework/operator-marketplace/pkg/operatorsource"
"github.com/operator-framework/operator-marketplace/pkg/registry"
Expand Down Expand Up @@ -186,23 +186,6 @@ func main() {
exit(err)
}

// set ClusterOperator status to report Migration
if err := statusReporter.ReportMigration(); err != nil {
exit(err)
}

client, err := client.New(cfg, client.Options{})
if err != nil {
exit(err)
}

// Perform migration logic to upgrade cluster from 4.1.z to 4.2.z
migrator := migrator.NewMigrator(client)
err = migrator.Migrate(namespace)
if err != nil {
exit(err)
}

// statusReportingDoneCh will be closed after the operator has successfully stopped reporting ClusterOperator status.
statusReportingDoneCh := statusReporter.StartReporting()

Expand Down
273 changes: 0 additions & 273 deletions pkg/migrator/migrator.go
View file
Open in desktop

This file was deleted.