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

install: initialize admin and legacy client to avoid crash for dry-run mode #937

Merged
merged 2 commits into from
Aug 30, 2024
Merged

install: initialize admin and legacy client to avoid crash for dry-run mode #937

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
cf3bfd0
fix: panic in dry-run mode `kubectl directpv install -o yaml`
Praveenrajmani Aug 28, 2024
de68c3e
Merge branch 'master' into fix-dry-run
balamurugana Aug 29, 2024
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
6 changes: 0 additions & 6 deletions cmd/kubectl-directpv/install.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ import (
"github.com/minio/directpv/pkg/admin/installer"
"github.com/minio/directpv/pkg/consts"
"github.com/minio/directpv/pkg/k8s"
legacyclient "github.com/minio/directpv/pkg/legacy/client"
"github.com/minio/directpv/pkg/utils"
"github.com/spf13/cobra"
corev1 "k8s.io/api/core/v1"
Expand Down Expand Up @@ -192,11 +191,6 @@ func installMain(ctx context.Context) {
var failed bool
var wg sync.WaitGroup
var installedComponents []installer.Component
legacyClient, err := legacyclient.NewClient(adminClient.K8s())
if err != nil {
fmt.Println("error creating legacy client:", err)
return
}
installerTasks := installer.GetDefaultTasks(adminClient.Client, legacyClient)
enableProgress := !dryRun && !declarativeFlag && !quietFlag
if enableProgress {
Expand Down
13 changes: 11 additions & 2 deletions cmd/kubectl-directpv/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import (
"github.com/minio/directpv/pkg/admin"
"github.com/minio/directpv/pkg/consts"
"github.com/minio/directpv/pkg/k8s"
legacy "github.com/minio/directpv/pkg/legacy/client"
"github.com/spf13/cobra"
"github.com/spf13/viper"
"k8s.io/client-go/rest"
Expand All @@ -37,8 +38,9 @@ import (
var Version string

var (
disableInit bool
adminClient *admin.Client
disableInit bool
adminClient *admin.Client
legacyClient *legacy.Client
)

var mainCmd = &cobra.Command{
Expand All @@ -61,6 +63,13 @@ var mainCmd = &cobra.Command{
if err != nil {
klog.Fatalf("unable to create admin client; %v", err)
}
legacyClient, err = legacy.NewClient(adminClient.K8s())
if err != nil {
klog.Fatalf("unable to create legacy client; %v", err)
}
} else {
adminClient = &admin.Client{}
legacyClient = &legacy.Client{}
}
return nil
},
Expand Down
Loading