Fix e2e tests

Author: sbueringer

cmd/clusterctl/client/tree/discovery.go

@@ -19,7 +19,6 @@ package tree
 import (
 	"context"
 
-	"github.com/pkg/errors"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
@@ -90,10 +89,9 @@ func Discovery(ctx context.Context, c client.Client, namespace, name string, opt
 
 	// Adds cluster infra
 	clusterInfra, err := external.GetObjectFromContractVersionedRef(ctx, c, cluster.Spec.InfrastructureRef, cluster.Namespace)
-	if err != nil {
-		return nil, errors.Wrap(err, "get InfraCluster reference from Cluster")
+	if err == nil {
+		tree.Add(cluster, clusterInfra, ObjectMetaName("ClusterInfrastructure"))
 	}
-	tree.Add(cluster, clusterInfra, ObjectMetaName("ClusterInfrastructure"))
 
 	if options.ShowClusterResourceSets {
 		addClusterResourceSetsToObjectTree(ctx, c, cluster, tree)

test/e2e/data/infrastructure-docker/main/clusterclass-quick-start.yaml

@@ -291,9 +291,11 @@ spec:
           controlPlane: true
       jsonPatches:
       - op: add
-        path: /spec/template/spec/rollout/strategy/rollingUpdate/maxSurge
+        path: /spec/template/spec/rollout/strategy
         valueFrom:
-          template: "{{ .kubeadmControlPlaneMaxSurge }}"
+          template: |
+            rollingUpdate:
+              maxSurge: {{ .kubeadmControlPlaneMaxSurge }}"
   - name: controlPlaneTaint
     enabledIf: "{{ not .controlPlaneTaint }}"
     definitions:

test/framework/alltypes_helpers.go

@@ -134,7 +134,15 @@ func DumpAllResources(ctx context.Context, input DumpAllResourcesInput) {
 	Expect(input.Namespace).NotTo(BeEmpty(), "input.Namespace is required for DumpAllResources")
 	Expect(input.LogPath).NotTo(BeEmpty(), "input.LogPath is required for DumpAllResources")
 
+	resources := GetCAPIResources(ctx, GetCAPIResourcesInput{
+		Lister:       input.Lister,
+		Namespace:    input.Namespace,
+		IncludeTypes: input.IncludeTypes,
+	})
+
 	// Describe all clusters (this is a sort of summary of all the resources being bumped).
+	// Note: intentionally calling GetCAPIResources first as DescribeAllCluster is more likely to fail
+	// and then we wouldn't have the CAPI resources available.
 	DescribeAllCluster(ctx, DescribeAllClusterInput{
 		Lister:               input.Lister,
 		KubeConfigPath:       input.KubeConfigPath,
@@ -143,12 +151,6 @@ func DumpAllResources(ctx context.Context, input DumpAllResourcesInput) {
 		Namespace:            input.Namespace,
 	})
 
-	resources := GetCAPIResources(ctx, GetCAPIResourcesInput{
-		Lister:       input.Lister,
-		Namespace:    input.Namespace,
-		IncludeTypes: input.IncludeTypes,
-	})
-
 	for i := range resources {
 		r := resources[i]
 		dumpObject(r, input.LogPath)