Skip to content

Commit

Permalink
Merge pull request #1761 from rohantmp/fixPlatformText
Browse files Browse the repository at this point in the history
chore: upgrade loft api and cli import to v4, replace pro mentions with platform
  • Loading branch information
FabianKramm authored May 13, 2024
2 parents 9b57326 + 8d0e67f commit c531f3f
Show file tree
Hide file tree
Showing 399 changed files with 969 additions and 1,019 deletions.
2 changes: 1 addition & 1 deletion cmd/vclusterctl/cmd/activate.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package cmd

import (
loftctlUtil "github.com/loft-sh/loftctl/v3/pkg/util"
loftctlUtil "github.com/loft-sh/loftctl/v4/pkg/util"
"github.com/loft-sh/log"
platformcmd "github.com/loft-sh/vcluster/cmd/vclusterctl/cmd/platform"
"github.com/loft-sh/vcluster/pkg/cli/flags"
Expand Down
2 changes: 1 addition & 1 deletion cmd/vclusterctl/cmd/connect.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"
"fmt"

loftctlUtil "github.com/loft-sh/loftctl/v3/pkg/util"
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"
Expand Down
2 changes: 1 addition & 1 deletion cmd/vclusterctl/cmd/create.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"fmt"
"strings"

loftctlUtil "github.com/loft-sh/loftctl/v3/pkg/util"
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"
Expand Down
2 changes: 1 addition & 1 deletion cmd/vclusterctl/cmd/delete.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package cmd

import (
loftctlUtil "github.com/loft-sh/loftctl/v3/pkg/util"
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"
Expand Down
4 changes: 2 additions & 2 deletions cmd/vclusterctl/cmd/login.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package cmd
import (
"fmt"

"github.com/loft-sh/api/v3/pkg/product"
loftctl "github.com/loft-sh/loftctl/v3/cmd/loftctl/cmd"
"github.com/loft-sh/api/v4/pkg/product"
loftctl "github.com/loft-sh/loftctl/v4/cmd/loftctl/cmd"
"github.com/loft-sh/log"
"github.com/loft-sh/vcluster/cmd/vclusterctl/cmd/use"
"github.com/loft-sh/vcluster/pkg/cli/flags"
Expand Down
2 changes: 1 addition & 1 deletion cmd/vclusterctl/cmd/logout.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package cmd
import (
"fmt"

loftctl "github.com/loft-sh/loftctl/v3/cmd/loftctl/cmd"
loftctl "github.com/loft-sh/loftctl/v4/cmd/loftctl/cmd"
"github.com/loft-sh/log"
"github.com/loft-sh/vcluster/cmd/vclusterctl/cmd/use"
"github.com/loft-sh/vcluster/pkg/cli/flags"
Expand Down
4 changes: 2 additions & 2 deletions cmd/vclusterctl/cmd/pause.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package cmd
import (
"context"

"github.com/loft-sh/api/v3/pkg/product"
loftctlUtil "github.com/loft-sh/loftctl/v3/pkg/util"
"github.com/loft-sh/api/v4/pkg/product"
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"
Expand Down
6 changes: 3 additions & 3 deletions cmd/vclusterctl/cmd/platform/access_key.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (
"fmt"
"os"

"github.com/loft-sh/api/v3/pkg/product"
"github.com/loft-sh/loftctl/v3/cmd/loftctl/flags"
"github.com/loft-sh/loftctl/v3/pkg/client"
"github.com/loft-sh/api/v4/pkg/product"
"github.com/loft-sh/loftctl/v4/cmd/loftctl/flags"
"github.com/loft-sh/loftctl/v4/pkg/client"
"github.com/loft-sh/log"
"github.com/spf13/cobra"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
16 changes: 8 additions & 8 deletions cmd/vclusterctl/cmd/platform/connect/cluster.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,19 @@ import (
"os/exec"
"time"

"github.com/loft-sh/loftctl/v3/pkg/client"
"github.com/loft-sh/loftctl/v3/pkg/client/helper"
"github.com/loft-sh/loftctl/v3/pkg/clihelper"
"github.com/loft-sh/loftctl/v3/pkg/kube"
"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/sirupsen/logrus"
kerrors "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/util/wait"

managementv1 "github.com/loft-sh/api/v3/pkg/apis/management/v1"
storagev1 "github.com/loft-sh/api/v3/pkg/apis/storage/v1"
"github.com/loft-sh/loftctl/v3/cmd/loftctl/flags"
"github.com/loft-sh/loftctl/v3/pkg/upgrade"
managementv1 "github.com/loft-sh/api/v4/pkg/apis/management/v1"
storagev1 "github.com/loft-sh/api/v4/pkg/apis/storage/v1"
"github.com/loft-sh/loftctl/v4/cmd/loftctl/flags"
"github.com/loft-sh/loftctl/v4/pkg/upgrade"
"github.com/spf13/cobra"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/kubernetes"
Expand Down
2 changes: 1 addition & 1 deletion cmd/vclusterctl/cmd/platform/connect/connect.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package connect

import (
"github.com/loft-sh/loftctl/v3/cmd/loftctl/flags"
"github.com/loft-sh/loftctl/v4/cmd/loftctl/flags"
"github.com/spf13/cobra"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/vclusterctl/cmd/platform/import.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package platform
import (
"context"

loftctlUtil "github.com/loft-sh/loftctl/v3/pkg/util"
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"
Expand Down
4 changes: 2 additions & 2 deletions cmd/vclusterctl/cmd/platform/reset.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package platform

import (
"github.com/loft-sh/loftctl/v3/cmd/loftctl/cmd/reset"
loftctlflags "github.com/loft-sh/loftctl/v3/cmd/loftctl/flags"
"github.com/loft-sh/loftctl/v4/cmd/loftctl/cmd/reset"
loftctlflags "github.com/loft-sh/loftctl/v4/cmd/loftctl/flags"
"github.com/loft-sh/log"
"github.com/spf13/cobra"
)
Expand Down
4 changes: 2 additions & 2 deletions cmd/vclusterctl/cmd/platform/start.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"context"
"fmt"

loftctlflags "github.com/loft-sh/loftctl/v3/cmd/loftctl/flags"
"github.com/loft-sh/loftctl/v3/pkg/start"
loftctlflags "github.com/loft-sh/loftctl/v4/cmd/loftctl/flags"
"github.com/loft-sh/loftctl/v4/pkg/start"
"github.com/loft-sh/log"
"github.com/loft-sh/log/survey"
"github.com/loft-sh/log/terminal"
Expand Down
2 changes: 1 addition & 1 deletion cmd/vclusterctl/cmd/resume.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package cmd
import (
"context"

loftctlUtil "github.com/loft-sh/loftctl/v3/pkg/util"
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"
Expand Down
2 changes: 1 addition & 1 deletion cmd/vclusterctl/cmd/ui.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"errors"
"fmt"

loftctl "github.com/loft-sh/loftctl/v3/cmd/loftctl/cmd"
loftctl "github.com/loft-sh/loftctl/v4/cmd/loftctl/cmd"
"github.com/loft-sh/log"
"github.com/loft-sh/vcluster/pkg/cli/flags"
"github.com/loft-sh/vcluster/pkg/platform"
Expand Down
6 changes: 3 additions & 3 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ require (
github.com/invopop/jsonschema v0.12.0
github.com/kubernetes-csi/external-snapshotter/client/v4 v4.2.0
github.com/loft-sh/admin-apis v0.0.0-20240203010124-3600c1c582a8
github.com/loft-sh/agentapi/v3 v3.4.6-beta.0
github.com/loft-sh/agentapi/v4 v4.0.0-alpha.3
github.com/loft-sh/analytics-client v0.0.0-20240219162240-2f4c64b2494e
github.com/loft-sh/api/v3 v3.5.0-alpha.1.0.20240426152201-dfdce426ab92
github.com/loft-sh/loftctl/v3 v3.5.0-alpha.2.0.20240506133909-6e7c7415ee54
github.com/loft-sh/api/v4 v4.0.0-alpha.3
github.com/loft-sh/loftctl/v4 v4.0.0-alpha.3
github.com/loft-sh/utils v0.0.29
github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d
github.com/mitchellh/go-homedir v1.1.0
Expand Down
12 changes: 6 additions & 6 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -634,18 +634,18 @@ github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de h1:9TO3cAIGXtEhn
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de/go.mod h1:zAbeS9B/r2mtpb6U+EI2rYA5OAXxsYw6wTamcNW+zcE=
github.com/loft-sh/admin-apis v0.0.0-20240203010124-3600c1c582a8 h1:nuY9Vgvabh2FlaTYp9yhzh3cBzY6jjFEFSsOvw9ZAJw=
github.com/loft-sh/admin-apis v0.0.0-20240203010124-3600c1c582a8/go.mod h1:MWczNwKvWssHo1KaeZKaWDdRLYSNbWqQBGsTLoCNd7U=
github.com/loft-sh/agentapi/v3 v3.4.6-beta.0 h1:tZeKjzlVjc8KL5rVQyYQQVsX7P4lfwO1GZSNKBdKtrY=
github.com/loft-sh/agentapi/v3 v3.4.6-beta.0/go.mod h1:9lZuxYBmu4gE9Pkeh5+XObMvRpClOTAAdyPeuY5cAiY=
github.com/loft-sh/agentapi/v4 v4.0.0-alpha.3 h1:/OF23kjpecZHeRKSf3cflLuzB6Miv/UUslXXBQdqOQY=
github.com/loft-sh/agentapi/v4 v4.0.0-alpha.3/go.mod h1:6c1I63fh+Ku2wT7hZ1GrwfH9JZsyRb8MefocoKkojJI=
github.com/loft-sh/analytics-client v0.0.0-20240219162240-2f4c64b2494e h1:JcPnMaoczikvpasi8OJ47dCkWZjfgFubWa4V2SZo7h0=
github.com/loft-sh/analytics-client v0.0.0-20240219162240-2f4c64b2494e/go.mod h1:FFWcGASyM2QlWTDTCG/WBVM/XYr8btqYt335TFNRCFg=
github.com/loft-sh/api/v3 v3.5.0-alpha.1.0.20240426152201-dfdce426ab92 h1:Ae2S28oZK48bWYDMv13qN+kmwwIcMa4O17eu/SYnIK4=
github.com/loft-sh/api/v3 v3.5.0-alpha.1.0.20240426152201-dfdce426ab92/go.mod h1:thDZXZ/bR/aDAGLrJvGnohMw1tU/y+OUvr4wSDJrJiQ=
github.com/loft-sh/api/v4 v4.0.0-alpha.3 h1:zZsKKzeezOv/MtuGg/PfsYQVpANDjW2MSdUXOfqhw9U=
github.com/loft-sh/api/v4 v4.0.0-alpha.3/go.mod h1:hsFRiytpWwb9Wd/MnZrC/nCefHSCu/RoidgQipFXc2E=
github.com/loft-sh/apiserver v0.0.0-20240129130254-7b9a55ab1744 h1:1Yhs86ugpnEsex4kkFpyvCHNy42O5vtJjY7Loty9JkI=
github.com/loft-sh/apiserver v0.0.0-20240129130254-7b9a55ab1744/go.mod h1:/QBF5drEoeQ0pggzT6q29+cyirRg5/MOJCq39ghku+8=
github.com/loft-sh/jspolicy v0.2.2 h1:+7QqVumYm225mSJsGOjnbCGYzh9XyKYQab6FgLiHYJU=
github.com/loft-sh/jspolicy v0.2.2/go.mod h1:kbXD1CS17Ie9dqcq5iXrOhpSLESkmQpy4+F80YXOfUM=
github.com/loft-sh/loftctl/v3 v3.5.0-alpha.2.0.20240506133909-6e7c7415ee54 h1:9aezsY+IjdtcWJVlFbFl8MOBcbqOHKyyxJQuEEhkB8A=
github.com/loft-sh/loftctl/v3 v3.5.0-alpha.2.0.20240506133909-6e7c7415ee54/go.mod h1:IUXEhtAFeJj2GED0yyePY3ybpjOs8ZJ4pvkPIJ2/g7U=
github.com/loft-sh/loftctl/v4 v4.0.0-alpha.3 h1:jntYH+IxflTxcjE3Qta2gU+7zjISVnijv4fbmEio7oQ=
github.com/loft-sh/loftctl/v4 v4.0.0-alpha.3/go.mod h1:5a9eR3a7wH/Kozg2Klz/4oW3kR8BXuN/sfg7x8+BHn4=
github.com/loft-sh/log v0.0.0-20240219160058-26d83ffb46ac h1:Gz/7Lb7WgdgIv+KJz87ORA1zvQW52tUqKPGyunlp4dQ=
github.com/loft-sh/log v0.0.0-20240219160058-26d83ffb46ac/go.mod h1:YImeRjXH34Yf5E79T7UHBQpDZl9fIaaFRgyZ/bkY+UQ=
github.com/loft-sh/utils v0.0.29 h1:P/MObccXToAZy2QoJSQDJ+OJx1qHitpFHEVj3QBSNJs=
Expand Down
2 changes: 1 addition & 1 deletion pkg/cli/activate_platform.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"encoding/json"
"fmt"

managementv1 "github.com/loft-sh/api/v3/pkg/apis/management/v1"
managementv1 "github.com/loft-sh/api/v4/pkg/apis/management/v1"
"github.com/loft-sh/log"
"github.com/loft-sh/log/survey"
"github.com/loft-sh/log/terminal"
Expand Down
4 changes: 2 additions & 2 deletions pkg/cli/connect_platform.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"context"
"fmt"

"github.com/loft-sh/loftctl/v3/cmd/loftctl/cmd/use"
"github.com/loft-sh/loftctl/v3/pkg/vcluster"
"github.com/loft-sh/loftctl/v4/cmd/loftctl/cmd/use"
"github.com/loft-sh/loftctl/v4/pkg/vcluster"
"github.com/loft-sh/log"
"github.com/loft-sh/vcluster/pkg/cli/find"
"github.com/loft-sh/vcluster/pkg/cli/flags"
Expand Down
18 changes: 9 additions & 9 deletions pkg/cli/create_platform.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ import (
"time"

"github.com/ghodss/yaml"
clusterv1 "github.com/loft-sh/agentapi/v3/pkg/apis/loft/cluster/v1"
agentstoragev1 "github.com/loft-sh/agentapi/v3/pkg/apis/loft/storage/v1"
managementv1 "github.com/loft-sh/api/v3/pkg/apis/management/v1"
storagev1 "github.com/loft-sh/api/v3/pkg/apis/storage/v1"
"github.com/loft-sh/loftctl/v3/cmd/loftctl/cmd/create"
"github.com/loft-sh/loftctl/v3/pkg/client/helper"
"github.com/loft-sh/loftctl/v3/pkg/client/naming"
"github.com/loft-sh/loftctl/v3/pkg/config"
"github.com/loft-sh/loftctl/v3/pkg/vcluster"
clusterv1 "github.com/loft-sh/agentapi/v4/pkg/apis/loft/cluster/v1"
agentstoragev1 "github.com/loft-sh/agentapi/v4/pkg/apis/loft/storage/v1"
managementv1 "github.com/loft-sh/api/v4/pkg/apis/management/v1"
storagev1 "github.com/loft-sh/api/v4/pkg/apis/storage/v1"
"github.com/loft-sh/loftctl/v4/cmd/loftctl/cmd/create"
"github.com/loft-sh/loftctl/v4/pkg/client/helper"
"github.com/loft-sh/loftctl/v4/pkg/client/naming"
"github.com/loft-sh/loftctl/v4/pkg/config"
"github.com/loft-sh/loftctl/v4/pkg/vcluster"
"github.com/loft-sh/log"
vclusterconfig "github.com/loft-sh/vcluster/config"
"github.com/loft-sh/vcluster/pkg/cli/flags"
Expand Down
2 changes: 1 addition & 1 deletion pkg/cli/delete_platform.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"fmt"
"time"

"github.com/loft-sh/loftctl/v3/pkg/kube"
"github.com/loft-sh/loftctl/v4/pkg/kube"
"github.com/loft-sh/log"
"github.com/loft-sh/vcluster/pkg/cli/find"
"github.com/loft-sh/vcluster/pkg/platform"
Expand Down
6 changes: 3 additions & 3 deletions pkg/cli/pause_platform.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (
"strconv"
"time"

clusterv1 "github.com/loft-sh/agentapi/v3/pkg/apis/loft/cluster/v1"
storagev1 "github.com/loft-sh/api/v3/pkg/apis/storage/v1"
"github.com/loft-sh/loftctl/v3/pkg/config"
clusterv1 "github.com/loft-sh/agentapi/v4/pkg/apis/loft/cluster/v1"
storagev1 "github.com/loft-sh/api/v4/pkg/apis/storage/v1"
"github.com/loft-sh/loftctl/v4/pkg/config"
"github.com/loft-sh/log"
"github.com/loft-sh/vcluster/pkg/cli/find"
"github.com/loft-sh/vcluster/pkg/platform"
Expand Down
2 changes: 1 addition & 1 deletion pkg/cli/resume_platform.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"
"fmt"

"github.com/loft-sh/loftctl/v3/pkg/vcluster"
"github.com/loft-sh/loftctl/v4/pkg/vcluster"
"github.com/loft-sh/log"
"github.com/loft-sh/vcluster/pkg/cli/find"
"github.com/loft-sh/vcluster/pkg/platform"
Expand Down
10 changes: 5 additions & 5 deletions pkg/platform/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ import (
"strings"
"sync"

managementv1 "github.com/loft-sh/api/v3/pkg/apis/management/v1"
"github.com/loft-sh/api/v3/pkg/client/clientset_generated/clientset/scheme"
loftclient "github.com/loft-sh/loftctl/v3/pkg/client"
"github.com/loft-sh/loftctl/v3/pkg/client/naming"
"github.com/loft-sh/loftctl/v3/pkg/kube"
managementv1 "github.com/loft-sh/api/v4/pkg/apis/management/v1"
"github.com/loft-sh/api/v4/pkg/client/clientset_generated/clientset/scheme"
loftclient "github.com/loft-sh/loftctl/v4/pkg/client"
"github.com/loft-sh/loftctl/v4/pkg/client/naming"
"github.com/loft-sh/loftctl/v4/pkg/kube"
kerrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/kubernetes"
Expand Down
2 changes: 1 addition & 1 deletion pkg/platform/flags.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package platform
import (
"fmt"

loftctlflags "github.com/loft-sh/loftctl/v3/cmd/loftctl/flags"
loftctlflags "github.com/loft-sh/loftctl/v4/cmd/loftctl/flags"
"github.com/loft-sh/vcluster/pkg/cli/flags"
)

Expand Down
4 changes: 2 additions & 2 deletions pkg/platform/secret.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"strings"
"time"

managementv1 "github.com/loft-sh/api/v3/pkg/apis/management/v1"
storagev1 "github.com/loft-sh/api/v3/pkg/apis/storage/v1"
managementv1 "github.com/loft-sh/api/v4/pkg/apis/management/v1"
storagev1 "github.com/loft-sh/api/v4/pkg/apis/storage/v1"
corev1 "k8s.io/api/core/v1"
kerrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
6 changes: 3 additions & 3 deletions pkg/scheme/scheme.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ package scheme

import (
volumesnapshotv1 "github.com/kubernetes-csi/external-snapshotter/client/v4/apis/volumesnapshot/v1"
agentclusterv1 "github.com/loft-sh/agentapi/v3/pkg/apis/loft/cluster/v1"
agentstoragev1 "github.com/loft-sh/agentapi/v3/pkg/apis/loft/storage/v1"
managementv1 "github.com/loft-sh/api/v3/pkg/apis/management/v1"
agentclusterv1 "github.com/loft-sh/agentapi/v4/pkg/apis/loft/cluster/v1"
agentstoragev1 "github.com/loft-sh/agentapi/v4/pkg/apis/loft/storage/v1"
managementv1 "github.com/loft-sh/api/v4/pkg/apis/management/v1"
"github.com/loft-sh/vcluster/pkg/apis"
apidiscoveryv2beta1 "k8s.io/api/apidiscovery/v2beta1"
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
Expand Down
2 changes: 1 addition & 1 deletion pkg/telemetry/collect_cli.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"time"

"github.com/loft-sh/analytics-client/client"
managementv1 "github.com/loft-sh/api/v3/pkg/apis/management/v1"
managementv1 "github.com/loft-sh/api/v4/pkg/apis/management/v1"
"github.com/loft-sh/log"
"github.com/loft-sh/vcluster/pkg/upgrade"
"github.com/loft-sh/vcluster/pkg/util/cliconfig"
Expand Down
2 changes: 1 addition & 1 deletion pkg/telemetry/helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"fmt"

"github.com/denisbrodbeck/machineid"
managementv1 "github.com/loft-sh/api/v3/pkg/apis/management/v1"
managementv1 "github.com/loft-sh/api/v4/pkg/apis/management/v1"
"github.com/loft-sh/log"
"github.com/loft-sh/vcluster/pkg/util/cliconfig"
homedir "github.com/mitchellh/go-homedir"
Expand Down
2 changes: 1 addition & 1 deletion pkg/telemetry/noop.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package telemetry
import (
"context"

managementv1 "github.com/loft-sh/api/v3/pkg/apis/management/v1"
managementv1 "github.com/loft-sh/api/v4/pkg/apis/management/v1"
"github.com/loft-sh/vcluster/pkg/config"
"k8s.io/client-go/kubernetes"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/util/clihelper/clihelper.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"strings"
"time"

loftkubeconfig "github.com/loft-sh/loftctl/v3/pkg/kubeconfig"
loftkubeconfig "github.com/loft-sh/loftctl/v4/pkg/kubeconfig"
"github.com/loft-sh/log"
"github.com/loft-sh/vcluster/pkg/cli/find"
"github.com/loft-sh/vcluster/pkg/cli/podprinter"
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit c531f3f

Please sign in to comment.