feat: a few steps further

Author: vknabel

Makefile

@@ -138,7 +138,7 @@ test-e2e: manifests generate fmt vet
 	FIREWALL_IMAGE=$(E2E_FIREWALL_IMAGE) \
 	FIREWALL_SIZE=$(E2E_FIREWALL_SIZE) \
 	FIREWALL_NETWORKS=$(E2E_FIREWALL_NETWORKS) \
-	go test ./test/e2e/frmwrk
+	go test ./test/e2e/frmwrk -v ginkgo -vv 
 
 .PHONY: lint
 lint: golangci-lint ## Run golangci-lint linter

test/e2e/frmwrk/bootstrap_test.go

@@ -4,10 +4,10 @@ import (
 	"context"
 
 	. "github.com/onsi/ginkgo/v2"
-	// . "github.com/onsi/gomega"
+	. "github.com/onsi/gomega"
 
-	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	controlplanev1 "sigs.k8s.io/cluster-api/controlplane/kubeadm/api/v1beta1"
+	// v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	// controlplanev1 "sigs.k8s.io/cluster-api/controlplane/kubeadm/api/v1beta1"
 	"sigs.k8s.io/cluster-api/test/framework"
 )
 
@@ -33,8 +33,8 @@ var _ = Describe("Basic Cluster Creation", Ordered, func() {
 
 		ec := e2eCtx.NewE2ECluster(ClusterConfig{
 			SpecName:                 "basic-cluster-creation",
-			NamespaceName:            "random",
-			ClusterName:              "random",
+			NamespaceName:            "simple",
+			ClusterName:              "simple",
 			KubernetesVersion:        "v1.34.1",
 			ControlPlaneIP:           "203.0.113.130",
 			ControlPlaneMachineCount: 1,
@@ -47,27 +47,44 @@ var _ = Describe("Basic Cluster Creation", Ordered, func() {
 		ec.GenerateAndApplyClusterTemplate(ctx)
 
 		By("Wait for cluster")
-		framework.DiscoveryAndWaitForCluster(ctx, framework.DiscoveryAndWaitForClusterInput{
+		cluster := framework.DiscoveryAndWaitForCluster(ctx, framework.DiscoveryAndWaitForClusterInput{
 			Namespace: ec.NamespaceName,
 			Name:      ec.ClusterName,
 			Getter:    e2eCtx.Environment.Bootstrap.GetClient(),
-		})
+		}, e2eCtx.E2EConfig.GetIntervals("default", "wait-cluster")...)
 
-		framework.WaitForControlPlaneToBeReady(ctx, framework.WaitForControlPlaneToBeReadyInput{
-			Getter: e2eCtx.Environment.Bootstrap.GetClient(),
-			ControlPlane: &controlplanev1.KubeadmControlPlane{
-				ObjectMeta: v1.ObjectMeta{
-					Name:      ec.ClusterName,
-					Namespace: ec.NamespaceName,
-				},
-			},
+		controlPlane := framework.GetKubeadmControlPlaneByCluster(ctx, framework.GetKubeadmControlPlaneByClusterInput{
+			Lister:      e2eCtx.Environment.Bootstrap.GetClient(),
+			ClusterName: cluster.Name,
+			Namespace:   cluster.Namespace,
 		})
 
+		Expect(controlPlane).To(Not(BeNil()))
+
+		// framework.WaitForKubeadmControlPlaneMachinesToExist(ctx, framework.WaitForKubeadmControlPlaneMachinesToExistInput{
+		// 	Lister:       e2eCtx.Environment.Bootstrap.GetClient(),
+		// 	Cluster:      cluster,
+		// 	ControlPlane: controlPlane,
+		// }, e2eCtx.E2EConfig.GetIntervals("default", "wait-control-plane")...)
+		// framework.DiscoveryAndWaitForControlPlaneInitialized(ctx, framework.DiscoveryAndWaitForControlPlaneInitializedInput{
+		// 	Lister:  e2eCtx.Environment.Bootstrap.GetClient(),
+		// 	Cluster: cluster,
+		// }, e2eCtx.E2EConfig.GetIntervals("default", "wait-control-plane")...)
+
+		// By("Wait for control plane")
+		// framework.WaitForControlPlaneToBeReady(ctx, framework.WaitForControlPlaneToBeReadyInput{
+		// 	Getter: e2eCtx.Environment.Bootstrap.GetClient(),
+		// 	ControlPlane: &controlplanev1.KubeadmControlPlane{
+		// 		ObjectMeta: v1.ObjectMeta{
+		// 			Name:      ec.ClusterName,
+		// 			Namespace: ec.NamespaceName,
+		// 		},
+		// 	},
+		// }, e2eCtx.E2EConfig.GetIntervals("default", "wait-control-plane")...)
+
 	})
 
 	AfterAll(func() {
-		if e2eCtx.Environment.ClusterProvider != nil {
-			e2eCtx.Environment.ClusterProvider.Dispose(context.TODO())
-		}
+		e2eCtx.Teardown(context.TODO())
 	})
 })

test/e2e/frmwrk/config/capi-e2e-config.yaml

@@ -130,3 +130,18 @@ variables:
   WORKER_MACHINE_SIZE: "c1-medium-x86"
   CONTROL_PLANE_MACHINE_COUNT: "1"
   WORKER_MACHINE_COUNT: "1"
+
+intervals:
+  default/wait-controllers: ["4m", "10s"]
+  default/wait-cluster: ["5m", "10s"]
+  default/wait-control-plane: ["10m", "10s"]
+  default/wait-worker-nodes: ["5m", "10s"]
+  default/wait-machine-pool-nodes: ["5m", "10s"]
+  default/wait-delete-cluster: ["3m", "10s"]
+  default/wait-machine-upgrade: ["20m", "10s"]
+  default/wait-control-plane-upgrade: ["15m", "10s"]
+  default/wait-machine-deployment-upgrade: ["10m", "10s"]
+  default/wait-machine-pool-upgrade: ["5m", "10s"]
+  default/wait-nodes-ready: ["10m", "10s"]
+  default/wait-machine-remediation: ["5m", "10s"]
+  default/wait-autoscaler: ["5m", "10s"]

test/e2e/frmwrk/shared.go

@@ -95,10 +95,6 @@ func withDefaultEnvironment() Option {
 		Expect(err).ToNot(HaveOccurred(), "failed to create metal client")
 		e2e.Environment.Metal = mclient
 
-		fmt.Println("METAL_API_URL", e2e.envOrVar("METAL_API_URL"))
-		fmt.Println("METAL_API_HMAC", e2e.envOrVar("METAL_API_HMAC"))
-		fmt.Println("METAL_API_HMAC_AUTH_TYPE", e2e.envOrVar("METAL_API_HMAC_AUTH_TYPE"))
-
 		e2e.Environment.project = e2e.envOrVar("METAL_PROJECT_ID")
 		e2e.Environment.partition = e2e.envOrVar("METAL_PARTITION")
 		e2e.Environment.publicNetwork = e2e.envOrVar("METAL_PUBLIC_NETWORK")
@@ -409,6 +405,7 @@ func (e2e *E2ECluster) setupFirewall(ctx context.Context) {
 					Protocol: "TCP",
 					From:     []string{"0.0.0.0/0"},
 					To:       []string{"0.0.0.0/0"},
+					Ports:    []int32{80, 443},
 				},
 			},
 		},