Skip to content

Commit 75ecef4

Browse files
install: initialize admin and legacy client to avoid crash for dry-run mode (#938)
``` main.installMain({0x1dbf3e0, 0xc000486c30}) github.com/minio/directpv/cmd/kubectl-directpv/install.go:194 +0x5bd main.init.func9(0x2b62700?, {0xc000402360?, 0x0?, 0x9?}) github.com/minio/directpv/cmd/kubectl-directpv/install.go:100 +0x25 github.com/spf13/cobra.(*Command).execute(0x2b62700, {0xc0004022d0, 0x9, 0x9}) github.com/spf13/[email protected]/command.go:989 +0xab1 github.com/spf13/cobra.(*Command).ExecuteC(0x2b63560) github.com/spf13/[email protected]/command.go:1117 +0x3ff github.com/spf13/cobra.(*Command).Execute(...) github.com/spf13/[email protected]/command.go:1041 github.com/spf13/cobra.(*Command).ExecuteContext(...) github.com/spf13/[email protected]/command.go:1034 main.main() github.com/minio/directpv/cmd/kubectl-directpv/main.go:193 +0x14e ``` Co-authored-by: Praveen raj Mani <[email protected]>
1 parent d1bef0c commit 75ecef4

File tree

2 files changed

+11
-8
lines changed

2 files changed

+11
-8
lines changed

cmd/kubectl-directpv/install.go

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ import (
3131
"github.com/minio/directpv/pkg/admin/installer"
3232
"github.com/minio/directpv/pkg/consts"
3333
"github.com/minio/directpv/pkg/k8s"
34-
legacyclient "github.com/minio/directpv/pkg/legacy/client"
3534
"github.com/minio/directpv/pkg/utils"
3635
"github.com/spf13/cobra"
3736
corev1 "k8s.io/api/core/v1"
@@ -192,11 +191,6 @@ func installMain(ctx context.Context) {
192191
var failed bool
193192
var wg sync.WaitGroup
194193
var installedComponents []installer.Component
195-
legacyClient, err := legacyclient.NewClient(adminClient.K8s())
196-
if err != nil {
197-
fmt.Println("error creating legacy client:", err)
198-
return
199-
}
200194
installerTasks := installer.GetDefaultTasks(adminClient.Client, legacyClient)
201195
enableProgress := !dryRun && !declarativeFlag && !quietFlag
202196
if enableProgress {

cmd/kubectl-directpv/main.go

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import (
2626
"github.com/minio/directpv/pkg/admin"
2727
"github.com/minio/directpv/pkg/consts"
2828
"github.com/minio/directpv/pkg/k8s"
29+
legacy "github.com/minio/directpv/pkg/legacy/client"
2930
"github.com/spf13/cobra"
3031
"github.com/spf13/viper"
3132
"k8s.io/client-go/rest"
@@ -37,8 +38,9 @@ import (
3738
var Version string
3839

3940
var (
40-
disableInit bool
41-
adminClient *admin.Client
41+
disableInit bool
42+
adminClient *admin.Client
43+
legacyClient *legacy.Client
4244
)
4345

4446
var mainCmd = &cobra.Command{
@@ -61,6 +63,13 @@ var mainCmd = &cobra.Command{
6163
if err != nil {
6264
klog.Fatalf("unable to create admin client; %v", err)
6365
}
66+
legacyClient, err = legacy.NewClient(adminClient.K8s())
67+
if err != nil {
68+
klog.Fatalf("unable to create legacy client; %v", err)
69+
}
70+
} else {
71+
adminClient = &admin.Client{}
72+
legacyClient = &legacy.Client{}
6473
}
6574
return nil
6675
},

0 commit comments

Comments
 (0)