From 12fb24020c3de20b97c70afbb84f35a4a57fd5cd Mon Sep 17 00:00:00 2001 From: Jimmi Dyson Date: Fri, 19 Apr 2024 18:42:59 +0100 Subject: [PATCH] fixup! refactor: Use clusterv1 import alias to satisfy linter --- test/e2e/clusterautoscaler_helpers.go | 4 ++-- test/e2e/self_hosted_test.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/e2e/clusterautoscaler_helpers.go b/test/e2e/clusterautoscaler_helpers.go index 071eda55a..516d8a25d 100644 --- a/test/e2e/clusterautoscaler_helpers.go +++ b/test/e2e/clusterautoscaler_helpers.go @@ -15,7 +15,7 @@ import ( 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" + clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1" "sigs.k8s.io/cluster-api/test/framework" "sigs.k8s.io/controller-runtime/pkg/client" @@ -26,7 +26,7 @@ const clusterAutoscalerPrefix = "cluster-autoscaler-" type WaitForClusterAutoscalerToBeReadyInWorkloadClusterInput struct { ClusterAutoscaler *v1alpha1.ClusterAutoscaler - WorkloadCluster *capiv1.Cluster + WorkloadCluster *clusterv1.Cluster ClusterProxy framework.ClusterProxy DeploymentIntervals []interface{} DaemonSetIntervals []interface{} diff --git a/test/e2e/self_hosted_test.go b/test/e2e/self_hosted_test.go index c093ba25b..88186dda8 100644 --- a/test/e2e/self_hosted_test.go +++ b/test/e2e/self_hosted_test.go @@ -12,7 +12,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "k8s.io/utils/ptr" - capiv1 "sigs.k8s.io/cluster-api/api/v1beta1" + clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1" capiframework "sigs.k8s.io/cluster-api/test/framework" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api/v1alpha1" @@ -55,7 +55,7 @@ var _ = Describe("Self-hosted", Serial, func() { SkipCleanup: skipCleanup, Flavor: flavour, InfrastructureProvider: ptr.To(lowercaseProvider), - PostClusterMoved: func(proxy capiframework.ClusterProxy, cluster *capiv1.Cluster) { + PostClusterMoved: func(proxy capiframework.ClusterProxy, cluster *clusterv1.Cluster) { By( "Waiting for all requested addons to be ready in workload cluster", )