Skip to content

🌱 Bump CAPI to v1.11 and k8s to v1.33 #5624

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
+490 −612
Open

🌱 Bump CAPI to v1.11 and k8s to v1.33 #5624

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
52df0c6
deps: upgrade Kubernetes dependencies to v0.33.4
bryan-cox Sep 5, 2025
4fccd02
deps: update cluster-api to v1.11.1 and controller-runtime to v0.21.0
bryan-cox Sep 5, 2025
85d5d18
WIP no IDE errors
bryan-cox Sep 5, 2025
f96b7ac
WIP IDE Errors
bryan-cox Sep 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .golangci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,8 +169,8 @@ linters:
alias: crclient
- pkg: k8s.io/apimachinery/pkg/types
alias: apimachinerytypes
- pkg: sigs.k8s.io/cluster-api/exp/api/v1beta1
alias: expclusterv1
- pkg: "sigs.k8s.io/cluster-api/api/core/v1beta1"
alias: clusterv1
no-unaliased: false
nolintlint:
require-specific: true
Expand Down
2 changes: 1 addition & 1 deletion api/v1beta1/awscluster_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package v1beta1
import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We are also need to upgrade to v1beta2.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will be the same comment in a number of places so i won't repeat it for every instance.

)

const (
Expand Down
3 changes: 1 addition & 2 deletions api/v1beta1/awsclustertemplate_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@ package v1beta1
import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
)
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta1")

// AWSClusterTemplateSpec defines the desired state of AWSClusterTemplate.
type AWSClusterTemplateSpec struct {
Expand Down
3 changes: 1 addition & 2 deletions api/v1beta1/awsmachine_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@ package v1beta1
import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
)
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta1")

