Skip to content

Commit

Permalink
fixup! refactor: Use clusterv1 import alias to satisfy linter
Browse files Browse the repository at this point in the history
  • Loading branch information
jimmidyson committed Apr 19, 2024
1 parent 6aa199a commit 2be2c7d
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions test/e2e/clusterautoscaler_helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand All @@ -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{}
Expand Down
4 changes: 2 additions & 2 deletions test/e2e/self_hosted_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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",
)
Expand Down

0 comments on commit 2be2c7d

Please sign in to comment.