removed references to loftctl repo, copied the files from over there

loft-sh · May 22, 2024 · 1ec0112 · 1ec0112
1 parent c54bc15
commit 1ec0112
Show file tree

Hide file tree

Showing 20 changed files with 3,269 additions and 17 deletions.
diff --git a/cmd/vclusterctl/cmd/platform/access_key.go b/cmd/vclusterctl/cmd/platform/access_key.go
@@ -7,9 +7,9 @@ import (
 	"os"
 
 	"github.com/loft-sh/api/v4/pkg/product"
-	"github.com/loft-sh/loftctl/v4/pkg/client"
 	"github.com/loft-sh/log"
 	"github.com/loft-sh/vcluster/pkg/cli/flags"
+	client "github.com/loft-sh/vcluster/pkg/loftclient"
 	"github.com/spf13/cobra"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/pkg/apis/clientauthentication/v1beta1"

diff --git a/cmd/vclusterctl/cmd/platform/add/cluster.go b/cmd/vclusterctl/cmd/platform/add/cluster.go
@@ -8,11 +8,11 @@ import (
 	"os/exec"
 	"time"
 
-	"github.com/loft-sh/loftctl/v4/pkg/client"
-	"github.com/loft-sh/loftctl/v4/pkg/client/helper"
-	"github.com/loft-sh/loftctl/v4/pkg/clihelper"
-	"github.com/loft-sh/loftctl/v4/pkg/kube"
 	"github.com/loft-sh/log"
+	"github.com/loft-sh/vcluster/pkg/clihelper"
+	"github.com/loft-sh/vcluster/pkg/kube"
+	client "github.com/loft-sh/vcluster/pkg/loftclient"
+	"github.com/loft-sh/vcluster/pkg/loftclient/helper"
 	"github.com/sirupsen/logrus"
 	kerrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/util/wait"

diff --git a/cmd/vclusterctl/cmd/platform/connect/cluster.go b/cmd/vclusterctl/cmd/platform/connect/cluster.go
@@ -9,11 +9,11 @@ import (
 
 	managementv1 "github.com/loft-sh/api/v4/pkg/apis/management/v1"
 	"github.com/loft-sh/api/v4/pkg/product"
-	"github.com/loft-sh/loftctl/v4/pkg/client"
-	"github.com/loft-sh/loftctl/v4/pkg/client/helper"
-	"github.com/loft-sh/loftctl/v4/pkg/kubeconfig"
 	"github.com/loft-sh/log"
 	"github.com/loft-sh/vcluster/pkg/cli/flags"
+	"github.com/loft-sh/vcluster/pkg/kubeconfig"
+	client "github.com/loft-sh/vcluster/pkg/loftclient"
+	"github.com/loft-sh/vcluster/pkg/loftclient/helper"
 	"github.com/loft-sh/vcluster/pkg/upgrade"
 	"github.com/mgutz/ansi"
 	"github.com/spf13/cobra"

diff --git a/cmd/vclusterctl/cmd/platform/connect/connect.go b/cmd/vclusterctl/cmd/platform/connect/connect.go
@@ -2,13 +2,13 @@ package connect
 
 import (
 	"github.com/loft-sh/api/v4/pkg/product"
-	pdefaults "github.com/loft-sh/loftctl/v4/pkg/defaults"
 	"github.com/loft-sh/vcluster/pkg/cli/flags"
+	"github.com/loft-sh/vcluster/pkg/platformdefaults"
 	"github.com/spf13/cobra"
 )
 
 // NewConnectCmd creates a new cobra command
-func NewConnectCmd(globalFlags *flags.GlobalFlags, _ *pdefaults.Defaults) *cobra.Command {
+func NewConnectCmd(globalFlags *flags.GlobalFlags, _ *platformdefaults.Defaults) *cobra.Command {
 	description := product.ReplaceWithHeader("use", `
 
 Activates a kube context for the given cluster / space / vcluster / management.

diff --git a/cmd/vclusterctl/cmd/platform/get/cluster.go b/cmd/vclusterctl/cmd/platform/get/cluster.go
@@ -8,10 +8,10 @@ import (
 	"time"
 
 	managementv1 "github.com/loft-sh/api/v4/pkg/apis/management/v1"
-	"github.com/loft-sh/loftctl/v4/pkg/client"
-	"github.com/loft-sh/loftctl/v4/pkg/client/naming"
-	"github.com/loft-sh/loftctl/v4/pkg/config"
 	"github.com/loft-sh/vcluster/pkg/cli/flags"
+	client "github.com/loft-sh/vcluster/pkg/loftclient"
+	"github.com/loft-sh/vcluster/pkg/loftclient/naming"
+	config "github.com/loft-sh/vcluster/pkg/loftconfig"
 	"github.com/spf13/cobra"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/wait"

diff --git a/cmd/vclusterctl/cmd/platform/import.go b/cmd/vclusterctl/cmd/platform/import.go
@@ -3,10 +3,10 @@ package platform
 import (
 	"context"
 
-	loftctlUtil "github.com/loft-sh/loftctl/v4/pkg/util"
 	"github.com/loft-sh/log"
 	"github.com/loft-sh/vcluster/pkg/cli"
 	"github.com/loft-sh/vcluster/pkg/cli/flags"
+	loftctlUtil "github.com/loft-sh/vcluster/pkg/loftutils"
 	"github.com/loft-sh/vcluster/pkg/platform"
 	"github.com/spf13/cobra"
 )

diff --git a/cmd/vclusterctl/cmd/platform/list/clusters.go b/cmd/vclusterctl/cmd/platform/list/clusters.go
@@ -5,10 +5,10 @@ import (
 	"time"
 
 	"github.com/loft-sh/api/v4/pkg/product"
-	"github.com/loft-sh/loftctl/v4/pkg/client"
 	"github.com/loft-sh/log"
 	"github.com/loft-sh/log/table"
 	"github.com/loft-sh/vcluster/pkg/cli/flags"
+	client "github.com/loft-sh/vcluster/pkg/loftclient"
 	"github.com/loft-sh/vcluster/pkg/upgrade"
 	"github.com/spf13/cobra"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

diff --git a/cmd/vclusterctl/cmd/platform/pro.go b/cmd/vclusterctl/cmd/platform/pro.go
@@ -3,10 +3,10 @@ package platform
 import (
 	"fmt"
 
-	"github.com/loft-sh/loftctl/v4/pkg/defaults"
 	"github.com/loft-sh/log"
 	"github.com/loft-sh/vcluster/cmd/vclusterctl/cmd/platform/connect"
 	"github.com/loft-sh/vcluster/pkg/cli/flags"
+	"github.com/loft-sh/vcluster/pkg/platformdefaults"
 	"github.com/spf13/cobra"
 )
 
@@ -27,7 +27,7 @@ Deprecated, please use vcluster platform instead
 	if err != nil {
 		return nil, fmt.Errorf("failed to create vcluster pro start command: %w", err)
 	}
-	d, err := defaults.NewFromPath(defaults.ConfigFolder, defaults.ConfigFile)
+	d, err := platformdefaults.NewFromPath(platformdefaults.ConfigFolder, platformdefaults.ConfigFile)
 	if err != nil {
 		log.Default.Debugf(err.Error())
 	}