Skip to content

Commit f96b7ac

Browse files
bryan-coxbryan-cox
committed
WIP IDE Errors
1 parent 85d5d18 commit f96b7ac

39 files changed

+98
-107
lines changed

‎bootstrap/eks/controllers/eksconfig_controller.go‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,12 @@ import (
4141
ekscontrolplanev1 "sigs.k8s.io/cluster-api-provider-aws/v2/controlplane/eks/api/v1beta2"
4242
"sigs.k8s.io/cluster-api-provider-aws/v2/pkg/logger"
4343
"sigs.k8s.io/cluster-api-provider-aws/v2/util/paused"
44-
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
44+
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
4545
bsutil "sigs.k8s.io/cluster-api/bootstrap/util"
46-
expclusterv1 "sigs.k8s.io/cluster-api/exp/api/v1beta1"
4746
"sigs.k8s.io/cluster-api/feature"
4847
"sigs.k8s.io/cluster-api/util"
49-
"sigs.k8s.io/cluster-api/util/conditions"
50-
"sigs.k8s.io/cluster-api/util/patch"
48+
"sigs.k8s.io/cluster-api/util/deprecated/v1beta1/conditions"
49+
patch "sigs.k8s.io/cluster-api/util/deprecated/v1beta1/patch"
5150
"sigs.k8s.io/cluster-api/util/predicates"
5251
)
5352

@@ -301,7 +300,7 @@ func (r *EKSConfigReconciler) SetupWithManager(ctx context.Context, mgr ctrl.Man
301300

302301
if feature.Gates.Enabled(feature.MachinePool) {
303302
b = b.Watches(
304-
&expclusterv1.MachinePool{},
303+
&clusterv1.MachinePool{},
305304
handler.EnqueueRequestsFromMapFunc(r.MachinePoolToBootstrapMapFunc),
306305
)
307306
}
@@ -382,7 +381,7 @@ func (r *EKSConfigReconciler) MachineToBootstrapMapFunc(_ context.Context, o cli
382381
func (r *EKSConfigReconciler) MachinePoolToBootstrapMapFunc(_ context.Context, o client.Object) []ctrl.Request {
383382
result := []ctrl.Request{}
384383

385-
m, ok := o.(*expclusterv1.MachinePool)
384+
m, ok := o.(*clusterv1.MachinePool)
386385
if !ok {
387386
klog.Errorf("Expected a MachinePool but got a %T", o)
388387
}

‎bootstrap/eks/controllers/eksconfig_controller_reconciler_test.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@ import (
3030
eksbootstrapv1 "sigs.k8s.io/cluster-api-provider-aws/v2/bootstrap/eks/api/v1beta2"
3131
"sigs.k8s.io/cluster-api-provider-aws/v2/bootstrap/eks/internal/userdata"
3232
ekscontrolplanev1 "sigs.k8s.io/cluster-api-provider-aws/v2/controlplane/eks/api/v1beta2"
33-
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
34-
"sigs.k8s.io/cluster-api/exp/api/v1beta1"
33+
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
3534
"sigs.k8s.io/cluster-api/util"
3635
"sigs.k8s.io/cluster-api/util/conditions"
3736
)

‎controllers/awscluster_controller.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ import (
4949
"sigs.k8s.io/cluster-api-provider-aws/v2/pkg/logger"
5050
infrautilconditions "sigs.k8s.io/cluster-api-provider-aws/v2/util/conditions"
5151
"sigs.k8s.io/cluster-api-provider-aws/v2/util/paused"
52-
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
52+
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
5353
"sigs.k8s.io/cluster-api/util"
5454
capiannotations "sigs.k8s.io/cluster-api/util/annotations"
5555
"sigs.k8s.io/cluster-api/util/conditions"

‎controllers/awsmachine_controller.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ import (
6060
"sigs.k8s.io/cluster-api-provider-aws/v2/pkg/cloud/services/userdata"
6161
"sigs.k8s.io/cluster-api-provider-aws/v2/pkg/logger"
6262
"sigs.k8s.io/cluster-api-provider-aws/v2/util/paused"
63-
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
63+
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
6464
"sigs.k8s.io/cluster-api/util"
6565
"sigs.k8s.io/cluster-api/util/conditions"
6666
"sigs.k8s.io/cluster-api/util/predicates"

‎controllers/awsmachine_controller_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ import (
4343
elbService "sigs.k8s.io/cluster-api-provider-aws/v2/pkg/cloud/services/elb"
4444
"sigs.k8s.io/cluster-api-provider-aws/v2/pkg/cloud/services/mock_services"
4545
"sigs.k8s.io/cluster-api-provider-aws/v2/test/mocks"
46-
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
46+
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
4747
"sigs.k8s.io/cluster-api/util"
4848
"sigs.k8s.io/cluster-api/util/conditions"
4949
)

‎controllers/awsmachine_controller_unit_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ import (
5252
"sigs.k8s.io/cluster-api-provider-aws/v2/pkg/cloud/services/mock_services"
5353
"sigs.k8s.io/cluster-api-provider-aws/v2/pkg/logger"
5454
"sigs.k8s.io/cluster-api-provider-aws/v2/test/mocks"
55-
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
55+
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
5656
kubeadmv1beta1 "sigs.k8s.io/cluster-api/controlplane/kubeadm/api/v1beta1"
5757
"sigs.k8s.io/cluster-api/util"
5858
)

‎controllers/awsmanagedcluster_controller.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ import (
3636
ekscontrolplanev1 "sigs.k8s.io/cluster-api-provider-aws/v2/controlplane/eks/api/v1beta2"
3737
"sigs.k8s.io/cluster-api-provider-aws/v2/pkg/logger"
3838
"sigs.k8s.io/cluster-api-provider-aws/v2/util/paused"
39-
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
39+
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
4040
"sigs.k8s.io/cluster-api/util"
4141
"sigs.k8s.io/cluster-api/util/patch"
4242
"sigs.k8s.io/cluster-api/util/predicates"

‎controllers/helpers_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ import (
3636
elbService "sigs.k8s.io/cluster-api-provider-aws/v2/pkg/cloud/services/elb"
3737
"sigs.k8s.io/cluster-api-provider-aws/v2/test/helpers"
3838
"sigs.k8s.io/cluster-api-provider-aws/v2/test/mocks"
39-
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
39+
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
4040
"sigs.k8s.io/cluster-api/util/conditions"
4141
)
4242

‎controllers/rosacluster_controller.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ import (
3737
expinfrav1 "sigs.k8s.io/cluster-api-provider-aws/v2/exp/api/v1beta2"
3838
"sigs.k8s.io/cluster-api-provider-aws/v2/pkg/logger"
3939
"sigs.k8s.io/cluster-api-provider-aws/v2/util/paused"
40-
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
40+
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
4141
"sigs.k8s.io/cluster-api/util"
4242
"sigs.k8s.io/cluster-api/util/patch"
4343
"sigs.k8s.io/cluster-api/util/predicates"

‎controlplane/eks/controllers/awsmanagedcontrolplane_controller.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ import (
5252
"sigs.k8s.io/cluster-api-provider-aws/v2/pkg/cloud/services/securitygroup"
5353
"sigs.k8s.io/cluster-api-provider-aws/v2/pkg/logger"
5454
"sigs.k8s.io/cluster-api-provider-aws/v2/util/paused"
55-
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
55+
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
5656
"sigs.k8s.io/cluster-api/util"
5757
"sigs.k8s.io/cluster-api/util/conditions"
5858
"sigs.k8s.io/cluster-api/util/predicates"

0 commit comments

Comments
 (0)