Skip to content

Commit 6b85fdb

Browse files
committed
refactor(imports): align CAPI imports to v1.11 package layout
- core: sigs.k8s.io/cluster-api/api/v1beta1 -> sigs.k8s.io/cluster-api/api/core/v1beta1 - kubeadm APIs: - sigs.k8s.io/cluster-api/bootstrap/kubeadm/api/v1beta1 -> sigs.k8s.io/cluster-api/api/bootstrap/kubeadm/v1beta1 - sigs.k8s.io/cluster-api/controlplane/kubeadm/api/v1beta1 -> sigs.k8s.io/cluster-api/api/controlplane/kubeadm/v1beta1 - remove deprecated exp API imports (exp/api/v1beta1) and related scheme registration; MachinePool and friends live under core now - keep clusterv1 on v1beta1 for now to avoid downstream condition/patch API breakages; v1beta2 migration can follow separately
1 parent 51c5a99 commit 6b85fdb

File tree

157 files changed

+181
-183
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

157 files changed

+181
-183
lines changed

api/v1beta1/awscluster_types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package v1beta1
1919
import (
2020
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2121

22-
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
22+
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
2323
)
2424

2525
const (

api/v1beta1/awsclustertemplate_types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package v1beta1
1919
import (
2020
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2121

22-
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
22+
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
2323
)
2424

2525
// AWSClusterTemplateSpec defines the desired state of AWSClusterTemplate.

api/v1beta1/awsmachine_types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package v1beta1
1919
import (
2020
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2121

22-
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
22+
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
2323
)
2424

2525
const (

api/v1beta1/awsmachinetemplate_types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
corev1 "k8s.io/api/core/v1"
2121
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2222

23-
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
23+
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
2424
)
2525

2626
// AWSMachineTemplateStatus defines a status for an AWSMachineTemplate.

api/v1beta1/conditions_consts.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ limitations under the License.
1616

1717
package v1beta1
1818

19-
import clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
19+
import clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
2020

2121
const (
2222
// PrincipalCredentialRetrievedCondition reports on whether Principal credentials could be retrieved successfully.

api/v1beta1/tags.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"k8s.io/apimachinery/pkg/types"
2525
"k8s.io/apimachinery/pkg/util/validation/field"
2626

27-
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
27+
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
2828
)
2929

3030
// Tags defines a map of tags.

api/v1beta1/types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package v1beta1
1919
import (
2020
"k8s.io/apimachinery/pkg/util/sets"
2121

22-
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
22+
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
2323
)
2424

2525
// AWSResourceReference is a reference to a specific AWS resource by ID or filters.

api/v1beta1/zz_generated.conversion.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

api/v1beta1/zz_generated.deepcopy.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

api/v1beta2/awscluster_types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package v1beta2
1919
import (
2020
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2121

22-
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
22+
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
2323
)
2424

2525
const (

0 commit comments

Comments
 (0)