@@ -18,7 +18,6 @@ import (
18
18
talosclient "github.com/talos-systems/talos/pkg/machinery/client"
19
19
talosconfig "github.com/talos-systems/talos/pkg/machinery/client/config"
20
20
corev1 "k8s.io/api/core/v1"
21
- v1 "k8s.io/api/core/v1"
22
21
apierrors "k8s.io/apimachinery/pkg/api/errors"
23
22
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
24
23
"k8s.io/apimachinery/pkg/runtime"
@@ -28,9 +27,7 @@ import (
28
27
"k8s.io/client-go/kubernetes"
29
28
"k8s.io/client-go/tools/clientcmd"
30
29
"k8s.io/utils/pointer"
31
- "sigs.k8s.io/cluster-api/api/v1alpha3"
32
30
capiv1 "sigs.k8s.io/cluster-api/api/v1alpha3"
33
- clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha3"
34
31
"sigs.k8s.io/cluster-api/controllers/external"
35
32
capierrors "sigs.k8s.io/cluster-api/errors"
36
33
"sigs.k8s.io/cluster-api/util"
@@ -326,7 +323,7 @@ func (r *TalosControlPlaneReconciler) scaleDownControlPlane(ctx context.Context,
326
323
327
324
r .Log .Info ("Found control plane machines" , "machines" , len (machines ))
328
325
329
- kubeconfigSecret := & v1 .Secret {}
326
+ kubeconfigSecret := & corev1 .Secret {}
330
327
331
328
err = r .Client .Get (ctx ,
332
329
types.NamespacedName {
@@ -386,7 +383,7 @@ func (r *TalosControlPlaneReconciler) scaleDownControlPlane(ctx context.Context,
386
383
}
387
384
388
385
for _ , addr := range node .Status .Addresses {
389
- if addr .Type == v1 .NodeInternalIP {
386
+ if addr .Type == corev1 .NodeInternalIP {
390
387
address = addr .Address
391
388
break
392
389
}
@@ -555,7 +552,7 @@ func (r *TalosControlPlaneReconciler) bootControlPlane(ctx context.Context, clus
555
552
Name : names .SimpleNameGenerator .GenerateName (tcp .Name + "-" ),
556
553
Namespace : tcp .Namespace ,
557
554
Labels : map [string ]string {
558
- clusterv1 .ClusterLabelName : cluster .ClusterName ,
555
+ capiv1 .ClusterLabelName : cluster .ClusterName ,
559
556
capiv1 .MachineControlPlaneLabelName : "" ,
560
557
},
561
558
OwnerReferences : []metav1.OwnerReference {
@@ -652,7 +649,7 @@ func (r *TalosControlPlaneReconciler) updateStatus(ctx context.Context, tcp *con
652
649
return nil
653
650
}
654
651
655
- kubeconfigSecret := & v1 .Secret {}
652
+ kubeconfigSecret := & corev1 .Secret {}
656
653
657
654
err = r .Client .Get (ctx ,
658
655
types.NamespacedName {
@@ -682,7 +679,7 @@ func (r *TalosControlPlaneReconciler) updateStatus(ctx context.Context, tcp *con
682
679
683
680
go func () {
684
681
e := func () error {
685
- if v1alpha3 .MachinePhase (ownedMachine .Status .Phase ) == v1alpha3 .MachinePhaseDeleting {
682
+ if capiv1 .MachinePhase (ownedMachine .Status .Phase ) == capiv1 .MachinePhaseDeleting {
686
683
return fmt .Errorf ("machine is deleting" )
687
684
}
688
685
@@ -773,7 +770,7 @@ func (r *TalosControlPlaneReconciler) reconcileKubeconfig(ctx context.Context, c
773
770
return nil
774
771
}
775
772
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 {
777
774
obj , err := external .Get (ctx , r .Client , & ref , cluster .Namespace )
778
775
if err != nil {
779
776
return err
@@ -785,7 +782,7 @@ func (r *TalosControlPlaneReconciler) addClusterOwnerToObj(ctx context.Context,
785
782
}
786
783
787
784
obj .SetOwnerReferences (util .EnsureOwnerRef (obj .GetOwnerReferences (), metav1.OwnerReference {
788
- APIVersion : clusterv1 .GroupVersion .String (),
785
+ APIVersion : capiv1 .GroupVersion .String (),
789
786
Kind : "Cluster" ,
790
787
Name : cluster .Name ,
791
788
UID : cluster .UID ,
0 commit comments