🌱 add check-conditions to e2e tests. (#1579)

Author: guettli

go.mod

@@ -7,6 +7,7 @@ require (
 	github.com/bramvdbogaerde/go-scp v1.5.0
 	github.com/go-logr/logr v1.4.2
 	github.com/go-logr/zapr v1.3.0
+	github.com/guettli/check-conditions v0.0.9
 	github.com/hetznercloud/hcloud-go/v2 v2.19.1
 	github.com/onsi/ginkgo/v2 v2.23.0
 	github.com/onsi/gomega v1.36.2

go.sum

@@ -129,6 +129,8 @@ github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 h1:Ovs26xHkKqVztRpIrF/92Bcuy
 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
 github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 h1:YBftPWNWd4WwGqtY2yeZL2ef8rHAxPBD8KFhJpmcqms=
 github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0/go.mod h1:YN5jB8ie0yfIUg6VvR9Kz84aCaG7AsGZnLjhHbUqwPg=
+github.com/guettli/check-conditions v0.0.9 h1:RWIVVxIxWUNWe+KfIFBAEmI+iHGTRRMfZxCMFtV2Xq8=
+github.com/guettli/check-conditions v0.0.9/go.mod h1:6NifCTWJHcTBVv/0BvsF4ed3K/UOQsw7Pfp7kiRKNww=
 github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
 github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
 github.com/hetznercloud/hcloud-go/v2 v2.19.1 h1:UU/7h3uc/rdgspM8xkQF7wokmwZXePWDXcLqrQRRzzY=

test/e2e/basic_baremetal_test.go

@@ -18,94 +18,15 @@ package e2e
 
 import (
 	"context"
-	"fmt"
-	"strings"
-	"time"
 
 	. "github.com/onsi/ginkgo/v2"
-	appsv1 "k8s.io/api/apps/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
-	"sigs.k8s.io/cluster-api/util/conditions"
-	"sigs.k8s.io/controller-runtime/pkg/client"
-	"sigs.k8s.io/controller-runtime/pkg/log"
-
-	infrav1 "github.com/syself/cluster-api-provider-hetzner/api/v1beta1"
 )
 
-func logBareMetalHostStatusContinously(ctx context.Context, c client.Client) {
-	for {
-		t := time.After(30 * time.Second)
-		select {
-		case <-ctx.Done():
-			return
-		case <-t:
-			err := logBareMetalHostStatus(ctx, c)
-			if err != nil {
-				log := log.FromContext(ctx)
-				log.Info("Error logging BareMetalHost status", "error", err)
-			}
-		}
-	}
-}
-
-func logBareMetalHostStatus(ctx context.Context, c client.Client) error {
-	hbmhList := &infrav1.HetznerBareMetalHostList{}
-	err := c.List(ctx, hbmhList)
-	if err != nil {
-		return err
-	}
-
-	if len(hbmhList.Items) == 0 {
-		return nil
-	}
-
-	caphDeployment := appsv1.Deployment{
-		ObjectMeta: metav1.ObjectMeta{
-			Name:      "caph-controller-manager",
-			Namespace: "caph-system",
-		},
-	}
-	err = c.Get(ctx, client.ObjectKeyFromObject(&caphDeployment), &caphDeployment)
-	if err != nil {
-		return fmt.Errorf("failed to get caph-controller-manager deployment: %w", err)
-	}
-
-	By(fmt.Sprintf("--------------------------------------------------- BareMetalHosts %s",
-		caphDeployment.Spec.Template.Spec.Containers[0].Image))
-
-	for i := range hbmhList.Items {
-		hbmh := &hbmhList.Items[i]
-		if hbmh.Spec.Status.ProvisioningState == "" {
-			continue
-		}
-		By("BareMetalHost: " + hbmh.Name + " " + fmt.Sprint(hbmh.Spec.ServerID))
-		By("  ProvisioningState: " + string(hbmh.Spec.Status.ProvisioningState))
-		eMsg := string(hbmh.Spec.Status.ErrorType) + " " + hbmh.Spec.Status.ErrorMessage
-		eMsg = strings.TrimSpace(eMsg)
-		if eMsg != "" {
-			By("  Error: " + eMsg)
-		}
-		readyC := conditions.Get(hbmh, clusterv1.ReadyCondition)
-		msg := ""
-		reason := ""
-		state := "?"
-		if readyC != nil {
-			msg = readyC.Message
-			reason = readyC.Reason
-			state = string(readyC.Status)
-		}
-		By("  Ready Condition: " + state + " " + reason + " " + msg)
-	}
-	return nil
-}
-
 var _ = Describe("[Baremetal] Testing Cluster 1x control-planes 1x worker ", func() {
 	ctx := context.TODO()
 
 	Context("Running the CaphClusterDeploymentSpec in Hetzner Baremetal", func() {
 		CaphClusterDeploymentSpec(ctx, func() CaphClusterDeploymentSpecInput {
-			go logBareMetalHostStatusContinously(ctx, bootstrapClusterProxy.GetClient())
 			return CaphClusterDeploymentSpecInput{
 				E2EConfig:                e2eConfig,
 				ClusterctlConfigPath:     clusterctlConfigPath,

test/e2e/caph.go

@@ -21,24 +21,14 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
-	"strings"
-	"time"
 
 	"github.com/onsi/ginkgo/v2"
 	"github.com/onsi/gomega"
-	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/utils/ptr"
-	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 	"sigs.k8s.io/cluster-api/test/framework"
 	"sigs.k8s.io/cluster-api/test/framework/clusterctl"
 	"sigs.k8s.io/cluster-api/util"
-	"sigs.k8s.io/cluster-api/util/conditions"
-	"sigs.k8s.io/controller-runtime/pkg/client"
-	"sigs.k8s.io/controller-runtime/pkg/log"
-
-	infrav1 "github.com/syself/cluster-api-provider-hetzner/api/v1beta1"
 )
 
 // CaphClusterDeploymentSpecInput is the input for CaphClusterDeploymentSpec.
@@ -53,87 +43,6 @@ type CaphClusterDeploymentSpecInput struct {
 	ControlPlaneMachineCount int64
 }
 
-func logHCloudMachineStatusContinously(ctx context.Context, c client.Client) {
-	for {
-		t := time.After(30 * time.Second)
-		select {
-		case <-ctx.Done():
-			return
-		case <-t:
-			err := logHCloudMachineStatus(ctx, c)
-			if err != nil {
-				logger := log.FromContext(ctx)
-				logger.Info("Error logging HCloudMachine status", "error", err)
-			}
-		}
-	}
-}
-
-func logHCloudMachineStatus(ctx context.Context, c client.Client) error {
-	hmList := &infrav1.HCloudMachineList{}
-	err := c.List(ctx, hmList)
-	if err != nil {
-		return err
-	}
-
-	if len(hmList.Items) == 0 {
-		return nil
-	}
-
-	caphDeployment := appsv1.Deployment{
-		ObjectMeta: metav1.ObjectMeta{
-			Name:      "caph-controller-manager",
-			Namespace: "caph-system",
-		},
-	}
-	err = c.Get(ctx, client.ObjectKeyFromObject(&caphDeployment), &caphDeployment)
-	if err != nil {
-		return fmt.Errorf("failed to get caph-controller-manager deployment: %w", err)
-	}
-
-	ginkgo.By(fmt.Sprintf("--------------------------------------------------- HCloudMachines %s",
-		caphDeployment.Spec.Template.Spec.Containers[0].Image))
-
-	for i := range hmList.Items {
-		hm := &hmList.Items[i]
-		if hm.Status.InstanceState == nil || *hm.Status.InstanceState == "" {
-			continue
-		}
-		addresses := make([]string, 0)
-		for _, a := range hm.Status.Addresses {
-			addresses = append(addresses, a.Address)
-		}
-
-		id := ""
-		if *hm.Spec.ProviderID != "" {
-			id = *hm.Spec.ProviderID
-		}
-		ginkgo.By("HCloudMachine: " + hm.Name + " " + id + " " + strings.Join(addresses, " "))
-		ginkgo.By("  ProvisioningState: " + string(*hm.Status.InstanceState))
-		l := make([]string, 0)
-		if hm.Status.FailureMessage != nil {
-			l = append(l, *hm.Status.FailureMessage)
-		}
-		if hm.Status.FailureMessage != nil {
-			l = append(l, *hm.Status.FailureMessage)
-		}
-		if len(l) > 0 {
-			ginkgo.By("  Error: " + strings.Join(l, ", "))
-		}
-		readyC := conditions.Get(hm, clusterv1.ReadyCondition)
-		msg := ""
-		reason := ""
-		state := "?"
-		if readyC != nil {
-			msg = readyC.Message
-			reason = readyC.Reason
-			state = string(readyC.Status)
-		}
-		ginkgo.By("  Ready Condition: " + state + " " + reason + " " + msg)
-	}
-	return nil
-}
-
 // CaphClusterDeploymentSpec implements a test that verifies that MachineDeployment rolling updates are successful.
 func CaphClusterDeploymentSpec(ctx context.Context, inputGetter func() CaphClusterDeploymentSpecInput) {
 	var (
@@ -164,7 +73,6 @@ func CaphClusterDeploymentSpec(ctx context.Context, inputGetter func() CaphClust
 
 	ginkgo.It("Should successfully create a cluster with three control planes", func() {
 		ginkgo.By("Creating a workload cluster")
-		go logHCloudMachineStatusContinously(ctx, input.BootstrapClusterProxy.GetClient())
 		clusterctl.ApplyClusterTemplateAndWait(ctx, clusterctl.ApplyClusterTemplateAndWaitInput{
 			ClusterProxy: input.BootstrapClusterProxy,
 			ConfigCluster: clusterctl.ConfigClusterInput{