chore: remove unusable e2e tests and remove deps to vcluster code base

Author: johannesfrey

.github/workflows/e2e.yaml

@@ -58,20 +58,20 @@ jobs:
         run: |
 
           # Install clusterctl
-          curl -L https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.6.3/clusterctl-linux-amd64 -o clusterctl
+          curl -L https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.9.3/clusterctl-linux-amd64 -o clusterctl
           chmod +x clusterctl
           sudo mv clusterctl /usr/local/bin/
 
           #Install Kind
-          curl -Lo ./kind https://kind.sigs.k8s.io/dl/v0.23.0/kind-linux-amd64
+          curl -Lo ./kind https://kind.sigs.k8s.io/dl/v0.26.0/kind-linux-amd64
           chmod +x ./kind
           sudo mv ./kind /usr/local/bin/kind
 
           # Install envsubst
           GOBIN="$(pwd)/bin" go install -tags tools github.com/drone/envsubst/v2/cmd/[email protected]
 
           # Install kubectl
-          curl -LO "https://dl.k8s.io/release/v1.29.2/bin/linux/amd64/kubectl"
+          curl -LO "https://dl.k8s.io/release/v1.31.4/bin/linux/amd64/kubectl"
           chmod +x ./kubectl
           sudo mv ./kubectl /usr/local/bin/kubectl
 
@@ -82,7 +82,7 @@ jobs:
 
       - name: Create and Start Kind Cluster
         run: |
-          kind create cluster --image=kindest/node:v1.28.9@sha256:dca54bc6a6079dd34699d53d7d4ffa2e853e46a20cd12d619a09207e35300bd0
+          kind create cluster --image=kindest/node:v1.31.4@sha256:2cb39f7295fe7eafee0842b1052a599a4fb0f8bcf3f83d96c7f4864c357c6c30
           echo "=== cluster-info ==="
           kubectl cluster-info --context kind-kind
 
@@ -122,9 +122,6 @@ jobs:
         run: |
           kubectl wait --for=condition=ready vcluster -n vcluster-k3s vcluster-k3s --timeout=100s
 
-      - name: Run E2E Tests K3S
-        run: CLUSTER_NAME=vcluster-k3s NAMESPACE=vcluster-k3s LOCAL_PORT=14550 go test -mod=vendor ./test/e2e -v
-
       - name: Create Vcluster Custom Resource K0S
         run: |
           export CLUSTER_NAME=vcluster-k0s
@@ -139,9 +136,6 @@ jobs:
         run: |
           kubectl wait --for=condition=ready vcluster -n vcluster-k0s vcluster-k0s --timeout=100s
 
-      - name: Run E2E Tests K0S
-        run: CLUSTER_NAME=vcluster-k0s NAMESPACE=vcluster-k0s LOCAL_PORT=14551 go test -mod=vendor ./test/e2e -v
-
       - name: Create Vcluster Custom Resource K8S
         run: |
           export CLUSTER_NAME=vcluster-k8s
@@ -156,5 +150,3 @@ jobs:
         run: |
           kubectl wait --for=condition=ready vcluster -n vcluster-k8s vcluster-k8s --timeout=100s
 
-      - name: Run E2E Tests K8S
-        run: CLUSTER_NAME=vcluster-k8s NAMESPACE=vcluster-k8s LOCAL_PORT=14552 go test -mod=vendor ./test/e2e -v

controllers/vcluster_controller.go

@@ -26,15 +26,15 @@ import (
 	"time"
 
 	"github.com/go-logr/logr"
-	"github.com/loft-sh/vcluster/pkg/util"
-	"github.com/loft-sh/vcluster/pkg/util/kubeconfig"
 	corev1 "k8s.io/api/core/v1"
 	kerrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/types"
 	utilerrors "k8s.io/apimachinery/pkg/util/errors"
 	"k8s.io/apimachinery/pkg/util/wait"
+	"k8s.io/client-go/discovery"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/clientcmd"
@@ -490,15 +490,15 @@ func DiscoverHostFromService(ctx context.Context, client client.Client, vCluster
 }
 
 func GetVClusterKubeConfig(ctx context.Context, clusterClient client.Client, vCluster *v1alpha1.VCluster) (*api.Config, error) {
-	secretName := kubeconfig.DefaultSecretPrefix + vCluster.Name
+	secretName := "vc-" + vCluster.Name
 
 	secret := &corev1.Secret{}
 	err := clusterClient.Get(ctx, types.NamespacedName{Namespace: vCluster.Namespace, Name: secretName}, secret)
 	if err != nil {
 		return nil, err
 	}
 
-	kcBytes, ok := secret.Data[kubeconfig.KubeconfigSecretKey]
+	kcBytes, ok := secret.Data["config"]
 	if !ok {
 		return nil, fmt.Errorf("couldn't find kube config in vcluster secret")
 	}
@@ -617,7 +617,7 @@ func EnsureFinalizer(ctx context.Context, client client.Client, obj client.Objec
 // SetupWithManager sets up the controller with the Manager.
 func (r *VClusterReconciler) SetupWithManager(mgr ctrl.Manager) error {
 	var err error
-	r.clusterKindExists, err = util.KindExists(mgr.GetConfig(), clusterv1beta1.GroupVersion.WithKind("Cluster"))
+	r.clusterKindExists, err = kindExists(mgr.GetConfig(), clusterv1beta1.GroupVersion.WithKind("Cluster"))
 	if err != nil {
 		return err
 	}
@@ -626,3 +626,27 @@ func (r *VClusterReconciler) SetupWithManager(mgr ctrl.Manager) error {
 		For(&v1alpha1.VCluster{}).
 		Complete(r)
 }
+
+func kindExists(config *rest.Config, groupVersionKind schema.GroupVersionKind) (bool, error) {
+	discoveryClient, err := discovery.NewDiscoveryClientForConfig(config)
+	if err != nil {
+		return false, err
+	}
+
+	resources, err := discoveryClient.ServerResourcesForGroupVersion(groupVersionKind.GroupVersion().String())
+	if err != nil {
+		if kerrors.IsNotFound(err) {
+			return false, nil
+		}
+
+		return false, err
+	}
+
+	for _, r := range resources.APIResources {
+		if r.Kind == groupVersionKind.Kind {
+			return true, nil
+		}
+	}
+
+	return false, nil
+}