test(e2e): Add self-hosted e2e test

Author: jimmidyson

test/e2e/addon_helpers.go

@@ -53,4 +53,17 @@ func WaitForAddonsToBeReadyInWorkloadCluster(
 			ClusterResourceSetIntervals: input.ClusterResourceSetIntervals,
 		},
 	)
+
+	WaitForClusterAutoscalerToBeReadyInWorkloadCluster(
+		ctx,
+		WaitForClusterAutoscalerToBeReadyInWorkloadClusterInput{
+			ClusterAutoscaler:           input.AddonsConfig.ClusterAutoscaler,
+			WorkloadCluster:             input.WorkloadCluster,
+			ClusterProxy:                input.ClusterProxy,
+			DeploymentIntervals:         input.DeploymentIntervals,
+			DaemonSetIntervals:          input.DaemonSetIntervals,
+			HelmReleaseIntervals:        input.HelmReleaseIntervals,
+			ClusterResourceSetIntervals: input.ClusterResourceSetIntervals,
+		},
+	)
 }

test/e2e/clusterautoscaler_helpers.go

@@ -0,0 +1,102 @@
+//go:build e2e
+
+// Copyright 2024 D2iQ, Inc. All rights reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package e2e
+
+import (
+	"context"
+	"fmt"
+
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
+	appsv1 "k8s.io/api/apps/v1"
+	corev1 "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/api/errors"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	capiv1 "sigs.k8s.io/cluster-api/api/v1beta1"
+	"sigs.k8s.io/cluster-api/test/framework"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+
+	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api/v1alpha1"
+)
+
+const clusterAutoscalerPrefix = "cluster-autoscaler-"
+
+type WaitForClusterAutoscalerToBeReadyInWorkloadClusterInput struct {
+	ClusterAutoscaler           *v1alpha1.ClusterAutoscaler
+	WorkloadCluster             *capiv1.Cluster
+	ClusterProxy                framework.ClusterProxy
+	DeploymentIntervals         []interface{}
+	DaemonSetIntervals          []interface{}
+	HelmReleaseIntervals        []interface{}
+	ClusterResourceSetIntervals []interface{}
+}
+
+func WaitForClusterAutoscalerToBeReadyInWorkloadCluster(
+	ctx context.Context,
+	input WaitForClusterAutoscalerToBeReadyInWorkloadClusterInput, //nolint:gocritic // This hugeParam is OK in tests.
+) {
+	if input.ClusterAutoscaler == nil {
+		return
+	}
+
+	// Only check for ClusterAutoscaler if the cluster is self-managed. Check this by checking if the kubeconfig
+	// exists in the workload cluster itself.
+	workloadClusterClient := input.ClusterProxy.GetWorkloadCluster(
+		ctx, input.WorkloadCluster.Namespace, input.WorkloadCluster.Name,
+	).GetClient()
+	err := workloadClusterClient.Get(
+		ctx,
+		client.ObjectKey{
+			Namespace: input.WorkloadCluster.Namespace,
+			Name:      input.WorkloadCluster.Name + "-kubeconfig",
+		},
+		&corev1.Secret{},
+	)
+	if err != nil && errors.IsNotFound(err) {
+		return
+	}
+	Expect(err).NotTo(HaveOccurred())
+
+	switch input.ClusterAutoscaler.Strategy {
+	case v1alpha1.AddonStrategyClusterResourceSet:
+		waitForClusterResourceSetToApplyResourcesInCluster(
+			ctx,
+			waitForClusterResourceSetToApplyResourcesInClusterInput{
+				name:         clusterAutoscalerPrefix + input.WorkloadCluster.Name,
+				clusterProxy: input.ClusterProxy,
+				cluster:      input.WorkloadCluster,
+				intervals:    input.ClusterResourceSetIntervals,
+			},
+		)
+	case v1alpha1.AddonStrategyHelmAddon:
+		WaitForHelmReleaseProxyReadyForCluster(
+			ctx,
+			WaitForHelmReleaseProxyReadyForClusterInput{
+				GetLister:          input.ClusterProxy.GetClient(),
+				Cluster:            input.WorkloadCluster,
+				HelmChartProxyName: clusterAutoscalerPrefix + input.WorkloadCluster.Name,
+			},
+			input.HelmReleaseIntervals...,
+		)
+	default:
+		Fail(
+			fmt.Sprintf(
+				"Do not know how to wait for cluster autoscaler using strategy %s to be ready",
+				input.ClusterAutoscaler.Strategy,
+			),
+		)
+	}
+
+	WaitForDeploymentsAvailable(ctx, framework.WaitForDeploymentsAvailableInput{
+		Getter: workloadClusterClient,
+		Deployment: &appsv1.Deployment{
+			ObjectMeta: metav1.ObjectMeta{
+				Name:      clusterAutoscalerPrefix + input.WorkloadCluster.Name,
+				Namespace: input.WorkloadCluster.Namespace,
+			},
+		},
+	}, input.DeploymentIntervals...)
+}

test/e2e/e2e_suite_test.go

@@ -27,7 +27,7 @@ import (
 	"sigs.k8s.io/cluster-api/test/framework/clusterctl"
 	ctrl "sigs.k8s.io/controller-runtime"
 
-	addonsv1 "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api/external/sigs.k8s.io/cluster-api-addon-provider-helm/api/v1alpha1"
+	helmaddonsv1 "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api/external/sigs.k8s.io/cluster-api-addon-provider-helm/api/v1alpha1"
 	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/test/framework/bootstrap"
 	clusterctltemp "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/test/framework/clusterctl"
 )
@@ -205,7 +205,7 @@ func createClusterctlLocalRepository(config *clusterctl.E2EConfig, repositoryFol
 func initScheme() *runtime.Scheme {
 	scheme := runtime.NewScheme()
 	framework.TryAddDefaultSchemes(scheme)
-	Expect(addonsv1.AddToScheme(scheme)).To(Succeed())
+	Expect(helmaddonsv1.AddToScheme(scheme)).To(Succeed())
 	return scheme
 }