const (
// MachineFinalizer allows ReconcileAWSMachine to clean up AWS resources associated with AWSMachine before
Expand Down
3 changes: 1 addition & 2 deletions api/v1beta1/awsmachinetemplate_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@ import (
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
)
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta1")

// AWSMachineTemplateStatus defines a status for an AWSMachineTemplate.
type AWSMachineTemplateStatus struct {
Expand Down
3 changes: 1 addition & 2 deletions api/v1beta1/conditions_consts.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@ limitations under the License.

package v1beta1

import clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"

import clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
const (
// PrincipalCredentialRetrievedCondition reports on whether Principal credentials could be retrieved successfully.
// A possible scenario, where retrieval is unsuccessful, is when SourcePrincipal is not authorized for assume role.
Expand Down
3 changes: 1 addition & 2 deletions api/v1beta1/tags.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,7 @@ import (
"k8s.io/apimachinery/pkg/types"
"k8s.io/apimachinery/pkg/util/validation/field"

clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
)
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta1")

// Tags defines a map of tags.
type Tags map[string]string
Expand Down
3 changes: 1 addition & 2 deletions api/v1beta1/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@ package v1beta1
import (
"k8s.io/apimachinery/pkg/util/sets"

clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
)
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta1")

// AWSResourceReference is a reference to a specific AWS resource by ID or filters.
// Only one of ID or Filters may be specified. Specifying more than one will result in
Expand Down
2 changes: 1 addition & 1 deletion api/v1beta1/zz_generated.conversion.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion api/v1beta1/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions api/v1beta2/awscluster_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@ package v1beta2
import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
)
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta1")

const (
// ClusterFinalizer allows ReconcileAWSCluster to clean up AWS resources associated with AWSCluster before
Expand Down
2 changes: 1 addition & 1 deletion api/v1beta2/awscluster_webhook.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import (
"sigs.k8s.io/controller-runtime/pkg/webhook"
"sigs.k8s.io/controller-runtime/pkg/webhook/admission"

clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
"sigs.k8s.io/cluster-api/util/annotations"
)

Expand Down
2 changes: 1 addition & 1 deletion api/v1beta2/awscluster_webhook_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import (

"sigs.k8s.io/cluster-api-provider-aws/v2/feature"
"sigs.k8s.io/cluster-api-provider-aws/v2/util/defaulting"
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
)

func TestAWSClusterDefault(t *testing.T) {
Expand Down
3 changes: 1 addition & 2 deletions api/v1beta2/awsclustertemplate_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@ package v1beta2
import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
)
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta1")

// AWSClusterTemplateSpec defines the desired state of AWSClusterTemplate.
type AWSClusterTemplateSpec struct {
Expand Down
3 changes: 1 addition & 2 deletions api/v1beta2/awsmachine_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@ package v1beta2
import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
)
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta1")

const (
// MachineFinalizer allows ReconcileAWSMachine to clean up AWS resources associated with AWSMachine before
Expand Down
3 changes: 1 addition & 2 deletions api/v1beta2/awsmachinetemplate_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@ import (
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
)
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta1")

// AWSMachineTemplateStatus defines a status for an AWSMachineTemplate.
type AWSMachineTemplateStatus struct {
Expand Down
3 changes: 1 addition & 2 deletions api/v1beta2/awsmanagedcluster_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@ package v1beta2
import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
)
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta1")

// AWSManagedClusterSpec defines the desired state of AWSManagedCluster
type AWSManagedClusterSpec struct {
Expand Down
3 changes: 1 addition & 2 deletions api/v1beta2/conditions_consts.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@ limitations under the License.

package v1beta2

import clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"

import clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
const (
// PrincipalCredentialRetrievedCondition reports on whether Principal credentials could be retrieved successfully.
// A possible scenario, where retrieval is unsuccessful, is when SourcePrincipal is not authorized for assume role.
Expand Down
3 changes: 1 addition & 2 deletions api/v1beta2/tags.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@ import (
"k8s.io/apimachinery/pkg/types"
"k8s.io/apimachinery/pkg/util/validation/field"

clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
)
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta1")

// Tags defines a map of tags.
type Tags map[string]string
Expand Down
3 changes: 1 addition & 2 deletions api/v1beta2/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@ import (

"k8s.io/apimachinery/pkg/util/sets"

clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
)
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta1")

const (
// PreventDeletionLabel can be used in situations where preventing delation is allowed. The docs
Expand Down
2 changes: 1 addition & 1 deletion api/v1beta2/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions bootstrap/eks/api/v1beta1/condition_consts.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@ limitations under the License.

package v1beta1

import clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"

import clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
// Conditions and condition Reasons for the EKSConfig object
// FROM: https://github.com/kubernetes-sigs/cluster-api/blob/main/bootstrap/kubeadm/api/v1beta1/condition_consts.go

Expand Down
3 changes: 1 addition & 2 deletions bootstrap/eks/api/v1beta1/eksconfig_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@ package v1beta1
import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
)
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta1")

// EKSConfigSpec defines the desired state of Amazon EKS Bootstrap Configuration.
type EKSConfigSpec struct {
Expand Down
2 changes: 1 addition & 1 deletion bootstrap/eks/api/v1beta1/zz_generated.conversion.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion bootstrap/eks/api/v1beta1/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions bootstrap/eks/api/v1beta2/condition_consts.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@ limitations under the License.

package v1beta2

import clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"

import clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
// Conditions and condition Reasons for the EKSConfig object
// FROM: https://github.com/kubernetes-sigs/cluster-api/blob/main/bootstrap/kubeadm/api/v1beta1/condition_consts.go

Expand Down
3 changes: 1 addition & 2 deletions bootstrap/eks/api/v1beta2/eksconfig_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@ package v1beta2
import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
)
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta1")

// EKSConfigSpec defines the desired state of Amazon EKS Bootstrap Configuration.
type EKSConfigSpec struct {
Expand Down
2 changes: 1 addition & 1 deletion bootstrap/eks/api/v1beta2/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 5 additions & 6 deletions bootstrap/eks/controllers/eksconfig_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,12 @@
ekscontrolplanev1 "sigs.k8s.io/cluster-api-provider-aws/v2/controlplane/eks/api/v1beta2"
"sigs.k8s.io/cluster-api-provider-aws/v2/pkg/logger"
"sigs.k8s.io/cluster-api-provider-aws/v2/util/paused"
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
bsutil "sigs.k8s.io/cluster-api/bootstrap/util"
expclusterv1 "sigs.k8s.io/cluster-api/exp/api/v1beta1"
"sigs.k8s.io/cluster-api/feature"
"sigs.k8s.io/cluster-api/util"
"sigs.k8s.io/cluster-api/util/conditions"
"sigs.k8s.io/cluster-api/util/patch"
"sigs.k8s.io/cluster-api/util/deprecated/v1beta1/conditions"
patch "sigs.k8s.io/cluster-api/util/deprecated/v1beta1/patch"
"sigs.k8s.io/cluster-api/util/predicates"
)

Expand Down Expand Up @@ -113,7 +112,7 @@
}
log = log.WithValues("cluster", klog.KObj(cluster))

if isPaused, conditionChanged, err := paused.EnsurePausedCondition(ctx, r.Client, cluster, config); err != nil || isPaused || conditionChanged {

Check failure on line 115 in bootstrap/eks/controllers/eksconfig_controller.go

View workflow job for this annotation

GitHub Actions / lint 

cannot use cluster (variable of type *"sigs.k8s.io/cluster-api/api/core/v1beta2".Cluster) as *"sigs.k8s.io/cluster-api/api/core/v1beta1".Cluster value in argument to paused.EnsurePausedCondition

Check failure on line 115 in bootstrap/eks/controllers/eksconfig_controller.go

View workflow job for this annotation

GitHub Actions / lint 

cannot use cluster (variable of type *"sigs.k8s.io/cluster-api/api/core/v1beta2".Cluster) as *"sigs.k8s.io/cluster-api/api/core/v1beta1".Cluster value in argument to paused.EnsurePausedCondition

Check failure on line 115 in bootstrap/eks/controllers/eksconfig_controller.go

View workflow job for this annotation

GitHub Actions / lint 

cannot use cluster (variable of type *"sigs.k8s.io/cluster-api/api/core/v1beta2".Cluster) as *"sigs.k8s.io/cluster-api/api/core/v1beta1".Cluster value in argument to paused.EnsurePausedCondition
return ctrl.Result{}, err
}

Expand Down Expand Up @@ -143,7 +142,7 @@
}
}()

return ctrl.Result{}, r.joinWorker(ctx, cluster, config, configOwner)

Check failure on line 145 in bootstrap/eks/controllers/eksconfig_controller.go

View workflow job for this annotation

GitHub Actions / lint 

cannot use cluster (variable of type *"sigs.k8s.io/cluster-api/api/core/v1beta2".Cluster) as *"sigs.k8s.io/cluster-api/api/core/v1beta1".Cluster value in argument to r.joinWorker

Check failure on line 145 in bootstrap/eks/controllers/eksconfig_controller.go

View workflow job for this annotation

GitHub Actions / lint 

cannot use cluster (variable of type *"sigs.k8s.io/cluster-api/api/core/v1beta2".Cluster) as *"sigs.k8s.io/cluster-api/api/core/v1beta1".Cluster value in argument to r.joinWorker

Check failure on line 145 in bootstrap/eks/controllers/eksconfig_controller.go

View workflow job for this annotation

GitHub Actions / lint 

cannot use cluster (variable of type *"sigs.k8s.io/cluster-api/api/core/v1beta2".Cluster) as *"sigs.k8s.io/cluster-api/api/core/v1beta1".Cluster value in argument to r.joinWorker
}

func (r *EKSConfigReconciler) resolveFiles(ctx context.Context, cfg *eksbootstrapv1.EKSConfig) ([]eksbootstrapv1.File, error) {
Expand Down Expand Up @@ -301,7 +300,7 @@

if feature.Gates.Enabled(feature.MachinePool) {
b = b.Watches(
&expclusterv1.MachinePool{},
&clusterv1.MachinePool{},
handler.EnqueueRequestsFromMapFunc(r.MachinePoolToBootstrapMapFunc),
)
}
Expand All @@ -314,7 +313,7 @@
err = c.Watch(
source.Kind[client.Object](mgr.GetCache(), &clusterv1.Cluster{},
handler.EnqueueRequestsFromMapFunc((r.ClusterToEKSConfigs)),
predicates.ClusterPausedTransitionsOrInfrastructureReady(mgr.GetScheme(), logger.FromContext(ctx).GetLogger())),

Check failure on line 316 in bootstrap/eks/controllers/eksconfig_controller.go

View workflow job for this annotation

GitHub Actions / lint 

undefined: predicates.ClusterPausedTransitionsOrInfrastructureReady (typecheck)

Check failure on line 316 in bootstrap/eks/controllers/eksconfig_controller.go

View workflow job for this annotation

GitHub Actions / lint 

undefined: predicates.ClusterPausedTransitionsOrInfrastructureReady (typecheck)

Check failure on line 316 in bootstrap/eks/controllers/eksconfig_controller.go

View workflow job for this annotation

GitHub Actions / lint 

undefined: predicates.ClusterPausedTransitionsOrInfrastructureReady (typecheck)
)
if err != nil {
return errors.Wrap(err, "failed adding watch for Clusters to controller manager")
Expand Down Expand Up @@ -382,7 +381,7 @@
func (r *EKSConfigReconciler) MachinePoolToBootstrapMapFunc(_ context.Context, o client.Object) []ctrl.Request {
result := []ctrl.Request{}

m, ok := o.(*expclusterv1.MachinePool)
m, ok := o.(*clusterv1.MachinePool)
if !ok {
klog.Errorf("Expected a MachinePool but got a %T", o)
}
Expand Down
3 changes: 1 addition & 2 deletions bootstrap/eks/controllers/eksconfig_controller_reconciler_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,7 @@
eksbootstrapv1 "sigs.k8s.io/cluster-api-provider-aws/v2/bootstrap/eks/api/v1beta2"
"sigs.k8s.io/cluster-api-provider-aws/v2/bootstrap/eks/internal/userdata"
ekscontrolplanev1 "sigs.k8s.io/cluster-api-provider-aws/v2/controlplane/eks/api/v1beta2"
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
"sigs.k8s.io/cluster-api/exp/api/v1beta1"
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
"sigs.k8s.io/cluster-api/util"
"sigs.k8s.io/cluster-api/util/conditions"
)
Expand Down Expand Up @@ -85,7 +84,7 @@
config.ObjectMeta.OwnerReferences = []metav1.OwnerReference{
{
Kind: "MachinePool",
APIVersion: v1beta1.GroupVersion.String(),

Check failure on line 87 in bootstrap/eks/controllers/eksconfig_controller_reconciler_test.go

View workflow job for this annotation

GitHub Actions / lint 

undefined: v1beta1

Check failure on line 87 in bootstrap/eks/controllers/eksconfig_controller_reconciler_test.go

View workflow job for this annotation

GitHub Actions / lint 

undefined: v1beta1

Check failure on line 87 in bootstrap/eks/controllers/eksconfig_controller_reconciler_test.go

View workflow job for this annotation

GitHub Actions / lint 

undefined: v1beta1
Name: mp.Name,
UID: types.UID(fmt.Sprintf("%s uid", mp.Name)),
},
Expand Down Expand Up @@ -294,7 +293,7 @@
InfrastructureReady: true,
},
}
conditions.MarkTrue(cluster, clusterv1.ControlPlaneInitializedCondition)

Check failure on line 296 in bootstrap/eks/controllers/eksconfig_controller_reconciler_test.go

View workflow job for this annotation

GitHub Actions / lint 

undefined: conditions.MarkTrue

Check failure on line 296 in bootstrap/eks/controllers/eksconfig_controller_reconciler_test.go

View workflow job for this annotation

GitHub Actions / lint 

undefined: conditions.MarkTrue

Check failure on line 296 in bootstrap/eks/controllers/eksconfig_controller_reconciler_test.go

View workflow job for this annotation

GitHub Actions / lint 

undefined: conditions.MarkTrue
return cluster
}

Expand Down Expand Up @@ -334,18 +333,18 @@
}

// newMachinePool returns a CAPI machine object; if cluster is not nil, the MachinePool is linked to the cluster as well.
func newMachinePool(cluster *clusterv1.Cluster, name string) *v1beta1.MachinePool {

Check failure on line 336 in bootstrap/eks/controllers/eksconfig_controller_reconciler_test.go

View workflow job for this annotation

GitHub Actions / lint 

undefined: v1beta1

Check failure on line 336 in bootstrap/eks/controllers/eksconfig_controller_reconciler_test.go

View workflow job for this annotation

GitHub Actions / lint 

undefined: v1beta1

Check failure on line 336 in bootstrap/eks/controllers/eksconfig_controller_reconciler_test.go

View workflow job for this annotation

GitHub Actions / lint 

undefined: v1beta1
generatedName := fmt.Sprintf("%s-%s", name, util.RandomString(5))
mp := &v1beta1.MachinePool{

Check failure on line 338 in bootstrap/eks/controllers/eksconfig_controller_reconciler_test.go

View workflow job for this annotation

GitHub Actions / lint 

undefined: v1beta1

Check failure on line 338 in bootstrap/eks/controllers/eksconfig_controller_reconciler_test.go

View workflow job for this annotation

GitHub Actions / lint 

undefined: v1beta1

Check failure on line 338 in bootstrap/eks/controllers/eksconfig_controller_reconciler_test.go

View workflow job for this annotation

GitHub Actions / lint 

undefined: v1beta1
TypeMeta: metav1.TypeMeta{
Kind: "MachinePool",
APIVersion: v1beta1.GroupVersion.String(),

Check failure on line 341 in bootstrap/eks/controllers/eksconfig_controller_reconciler_test.go

View workflow job for this annotation

GitHub Actions / lint 

undefined: v1beta1

Check failure on line 341 in bootstrap/eks/controllers/eksconfig_controller_reconciler_test.go

View workflow job for this annotation

GitHub Actions / lint 

undefined: v1beta1

Check failure on line 341 in bootstrap/eks/controllers/eksconfig_controller_reconciler_test.go

View workflow job for this annotation

GitHub Actions / lint 

undefined: v1beta1
},
ObjectMeta: metav1.ObjectMeta{
Namespace: "default",
Name: generatedName,
},
Spec: v1beta1.MachinePoolSpec{

Check failure on line 347 in bootstrap/eks/controllers/eksconfig_controller_reconciler_test.go

View workflow job for this annotation

GitHub Actions / lint 

undefined: v1beta1

Check failure on line 347 in bootstrap/eks/controllers/eksconfig_controller_reconciler_test.go

View workflow job for this annotation

GitHub Actions / lint 

undefined: v1beta1

Check failure on line 347 in bootstrap/eks/controllers/eksconfig_controller_reconciler_test.go

View workflow job for this annotation

GitHub Actions / lint 

undefined: v1beta1
Template: clusterv1.MachineTemplateSpec{
Spec: clusterv1.MachineSpec{
Bootstrap: clusterv1.Bootstrap{
Expand Down
2 changes: 1 addition & 1 deletion bootstrap/eks/controllers/eksconfig_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
. "github.com/onsi/gomega"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"

clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
bsutil "sigs.k8s.io/cluster-api/bootstrap/util"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/clusterawsadm/gc/gc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import (
infrav1 "sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
ekscontrolplanev1 "sigs.k8s.io/cluster-api-provider-aws/v2/controlplane/eks/api/v1beta2"
"sigs.k8s.io/cluster-api-provider-aws/v2/pkg/annotations"
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
"sigs.k8s.io/cluster-api/controllers/external"
"sigs.k8s.io/cluster-api/util/patch"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/clusterawsadm/gc/gc_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import (
infrav1 "sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
ekscontrolplanev1 "sigs.k8s.io/cluster-api-provider-aws/v2/controlplane/eks/api/v1beta2"
"sigs.k8s.io/cluster-api-provider-aws/v2/pkg/annotations"
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
"sigs.k8s.io/cluster-api/controllers/external"
)

Expand Down
2 changes: 1 addition & 1 deletion controllers/awscluster_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@

infrav1 "sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
"sigs.k8s.io/cluster-api-provider-aws/v2/feature"
"sigs.k8s.io/cluster-api-provider-aws/v2/pkg/cloud/scope"

Check failure on line 40 in controllers/awscluster_controller.go

View workflow job for this annotation

GitHub Actions / lint 

could not import sigs.k8s.io/cluster-api-provider-aws/v2/pkg/cloud/scope (-: # sigs.k8s.io/cluster-api-provider-aws/v2/pkg/cloud/scope

Check failure on line 40 in controllers/awscluster_controller.go

View workflow job for this annotation

GitHub Actions / lint 

could not import sigs.k8s.io/cluster-api-provider-aws/v2/pkg/cloud/scope (-: # sigs.k8s.io/cluster-api-provider-aws/v2/pkg/cloud/scope

Check failure on line 40 in controllers/awscluster_controller.go

View workflow job for this annotation

GitHub Actions / lint 

could not import sigs.k8s.io/cluster-api-provider-aws/v2/pkg/cloud/scope (-: # sigs.k8s.io/cluster-api-provider-aws/v2/pkg/cloud/scope
"sigs.k8s.io/cluster-api-provider-aws/v2/pkg/cloud/services"
"sigs.k8s.io/cluster-api-provider-aws/v2/pkg/cloud/services/ec2"
"sigs.k8s.io/cluster-api-provider-aws/v2/pkg/cloud/services/elb"
Expand All @@ -49,7 +49,7 @@
"sigs.k8s.io/cluster-api-provider-aws/v2/pkg/logger"
infrautilconditions "sigs.k8s.io/cluster-api-provider-aws/v2/util/conditions"
"sigs.k8s.io/cluster-api-provider-aws/v2/util/paused"
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
"sigs.k8s.io/cluster-api/util"
capiannotations "sigs.k8s.io/cluster-api/util/annotations"
"sigs.k8s.io/cluster-api/util/conditions"
Expand Down
2 changes: 1 addition & 1 deletion controllers/awscluster_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ import (
"sigs.k8s.io/cluster-api-provider-aws/v2/pkg/cloud/services/network"
"sigs.k8s.io/cluster-api-provider-aws/v2/pkg/cloud/services/securitygroup"
"sigs.k8s.io/cluster-api-provider-aws/v2/test/mocks"
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
"sigs.k8s.io/cluster-api/util"
)

Expand Down
2 changes: 1 addition & 1 deletion controllers/awscluster_controller_unit_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ import (
"sigs.k8s.io/cluster-api-provider-aws/v2/pkg/cloud/scope"
"sigs.k8s.io/cluster-api-provider-aws/v2/pkg/cloud/services"
"sigs.k8s.io/cluster-api-provider-aws/v2/pkg/cloud/services/mock_services"
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
"sigs.k8s.io/cluster-api/util"
)

Expand Down
2 changes: 1 addition & 1 deletion controllers/awsmachine_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ import (
"sigs.k8s.io/cluster-api-provider-aws/v2/pkg/cloud/services/userdata"
"sigs.k8s.io/cluster-api-provider-aws/v2/pkg/logger"
"sigs.k8s.io/cluster-api-provider-aws/v2/util/paused"
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
"sigs.k8s.io/cluster-api/util"
"sigs.k8s.io/cluster-api/util/conditions"
"sigs.k8s.io/cluster-api/util/predicates"
Expand Down
2 changes: 1 addition & 1 deletion controllers/awsmachine_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ import (
elbService "sigs.k8s.io/cluster-api-provider-aws/v2/pkg/cloud/services/elb"
"sigs.k8s.io/cluster-api-provider-aws/v2/pkg/cloud/services/mock_services"
"sigs.k8s.io/cluster-api-provider-aws/v2/test/mocks"
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
"sigs.k8s.io/cluster-api/util"
"sigs.k8s.io/cluster-api/util/conditions"
)
Expand Down
2 changes: 1 addition & 1 deletion controllers/awsmachine_controller_unit_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ import (
"sigs.k8s.io/cluster-api-provider-aws/v2/pkg/cloud/services/mock_services"
"sigs.k8s.io/cluster-api-provider-aws/v2/pkg/logger"
"sigs.k8s.io/cluster-api-provider-aws/v2/test/mocks"
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
kubeadmv1beta1 "sigs.k8s.io/cluster-api/controlplane/kubeadm/api/v1beta1"
"sigs.k8s.io/cluster-api/util"
)
Expand Down
Loading