Skip to content

Commit f7191a0

Browse files
rsmittytalos-bot
authored andcommitted
chore: remove duplicate imports
This PR fixes some spots where we were importing the same libraries multiple times under different names. Signed-off-by: Spencer Smith <[email protected]>
1 parent d7f4618 commit f7191a0

File tree

1 file changed

+7
-10
lines changed

1 file changed

+7
-10
lines changed

controllers/taloscontrolplane_controller.go

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import (
1818
talosclient "github.com/talos-systems/talos/pkg/machinery/client"
1919
talosconfig "github.com/talos-systems/talos/pkg/machinery/client/config"
2020
corev1 "k8s.io/api/core/v1"
21-
v1 "k8s.io/api/core/v1"
2221
apierrors "k8s.io/apimachinery/pkg/api/errors"
2322
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2423
"k8s.io/apimachinery/pkg/runtime"
@@ -28,9 +27,7 @@ import (
2827
"k8s.io/client-go/kubernetes"
2928
"k8s.io/client-go/tools/clientcmd"
3029
"k8s.io/utils/pointer"
31-
"sigs.k8s.io/cluster-api/api/v1alpha3"
3230
capiv1 "sigs.k8s.io/cluster-api/api/v1alpha3"
33-
clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha3"
3431
"sigs.k8s.io/cluster-api/controllers/external"
3532
capierrors "sigs.k8s.io/cluster-api/errors"
3633
"sigs.k8s.io/cluster-api/util"
@@ -326,7 +323,7 @@ func (r *TalosControlPlaneReconciler) scaleDownControlPlane(ctx context.Context,
326323

327324
r.Log.Info("Found control plane machines", "machines", len(machines))
328325

329-
kubeconfigSecret := &v1.Secret{}
326+
kubeconfigSecret := &corev1.Secret{}
330327

331328
err = r.Client.Get(ctx,
332329
types.NamespacedName{
@@ -386,7 +383,7 @@ func (r *TalosControlPlaneReconciler) scaleDownControlPlane(ctx context.Context,
386383
}
387384

388385
for _, addr := range node.Status.Addresses {
389-
if addr.Type == v1.NodeInternalIP {
386+
if addr.Type == corev1.NodeInternalIP {
390387
address = addr.Address
391388
break
392389
}
@@ -555,7 +552,7 @@ func (r *TalosControlPlaneReconciler) bootControlPlane(ctx context.Context, clus
555552
Name: names.SimpleNameGenerator.GenerateName(tcp.Name + "-"),
556553
Namespace: tcp.Namespace,
557554
Labels: map[string]string{
558-
clusterv1.ClusterLabelName: cluster.ClusterName,
555+
capiv1.ClusterLabelName: cluster.ClusterName,
559556
capiv1.MachineControlPlaneLabelName: "",
560557
},
561558
OwnerReferences: []metav1.OwnerReference{
@@ -652,7 +649,7 @@ func (r *TalosControlPlaneReconciler) updateStatus(ctx context.Context, tcp *con
652649
return nil
653650
}
654651

655-
kubeconfigSecret := &v1.Secret{}
652+
kubeconfigSecret := &corev1.Secret{}
656653

657654
err = r.Client.Get(ctx,
658655
types.NamespacedName{
@@ -682,7 +679,7 @@ func (r *TalosControlPlaneReconciler) updateStatus(ctx context.Context, tcp *con
682679

683680
go func() {
684681
e := func() error {
685-
if v1alpha3.MachinePhase(ownedMachine.Status.Phase) == v1alpha3.MachinePhaseDeleting {
682+
if capiv1.MachinePhase(ownedMachine.Status.Phase) == capiv1.MachinePhaseDeleting {
686683
return fmt.Errorf("machine is deleting")
687684
}
688685

@@ -773,7 +770,7 @@ func (r *TalosControlPlaneReconciler) reconcileKubeconfig(ctx context.Context, c
773770
return nil
774771
}
775772

776-
func (r *TalosControlPlaneReconciler) addClusterOwnerToObj(ctx context.Context, ref v1.ObjectReference, cluster *capiv1.Cluster) error {
773+
func (r *TalosControlPlaneReconciler) addClusterOwnerToObj(ctx context.Context, ref corev1.ObjectReference, cluster *capiv1.Cluster) error {
777774
obj, err := external.Get(ctx, r.Client, &ref, cluster.Namespace)
778775
if err != nil {
779776
return err
@@ -785,7 +782,7 @@ func (r *TalosControlPlaneReconciler) addClusterOwnerToObj(ctx context.Context,
785782
}
786783

787784
obj.SetOwnerReferences(util.EnsureOwnerRef(obj.GetOwnerReferences(), metav1.OwnerReference{
788-
APIVersion: clusterv1.GroupVersion.String(),
785+
APIVersion: capiv1.GroupVersion.String(),
789786
Kind: "Cluster",
790787
Name: cluster.Name,
791788
UID: cluster.UID,

0 commit comments

Comments
 (0)