diff --git a/cmd/vclusterctl/cmd/get/get.go b/cmd/vclusterctl/cmd/get/get.go deleted file mode 100644 index 6a2943ac8..000000000 --- a/cmd/vclusterctl/cmd/get/get.go +++ /dev/null @@ -1,22 +0,0 @@ -package get - -import ( - "github.com/loft-sh/vcluster/pkg/cli/flags" - "github.com/spf13/cobra" -) - -func NewGetCmd(globalFlags *flags.GlobalFlags) *cobra.Command { - getCmd := &cobra.Command{ - Use: "get", - Short: "Gets cluster related information", - Long: ` -####################################################### -#################### vcluster get ##################### -####################################################### - `, - Args: cobra.NoArgs, - } - - getCmd.AddCommand(getServiceCIDR(globalFlags)) - return getCmd -} diff --git a/cmd/vclusterctl/cmd/get/service_cidr.go b/cmd/vclusterctl/cmd/get/service_cidr.go deleted file mode 100644 index dd8805a7d..000000000 --- a/cmd/vclusterctl/cmd/get/service_cidr.go +++ /dev/null @@ -1,80 +0,0 @@ -package get - -import ( - "fmt" - - "github.com/loft-sh/log" - "github.com/loft-sh/vcluster/pkg/cli/flags" - "github.com/loft-sh/vcluster/pkg/util/servicecidr" - "github.com/sirupsen/logrus" - "github.com/spf13/cobra" - "k8s.io/client-go/kubernetes" - "k8s.io/client-go/tools/clientcmd" -) - -type serviceCIDRCmd struct { - *flags.GlobalFlags - log log.Logger -} - -func getServiceCIDR(globalFlags *flags.GlobalFlags) *cobra.Command { - cmd := &serviceCIDRCmd{ - GlobalFlags: globalFlags, - log: log.GetInstance(), - } - - cobraCmd := &cobra.Command{ - Use: "service-cidr", - Short: "Prints Service CIDR of the cluster", - Long: ` -####################################################### -############### vcluster get service-cidr ############ -####################################################### -Prints Service CIDR of the cluster - -Ex: -vcluster get service-cidr -10.96.0.0/12 -####################################################### - `, - RunE: func(cobraCmd *cobra.Command, _ []string) error { - return cmd.Run(cobraCmd) - }} - - return cobraCmd -} - -func (cmd *serviceCIDRCmd) Run(cobraCmd *cobra.Command) error { - // first load the kube config - kubeClientConfig := clientcmd.NewNonInteractiveDeferredLoadingClientConfig(clientcmd.NewDefaultClientConfigLoadingRules(), &clientcmd.ConfigOverrides{ - CurrentContext: cmd.Context, - }) - - // load the rest config - kubeConfig, err := kubeClientConfig.ClientConfig() - if err != nil { - return fmt.Errorf("there is an error loading your current kube config (%w), please make sure you have access to a kubernetes cluster and the command `kubectl get namespaces` is working", err) - } - - client, err := kubernetes.NewForConfig(kubeConfig) - if err != nil { - return err - } - - if cmd.Namespace == "" { - cmd.Namespace, _, err = kubeClientConfig.Namespace() - if err != nil { - return err - } else if cmd.Namespace == "" { - cmd.Namespace = "default" - } - } - - cidr, warning := servicecidr.GetServiceCIDR(cobraCmd.Context(), client, cmd.Namespace) - if warning != "" { - cmd.log.Debugf(warning) - } - - cmd.log.WriteString(logrus.InfoLevel, cidr) - return nil -} diff --git a/cmd/vclusterctl/cmd/root.go b/cmd/vclusterctl/cmd/root.go index 941860405..3c5c1eefb 100644 --- a/cmd/vclusterctl/cmd/root.go +++ b/cmd/vclusterctl/cmd/root.go @@ -10,7 +10,6 @@ import ( "github.com/loft-sh/log" "github.com/loft-sh/vcluster/cmd/vclusterctl/cmd/convert" "github.com/loft-sh/vcluster/cmd/vclusterctl/cmd/credits" - "github.com/loft-sh/vcluster/cmd/vclusterctl/cmd/get" cmdpro "github.com/loft-sh/vcluster/cmd/vclusterctl/cmd/platform" "github.com/loft-sh/vcluster/cmd/vclusterctl/cmd/platform/set" cmdtelemetry "github.com/loft-sh/vcluster/cmd/vclusterctl/cmd/telemetry" @@ -108,7 +107,6 @@ func BuildRoot(log log.Logger) (*cobra.Command, error) { rootCmd.AddCommand(NewResumeCmd(globalFlags)) rootCmd.AddCommand(NewDisconnectCmd(globalFlags)) rootCmd.AddCommand(NewUpgradeCmd()) - rootCmd.AddCommand(get.NewGetCmd(globalFlags)) rootCmd.AddCommand(use.NewUseCmd(globalFlags)) rootCmd.AddCommand(convert.NewConvertCmd(globalFlags)) rootCmd.AddCommand(cmdtelemetry.NewTelemetryCmd(globalFlags))