diff --git a/cmd/kubectl-directpv/install.go b/cmd/kubectl-directpv/install.go index ce12b421..bd330847 100644 --- a/cmd/kubectl-directpv/install.go +++ b/cmd/kubectl-directpv/install.go @@ -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" @@ -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 { diff --git a/cmd/kubectl-directpv/main.go b/cmd/kubectl-directpv/main.go index 089455c8..b77f665f 100644 --- a/cmd/kubectl-directpv/main.go +++ b/cmd/kubectl-directpv/main.go @@ -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" @@ -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{ @@ -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 },