Skip to content

Commit 2ebc80d

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #12405 from sbueringer/pr-capd-v1beta1-imports
🌱 Ensure CAPD v1beta1 API package only imports core v1beta1
2 parents f2b8172 + d354538 commit 2ebc80d

13 files changed

+137
-118
lines changed

‎test/infrastructure/docker/api/v1beta1/condition_consts.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ limitations under the License.
1717
package v1beta1
1818

1919
import (
20-
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
20+
clusterv1beta1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
2121
)
2222

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

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

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

8383
// LoadBalancerProvisioningFailedReason (Severity=Warning) documents a DockerCluster controller detecting
8484
// an error while provisioning the container that provides the cluster load balancer.; those kind of

‎test/infrastructure/docker/api/v1beta1/conversion.go

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ func Convert_v1beta1_DevClusterStatus_To_v1beta2_DevClusterStatus(in *DevCluster
155155
if out.Deprecated.V1Beta1 == nil {
156156
out.Deprecated.V1Beta1 = &infrav1.DevClusterV1Beta1DeprecatedStatus{}
157157
}
158-
out.Deprecated.V1Beta1.Conditions = in.Conditions
158+
clusterv1beta1.Convert_v1beta1_Conditions_To_v1beta2_Deprecated_V1Beta1_Conditions(&in.Conditions, &out.Deprecated.V1Beta1.Conditions)
159159

160160
return nil
161161
}
@@ -171,7 +171,7 @@ func Convert_v1beta2_DevClusterStatus_To_v1beta1_DevClusterStatus(in *infrav1.De
171171

172172
// Retrieve legacy conditions (v1beta1) from the deprecated field.
173173
if in.Deprecated != nil && in.Deprecated.V1Beta1 != nil && in.Deprecated.V1Beta1.Conditions != nil {
174-
out.Conditions = in.Deprecated.V1Beta1.Conditions
174+
clusterv1beta1.Convert_v1beta2_Deprecated_V1Beta1_Conditions_To_v1beta1_Conditions(&in.Deprecated.V1Beta1.Conditions, &out.Conditions)
175175
}
176176

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

214214
return nil
215215
}
@@ -225,7 +225,7 @@ func Convert_v1beta2_DevMachineStatus_To_v1beta1_DevMachineStatus(in *infrav1.De
225225

226226
// Retrieve legacy conditions (v1beta1) from the deprecated field.
227227
if in.Deprecated != nil && in.Deprecated.V1Beta1 != nil && in.Deprecated.V1Beta1.Conditions != nil {
228-
out.Conditions = in.Deprecated.V1Beta1.Conditions
228+
clusterv1beta1.Convert_v1beta2_Deprecated_V1Beta1_Conditions_To_v1beta1_Conditions(&in.Deprecated.V1Beta1.Conditions, &out.Conditions)
229229
}
230230

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

268268
return nil
269269
}
@@ -279,7 +279,7 @@ func Convert_v1beta2_DockerClusterStatus_To_v1beta1_DockerClusterStatus(in *infr
279279

280280
// Retrieve legacy conditions (v1beta1) from the deprecated field.
281281
if in.Deprecated != nil && in.Deprecated.V1Beta1 != nil && in.Deprecated.V1Beta1.Conditions != nil {
282-
out.Conditions = in.Deprecated.V1Beta1.Conditions
282+
clusterv1beta1.Convert_v1beta2_Deprecated_V1Beta1_Conditions_To_v1beta1_Conditions(&in.Deprecated.V1Beta1.Conditions, &out.Conditions)
283283
}
284284

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

322322
return nil
323323
}
@@ -333,7 +333,7 @@ func Convert_v1beta2_DockerMachineStatus_To_v1beta1_DockerMachineStatus(in *infr
333333

334334
// Retrieve legacy conditions (v1beta1) from the deprecated field.
335335
if in.Deprecated != nil && in.Deprecated.V1Beta1 != nil && in.Deprecated.V1Beta1.Conditions != nil {
336-
out.Conditions = in.Deprecated.V1Beta1.Conditions
336+
clusterv1beta1.Convert_v1beta2_Deprecated_V1Beta1_Conditions_To_v1beta1_Conditions(&in.Deprecated.V1Beta1.Conditions, &out.Conditions)
337337
}
338338

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

349349
// 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)
350350

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

356-
func Convert_v1_Condition_To_v1beta2_Condition(_ *metav1.Condition, _ *clusterv1.Condition, _ apiconversion.Scope) error {
357-
// NOTE: v1beta2 conditions should not be automatically converted into legacy (v1beta1) conditions.
358-
return nil
355+
func Convert_v1beta1_Condition_To_v1_Condition(in *clusterv1beta1.Condition, out *metav1.Condition, s apiconversion.Scope) error {
356+
return clusterv1beta1.Convert_v1beta1_Condition_To_v1_Condition(in, out, s)
359357
}

‎test/infrastructure/docker/api/v1beta1/devcluster_types.go

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import (
2020
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2121

2222
clusterv1beta1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
23-
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
2423
)
2524

2625
const (
@@ -35,17 +34,17 @@ const (
3534
const (
3635
// DevClusterReadyV1Beta2Condition is true if
3736
// - The DevCluster's is using a docker backend and LoadBalancerAvailable is true.
38-
DevClusterReadyV1Beta2Condition = clusterv1.ReadyCondition
37+
DevClusterReadyV1Beta2Condition = clusterv1beta1.ReadyV1Beta2Condition
3938

4039
// DevClusterReadyV1Beta2Reason surfaces when the DevCluster readiness criteria is met.
41-
DevClusterReadyV1Beta2Reason = clusterv1.ReadyReason
40+
DevClusterReadyV1Beta2Reason = clusterv1beta1.ReadyV1Beta2Reason
4241

4342
// DevClusterNotReadyV1Beta2Reason surfaces when the DevCluster readiness criteria is not met.
44-
DevClusterNotReadyV1Beta2Reason = clusterv1.NotReadyReason
43+
DevClusterNotReadyV1Beta2Reason = clusterv1beta1.NotReadyV1Beta2Reason
4544

4645
// DevClusterReadyUnknownV1Beta2Reason surfaces when at least one DevCluster readiness criteria is unknown
4746
// and no DevCluster readiness criteria is not met.
48-
DevClusterReadyUnknownV1Beta2Reason = clusterv1.ReadyUnknownReason
47+
DevClusterReadyUnknownV1Beta2Reason = clusterv1beta1.ReadyUnknownV1Beta2Reason
4948
)
5049

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

5958
// DevClusterDockerLoadBalancerNotAvailableV1Beta2Reason surfaces when the container that implements
6059
// the load balancer for a DevCluster's docker backend is not available.
61-
DevClusterDockerLoadBalancerNotAvailableV1Beta2Reason = clusterv1.NotAvailableReason
60+
DevClusterDockerLoadBalancerNotAvailableV1Beta2Reason = clusterv1beta1.NotAvailableV1Beta2Reason
6261

6362
// DevClusterDockerLoadBalancerAvailableV1Beta2Reason surfaces when the container that implements
6463
// the load balancer for a DevCluster's docker backend is available.
65-
DevClusterDockerLoadBalancerAvailableV1Beta2Reason = clusterv1.AvailableReason
64+
DevClusterDockerLoadBalancerAvailableV1Beta2Reason = clusterv1beta1.AvailableV1Beta2Reason
6665

6766
// DevClusterDockerLoadBalancerDeletingV1Beta2Reason surfaces when the container that implements
6867
// the load balancer for a DevCluster's docker backend is deleting.
69-
DevClusterDockerLoadBalancerDeletingV1Beta2Reason = clusterv1.DeletingReason
68+
DevClusterDockerLoadBalancerDeletingV1Beta2Reason = clusterv1beta1.DeletingV1Beta2Reason
7069
)
7170

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

122121
// conditions defines current service state of the DevCluster.
123122
// +optional
124-
Conditions clusterv1.Conditions `json:"conditions,omitempty"`
123+
Conditions clusterv1beta1.Conditions `json:"conditions,omitempty"`
125124

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

158157
// GetV1Beta1Conditions returns the set of conditions for this object.
159-
func (c *DevCluster) GetV1Beta1Conditions() clusterv1.Conditions {
158+
func (c *DevCluster) GetV1Beta1Conditions() clusterv1beta1.Conditions {
160159
return c.Status.Conditions
161160
}
162161

163162
// SetV1Beta1Conditions sets the conditions on this object.
164-
func (c *DevCluster) SetV1Beta1Conditions(conditions clusterv1.Conditions) {
163+
func (c *DevCluster) SetV1Beta1Conditions(conditions clusterv1beta1.Conditions) {
165164
c.Status.Conditions = conditions
166165
}
167166

0 commit comments

Comments
 (0)