Skip to content

🌱 Ensure CAPD v1beta1 API package only imports core v1beta1 #12405

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

Merged
merged 1 commit into from
Jun 26, 2025
+137 −118
Merged

🌱 Ensure CAPD v1beta1 API package only imports core v1beta1 #12405

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions test/infrastructure/docker/api/v1beta1/condition_consts.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ limitations under the License.
package v1beta1

import (
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
clusterv1beta1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
)

// Conditions and condition Reasons for the DockerMachine object.
Expand All @@ -29,7 +29,7 @@ const (
// NOTE: When the container provisioning starts the process completes almost immediately and within
// the same reconciliation, so the user will always see a transition from Wait to Provisioned without
// having evidence that the operation is started/is in progress.
ContainerProvisionedCondition clusterv1.ConditionType = "ContainerProvisioned"
ContainerProvisionedCondition clusterv1beta1.ConditionType = "ContainerProvisioned"

// WaitingForClusterInfrastructureReason (Severity=Info) documents a DockerMachine waiting for the cluster
// infrastructure to be ready before starting to create the container that provides the DockerMachine
Expand Down Expand Up @@ -58,7 +58,7 @@ const (
//
// NOTE as a difference from other providers, container provisioning and bootstrap are directly managed
// by the DockerMachine controller (not by cloud-init).
BootstrapExecSucceededCondition clusterv1.ConditionType = "BootstrapExecSucceeded"
BootstrapExecSucceededCondition clusterv1beta1.ConditionType = "BootstrapExecSucceeded"

// BootstrappingReason documents (Severity=Info) a DockerMachine currently executing the bootstrap
// script that creates the Kubernetes node on the newly provisioned machine infrastructure.
Expand All @@ -78,7 +78,7 @@ const (
// NOTE: When the load balancer provisioning starts the process completes almost immediately and within
// the same reconciliation, so the user will always see a transition from no condition to available without
// having evidence that the operation is started/is in progress.
LoadBalancerAvailableCondition clusterv1.ConditionType = "LoadBalancerAvailable"
LoadBalancerAvailableCondition clusterv1beta1.ConditionType = "LoadBalancerAvailable"

// LoadBalancerProvisioningFailedReason (Severity=Warning) documents a DockerCluster controller detecting
// an error while provisioning the container that provides the cluster load balancer.; those kind of
Expand Down
26 changes: 12 additions & 14 deletions test/infrastructure/docker/api/v1beta1/conversion.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ func Convert_v1beta1_DevClusterStatus_To_v1beta2_DevClusterStatus(in *DevCluster
if out.Deprecated.V1Beta1 == nil {
out.Deprecated.V1Beta1 = &infrav1.DevClusterV1Beta1DeprecatedStatus{}
}
out.Deprecated.V1Beta1.Conditions = in.Conditions
clusterv1beta1.Convert_v1beta1_Conditions_To_v1beta2_Deprecated_V1Beta1_Conditions(&in.Conditions, &out.Deprecated.V1Beta1.Conditions)

return nil
}
Expand All @@ -171,7 +171,7 @@ func Convert_v1beta2_DevClusterStatus_To_v1beta1_DevClusterStatus(in *infrav1.De

// Retrieve legacy conditions (v1beta1) from the deprecated field.
if in.Deprecated != nil && in.Deprecated.V1Beta1 != nil && in.Deprecated.V1Beta1.Conditions != nil {
out.Conditions = in.Deprecated.V1Beta1.Conditions
clusterv1beta1.Convert_v1beta2_Deprecated_V1Beta1_Conditions_To_v1beta1_Conditions(&in.Deprecated.V1Beta1.Conditions, &out.Conditions)
}

// Move new conditions (v1beta2) to the v1beta2 field.
Expand Down Expand Up @@ -209,7 +209,7 @@ func Convert_v1beta1_DevMachineStatus_To_v1beta2_DevMachineStatus(in *DevMachine
if out.Deprecated.V1Beta1 == nil {
out.Deprecated.V1Beta1 = &infrav1.DevMachineV1Beta1DeprecatedStatus{}
}
out.Deprecated.V1Beta1.Conditions = in.Conditions
clusterv1beta1.Convert_v1beta1_Conditions_To_v1beta2_Deprecated_V1Beta1_Conditions(&in.Conditions, &out.Deprecated.V1Beta1.Conditions)

return nil
}
Expand All @@ -225,7 +225,7 @@ func Convert_v1beta2_DevMachineStatus_To_v1beta1_DevMachineStatus(in *infrav1.De

// Retrieve legacy conditions (v1beta1) from the deprecated field.
if in.Deprecated != nil && in.Deprecated.V1Beta1 != nil && in.Deprecated.V1Beta1.Conditions != nil {
out.Conditions = in.Deprecated.V1Beta1.Conditions
clusterv1beta1.Convert_v1beta2_Deprecated_V1Beta1_Conditions_To_v1beta1_Conditions(&in.Deprecated.V1Beta1.Conditions, &out.Conditions)
}

// Move new conditions (v1beta2) to the v1beta2 field.
Expand Down Expand Up @@ -263,7 +263,7 @@ func Convert_v1beta1_DockerClusterStatus_To_v1beta2_DockerClusterStatus(in *Dock
if out.Deprecated.V1Beta1 == nil {
out.Deprecated.V1Beta1 = &infrav1.DockerClusterV1Beta1DeprecatedStatus{}
}
out.Deprecated.V1Beta1.Conditions = in.Conditions
clusterv1beta1.Convert_v1beta1_Conditions_To_v1beta2_Deprecated_V1Beta1_Conditions(&in.Conditions, &out.Deprecated.V1Beta1.Conditions)

return nil
}
Expand All @@ -279,7 +279,7 @@ func Convert_v1beta2_DockerClusterStatus_To_v1beta1_DockerClusterStatus(in *infr

// Retrieve legacy conditions (v1beta1) from the deprecated field.
if in.Deprecated != nil && in.Deprecated.V1Beta1 != nil && in.Deprecated.V1Beta1.Conditions != nil {
out.Conditions = in.Deprecated.V1Beta1.Conditions
clusterv1beta1.Convert_v1beta2_Deprecated_V1Beta1_Conditions_To_v1beta1_Conditions(&in.Deprecated.V1Beta1.Conditions, &out.Conditions)
}

// Move new conditions (v1beta2) to the v1beta2 field.
Expand Down Expand Up @@ -317,7 +317,7 @@ func Convert_v1beta1_DockerMachineStatus_To_v1beta2_DockerMachineStatus(in *Dock
if out.Deprecated.V1Beta1 == nil {
out.Deprecated.V1Beta1 = &infrav1.DockerMachineV1Beta1DeprecatedStatus{}
}
out.Deprecated.V1Beta1.Conditions = in.Conditions
clusterv1beta1.Convert_v1beta1_Conditions_To_v1beta2_Deprecated_V1Beta1_Conditions(&in.Conditions, &out.Deprecated.V1Beta1.Conditions)

return nil
}
Expand All @@ -333,7 +333,7 @@ func Convert_v1beta2_DockerMachineStatus_To_v1beta1_DockerMachineStatus(in *infr

// Retrieve legacy conditions (v1beta1) from the deprecated field.
if in.Deprecated != nil && in.Deprecated.V1Beta1 != nil && in.Deprecated.V1Beta1.Conditions != nil {
out.Conditions = in.Deprecated.V1Beta1.Conditions
clusterv1beta1.Convert_v1beta2_Deprecated_V1Beta1_Conditions_To_v1beta1_Conditions(&in.Deprecated.V1Beta1.Conditions, &out.Conditions)
}

// Move new conditions (v1beta2) to the v1beta2 field.
Expand All @@ -348,12 +348,10 @@ func Convert_v1beta2_DockerMachineStatus_To_v1beta1_DockerMachineStatus(in *infr

// Implement local conversion func because conversion-gen is not aware of conversion func in other packages (see https://github.com/kubernetes/code-generator/issues/94)

func Convert_v1beta2_Condition_To_v1_Condition(_ *clusterv1.Condition, _ *metav1.Condition, _ apiconversion.Scope) error {
// NOTE: legacy (v1beta1) conditions should not be automatically converted into v1beta2 conditions.
return nil
func Convert_v1_Condition_To_v1beta1_Condition(in *metav1.Condition, out *clusterv1beta1.Condition, s apiconversion.Scope) error {
return clusterv1beta1.Convert_v1_Condition_To_v1beta1_Condition(in, out, s)
}

func Convert_v1_Condition_To_v1beta2_Condition(_ *metav1.Condition, _ *clusterv1.Condition, _ apiconversion.Scope) error {
// NOTE: v1beta2 conditions should not be automatically converted into legacy (v1beta1) conditions.
return nil
func Convert_v1beta1_Condition_To_v1_Condition(in *clusterv1beta1.Condition, out *metav1.Condition, s apiconversion.Scope) error {
return clusterv1beta1.Convert_v1beta1_Condition_To_v1_Condition(in, out, s)
}
21 changes: 10 additions & 11 deletions test/infrastructure/docker/api/v1beta1/devcluster_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

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

const (
Expand All @@ -35,17 +34,17 @@ const (
const (
// DevClusterReadyV1Beta2Condition is true if
// - The DevCluster's is using a docker backend and LoadBalancerAvailable is true.
DevClusterReadyV1Beta2Condition = clusterv1.ReadyCondition
DevClusterReadyV1Beta2Condition = clusterv1beta1.ReadyV1Beta2Condition

// DevClusterReadyV1Beta2Reason surfaces when the DevCluster readiness criteria is met.
DevClusterReadyV1Beta2Reason = clusterv1.ReadyReason
DevClusterReadyV1Beta2Reason = clusterv1beta1.ReadyV1Beta2Reason

// DevClusterNotReadyV1Beta2Reason surfaces when the DevCluster readiness criteria is not met.
DevClusterNotReadyV1Beta2Reason = clusterv1.NotReadyReason
DevClusterNotReadyV1Beta2Reason = clusterv1beta1.NotReadyV1Beta2Reason

// DevClusterReadyUnknownV1Beta2Reason surfaces when at least one DevCluster readiness criteria is unknown
// and no DevCluster readiness criteria is not met.
DevClusterReadyUnknownV1Beta2Reason = clusterv1.ReadyUnknownReason
DevClusterReadyUnknownV1Beta2Reason = clusterv1beta1.ReadyUnknownV1Beta2Reason
)

// DevCluster's v1Beta2 conditions that apply to the docker backend.
Expand All @@ -58,15 +57,15 @@ const (

// DevClusterDockerLoadBalancerNotAvailableV1Beta2Reason surfaces when the container that implements
// the load balancer for a DevCluster's docker backend is not available.
DevClusterDockerLoadBalancerNotAvailableV1Beta2Reason = clusterv1.NotAvailableReason
DevClusterDockerLoadBalancerNotAvailableV1Beta2Reason = clusterv1beta1.NotAvailableV1Beta2Reason

// DevClusterDockerLoadBalancerAvailableV1Beta2Reason surfaces when the container that implements
// the load balancer for a DevCluster's docker backend is available.
DevClusterDockerLoadBalancerAvailableV1Beta2Reason = clusterv1.AvailableReason
DevClusterDockerLoadBalancerAvailableV1Beta2Reason = clusterv1beta1.AvailableV1Beta2Reason

// DevClusterDockerLoadBalancerDeletingV1Beta2Reason surfaces when the container that implements
// the load balancer for a DevCluster's docker backend is deleting.
DevClusterDockerLoadBalancerDeletingV1Beta2Reason = clusterv1.DeletingReason
DevClusterDockerLoadBalancerDeletingV1Beta2Reason = clusterv1beta1.DeletingV1Beta2Reason
)

// DevClusterSpec defines the desired state of the DevCluster infrastructure.
Expand Down Expand Up @@ -121,7 +120,7 @@ type DevClusterStatus struct {

// conditions defines current service state of the DevCluster.
// +optional
Conditions clusterv1.Conditions `json:"conditions,omitempty"`
Conditions clusterv1beta1.Conditions `json:"conditions,omitempty"`

// v1beta2 groups all the fields that will be added or modified in DevCluster's status with the V1Beta2 version.
// +optional
Expand Down Expand Up @@ -156,12 +155,12 @@ type DevCluster struct {
}

// GetV1Beta1Conditions returns the set of conditions for this object.
func (c *DevCluster) GetV1Beta1Conditions() clusterv1.Conditions {
func (c *DevCluster) GetV1Beta1Conditions() clusterv1beta1.Conditions {
return c.Status.Conditions
}

// SetV1Beta1Conditions sets the conditions on this object.
func (c *DevCluster) SetV1Beta1Conditions(conditions clusterv1.Conditions) {
func (c *DevCluster) SetV1Beta1Conditions(conditions clusterv1beta1.Conditions) {
c.Status.Conditions = conditions
}

Expand Down
Loading