Skip to content

Revert "feat: support prerun with minimal services" #2026

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
Jul 11, 2023
Merged

Revert "feat: support prerun with minimal services" #2026

Show file tree
Hide file tree
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
14 changes: 1 addition & 13 deletions pkg/admin/prerun/prerun.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,11 @@ func (hi *HealthInfo) IsHealthy() bool {

type PreRun struct {
dataManager data.Manager
config *config.Config
}

func New(dataManager data.Manager, config *config.Config) *PreRun {
func New(dataManager data.Manager) *PreRun {
return &PreRun{
dataManager: dataManager,
config: config,
}
}

Expand Down Expand Up @@ -189,11 +187,6 @@ func (pr *PreRun) regularPrerun() error {

if migrationNeeded {
_ = migrationNeeded
stop, err := runMinimalMicroshift(pr.config)
if err != nil {
return fmt.Errorf("minimal MicroShift run failed to be ready: %w", err)
}
defer stop()
// TODO: data migration

if err := writeExecVersionToData(); err != nil {
Expand All @@ -217,11 +210,6 @@ func (pr *PreRun) upgradeFrom413() error {
return fmt.Errorf("failed to create new backup %q: %w", backupName, err)
}

stop, err := runMinimalMicroshift(pr.config)
if err != nil {
return fmt.Errorf("minimal MicroShift run failed to be ready: %w", err)
}
defer stop()
// TODO: data migration

if err := writeExecVersionToData(); err != nil {
Expand Down
87 changes: 0 additions & 87 deletions pkg/admin/prerun/run_minimal.go
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions pkg/cmd/run.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,13 +78,13 @@ func logConfig(cfg *config.Config) {
}
}

func performPrerun(cfg *config.Config) error {
func performPrerun() error {
dataManager, err := data.NewManager(config.BackupsDir)
if err != nil {
return err
}

return prerun.New(dataManager, cfg).Perform()
return prerun.New(dataManager).Perform()
}

func RunMicroshift(cfg *config.Config) error {
Expand All @@ -93,7 +93,7 @@ func RunMicroshift(cfg *config.Config) error {
klog.Fatalf("MicroShift must be run privileged")
}

if err := performPrerun(cfg); err != nil {
if err := performPrerun(); err != nil {
klog.ErrorS(err, "Pre-run procedure failed")
return err
}
Expand Down