Skip to content

Commit d0a809b

Browse files
fabriziopandinifabriziopandini
authored
⚠️ Swap condition packages (#12086)
* Move v1beta1 conditions utils to deprecated * Move v1beta2 conditions utils top level * Rename methods for conditions Getter and Setter * Adjust variables and function names * Fix E2E
1 parent 2cfe66b commit d0a809b

File tree

168 files changed

+7201
-7155
lines changed

Some content is hidden

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

168 files changed

+7201
-7155
lines changed

‎.golangci.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -183,8 +183,8 @@ linters-settings:
183183
- pkg: sigs.k8s.io/cluster-api/internal/webhooks/runtime
184184
alias: runtimewebhooks
185185
# CAPI utils
186-
- pkg: sigs.k8s.io/cluster-api/util/conditions/v1beta2
187-
alias: v1beta2conditions
186+
- pkg: sigs.k8s.io/cluster-api/util/conditions/deprecated/v1beta1
187+
alias: v1beta1conditions
188188
- pkg: sigs.k8s.io/cluster-api/internal/topology/names
189189
alias: topologynames
190190
# CAPD
@@ -386,4 +386,4 @@ issues:
386386
# Ignore non-constant format string in call to condition utils
387387
- linters:
388388
- govet
389-
text: "non-constant format string in call to sigs\\.k8s\\.io\\/cluster-api\\/util\\/conditions\\."
389+
text: "non-constant format string in call to sigs\\.k8s\\.io\\/cluster-api\\/util\\/conditions\\/deprecated\\/v1beta1\\."

‎api/addons/v1beta2/clusterresourceset_types.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -157,16 +157,16 @@ type ClusterResourceSetV1Beta1DeprecatedStatus struct {
157157

158158
// ANCHOR_END: ClusterResourceSetStatus
159159

160-
// GetConditions returns the set of conditions for this object.
161-
func (m *ClusterResourceSet) GetConditions() clusterv1.Conditions {
160+
// GetV1Beta1Conditions returns the set of conditions for this object.
161+
func (m *ClusterResourceSet) GetV1Beta1Conditions() clusterv1.Conditions {
162162
if m.Status.Deprecated == nil || m.Status.Deprecated.V1Beta1 == nil {
163163
return nil
164164
}
165165
return m.Status.Deprecated.V1Beta1.Conditions
166166
}
167167

168-
// SetConditions sets the conditions on this object.
169-
func (m *ClusterResourceSet) SetConditions(conditions clusterv1.Conditions) {
168+
// SetV1Beta1Conditions sets the conditions on this object.
169+
func (m *ClusterResourceSet) SetV1Beta1Conditions(conditions clusterv1.Conditions) {
170170
if m.Status.Deprecated == nil {
171171
m.Status.Deprecated = &ClusterResourceSetDeprecatedStatus{}
172172
}
@@ -176,13 +176,13 @@ func (m *ClusterResourceSet) SetConditions(conditions clusterv1.Conditions) {
176176
m.Status.Deprecated.V1Beta1.Conditions = conditions
177177
}
178178

179-
// GetV1Beta2Conditions returns the set of conditions for this object.
180-
func (m *ClusterResourceSet) GetV1Beta2Conditions() []metav1.Condition {
179+
// GetConditions returns the set of conditions for this object.
180+
func (m *ClusterResourceSet) GetConditions() []metav1.Condition {
181181
return m.Status.Conditions
182182
}
183183

184-
// SetV1Beta2Conditions sets conditions for an API object.
185-
func (m *ClusterResourceSet) SetV1Beta2Conditions(conditions []metav1.Condition) {
184+
// SetConditions sets conditions for an API object.
185+
func (m *ClusterResourceSet) SetConditions(conditions []metav1.Condition) {
186186
m.Status.Conditions = conditions
187187
}
188188

‎api/v1beta2/cluster_types.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1180,16 +1180,16 @@ func (c *Cluster) GetClassKey() types.NamespacedName {
11801180
return types.NamespacedName{Namespace: namespace, Name: c.Spec.Topology.Class}
11811181
}
11821182

1183-
// GetConditions returns the set of conditions for this object.
1184-
func (c *Cluster) GetConditions() Conditions {
1183+
// GetV1Beta1Conditions returns the set of conditions for this object.
1184+
func (c *Cluster) GetV1Beta1Conditions() Conditions {
11851185
if c.Status.Deprecated == nil || c.Status.Deprecated.V1Beta1 == nil {
11861186
return nil
11871187
}
11881188
return c.Status.Deprecated.V1Beta1.Conditions
11891189
}
11901190

1191-
// SetConditions sets the conditions on this object.
1192-
func (c *Cluster) SetConditions(conditions Conditions) {
1191+
// SetV1Beta1Conditions sets the conditions on this object.
1192+
func (c *Cluster) SetV1Beta1Conditions(conditions Conditions) {
11931193
if c.Status.Deprecated == nil {
11941194
c.Status.Deprecated = &ClusterDeprecatedStatus{}
11951195
}
@@ -1199,13 +1199,13 @@ func (c *Cluster) SetConditions(conditions Conditions) {
11991199
c.Status.Deprecated.V1Beta1.Conditions = conditions
12001200
}
12011201

1202-
// GetV1Beta2Conditions returns the set of conditions for this object.
1203-
func (c *Cluster) GetV1Beta2Conditions() []metav1.Condition {
1202+
// GetConditions returns the set of conditions for this object.
1203+
func (c *Cluster) GetConditions() []metav1.Condition {
12041204
return c.Status.Conditions
12051205
}
12061206

1207-
// SetV1Beta2Conditions sets conditions for an API object.
1208-
func (c *Cluster) SetV1Beta2Conditions(conditions []metav1.Condition) {
1207+
// SetConditions sets conditions for an API object.
1208+
func (c *Cluster) SetConditions(conditions []metav1.Condition) {
12091209
c.Status.Conditions = conditions
12101210
}
12111211

‎api/v1beta2/clusterclass_types.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1230,16 +1230,16 @@ type ClusterClassStatusVariableDefinition struct {
12301230
Schema VariableSchema `json:"schema"`
12311231
}
12321232

1233-
// GetConditions returns the set of conditions for this object.
1234-
func (c *ClusterClass) GetConditions() Conditions {
1233+
// GetV1Beta1Conditions returns the set of conditions for this object.
1234+
func (c *ClusterClass) GetV1Beta1Conditions() Conditions {
12351235
if c.Status.Deprecated == nil || c.Status.Deprecated.V1Beta1 == nil {
12361236
return nil
12371237
}
12381238
return c.Status.Deprecated.V1Beta1.Conditions
12391239
}
12401240

1241-
// SetConditions sets the conditions on this object.
1242-
func (c *ClusterClass) SetConditions(conditions Conditions) {
1241+
// SetV1Beta1Conditions sets the conditions on this object.
1242+
func (c *ClusterClass) SetV1Beta1Conditions(conditions Conditions) {
12431243
if c.Status.Deprecated == nil {
12441244
c.Status.Deprecated = &ClusterClassDeprecatedStatus{}
12451245
}
@@ -1249,13 +1249,13 @@ func (c *ClusterClass) SetConditions(conditions Conditions) {
12491249
c.Status.Deprecated.V1Beta1.Conditions = conditions
12501250
}
12511251

1252-
// GetV1Beta2Conditions returns the set of conditions for this object.
1253-
func (c *ClusterClass) GetV1Beta2Conditions() []metav1.Condition {
1252+
// GetConditions returns the set of conditions for this object.
1253+
func (c *ClusterClass) GetConditions() []metav1.Condition {
12541254
return c.Status.Conditions
12551255
}
12561256

1257-
// SetV1Beta2Conditions sets conditions for an API object.
1258-
func (c *ClusterClass) SetV1Beta2Conditions(conditions []metav1.Condition) {
1257+
// SetConditions sets conditions for an API object.
1258+
func (c *ClusterClass) SetConditions(conditions []metav1.Condition) {
12591259
c.Status.Conditions = conditions
12601260
}
12611261

‎api/v1beta2/machine_types.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -717,16 +717,16 @@ type Machine struct {
717717
Status MachineStatus `json:"status,omitempty"`
718718
}
719719

720-
// GetConditions returns the set of conditions for this object.
721-
func (m *Machine) GetConditions() Conditions {
720+
// GetV1Beta1Conditions returns the set of conditions for this object.
721+
func (m *Machine) GetV1Beta1Conditions() Conditions {
722722
if m.Status.Deprecated == nil || m.Status.Deprecated.V1Beta1 == nil {
723723
return nil
724724
}
725725
return m.Status.Deprecated.V1Beta1.Conditions
726726
}
727727

728-
// SetConditions sets the conditions on this object.
729-
func (m *Machine) SetConditions(conditions Conditions) {
728+
// SetV1Beta1Conditions sets the conditions on this object.
729+
func (m *Machine) SetV1Beta1Conditions(conditions Conditions) {
730730
if m.Status.Deprecated == nil {
731731
m.Status.Deprecated = &MachineDeprecatedStatus{}
732732
}
@@ -736,13 +736,13 @@ func (m *Machine) SetConditions(conditions Conditions) {
736736
m.Status.Deprecated.V1Beta1.Conditions = conditions
737737
}
738738

739-
// GetV1Beta2Conditions returns the set of conditions for this object.
740-
func (m *Machine) GetV1Beta2Conditions() []metav1.Condition {
739+
// GetConditions returns the set of conditions for this object.
740+
func (m *Machine) GetConditions() []metav1.Condition {
741741
return m.Status.Conditions
742742
}
743743

744-
// SetV1Beta2Conditions sets conditions for an API object.
745-
func (m *Machine) SetV1Beta2Conditions(conditions []metav1.Condition) {
744+
// SetConditions sets conditions for an API object.
745+
func (m *Machine) SetConditions(conditions []metav1.Condition) {
746746
m.Status.Conditions = conditions
747747
}
748748

‎api/v1beta2/machinedeployment_types.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -641,16 +641,16 @@ func init() {
641641
objectTypes = append(objectTypes, &MachineDeployment{}, &MachineDeploymentList{})
642642
}
643643

644-
// GetConditions returns the set of conditions for the machinedeployment.
645-
func (m *MachineDeployment) GetConditions() Conditions {
644+
// GetV1Beta1Conditions returns the set of conditions for the machinedeployment.
645+
func (m *MachineDeployment) GetV1Beta1Conditions() Conditions {
646646
if m.Status.Deprecated == nil || m.Status.Deprecated.V1Beta1 == nil {
647647
return nil
648648
}
649649
return m.Status.Deprecated.V1Beta1.Conditions
650650
}
651651

652-
// SetConditions updates the set of conditions on the machinedeployment.
653-
func (m *MachineDeployment) SetConditions(conditions Conditions) {
652+
// SetV1Beta1Conditions updates the set of conditions on the machinedeployment.
653+
func (m *MachineDeployment) SetV1Beta1Conditions(conditions Conditions) {
654654
if m.Status.Deprecated == nil {
655655
m.Status.Deprecated = &MachineDeploymentDeprecatedStatus{}
656656
}
@@ -660,12 +660,12 @@ func (m *MachineDeployment) SetConditions(conditions Conditions) {
660660
m.Status.Deprecated.V1Beta1.Conditions = conditions
661661
}
662662

663-
// GetV1Beta2Conditions returns the set of conditions for this object.
664-
func (m *MachineDeployment) GetV1Beta2Conditions() []metav1.Condition {
663+
// GetConditions returns the set of conditions for this object.
664+
func (m *MachineDeployment) GetConditions() []metav1.Condition {
665665
return m.Status.Conditions
666666
}
667667

668-
// SetV1Beta2Conditions sets conditions for an API object.
669-
func (m *MachineDeployment) SetV1Beta2Conditions(conditions []metav1.Condition) {
668+
// SetConditions sets conditions for an API object.
669+
func (m *MachineDeployment) SetConditions(conditions []metav1.Condition) {
670670
m.Status.Conditions = conditions
671671
}

‎api/v1beta2/machinehealthcheck_types.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -240,16 +240,16 @@ type MachineHealthCheck struct {
240240
Status MachineHealthCheckStatus `json:"status,omitempty"`
241241
}
242242

243-
// GetConditions returns the set of conditions for this object.
244-
func (m *MachineHealthCheck) GetConditions() Conditions {
243+
// GetV1Beta1Conditions returns the set of conditions for this object.
244+
func (m *MachineHealthCheck) GetV1Beta1Conditions() Conditions {
245245
if m.Status.Deprecated == nil || m.Status.Deprecated.V1Beta1 == nil {
246246
return nil
247247
}
248248
return m.Status.Deprecated.V1Beta1.Conditions
249249
}
250250

251-
// SetConditions sets the conditions on this object.
252-
func (m *MachineHealthCheck) SetConditions(conditions Conditions) {
251+
// SetV1Beta1Conditions sets the conditions on this object.
252+
func (m *MachineHealthCheck) SetV1Beta1Conditions(conditions Conditions) {
253253
if m.Status.Deprecated == nil {
254254
m.Status.Deprecated = &MachineHealthCheckDeprecatedStatus{}
255255
}
@@ -259,13 +259,13 @@ func (m *MachineHealthCheck) SetConditions(conditions Conditions) {
259259
m.Status.Deprecated.V1Beta1.Conditions = conditions
260260
}
261261

262-
// GetV1Beta2Conditions returns the set of conditions for this object.
263-
func (m *MachineHealthCheck) GetV1Beta2Conditions() []metav1.Condition {
262+
// GetConditions returns the set of conditions for this object.
263+
func (m *MachineHealthCheck) GetConditions() []metav1.Condition {
264264
return m.Status.Conditions
265265
}
266266

267-
// SetV1Beta2Conditions sets conditions for an API object.
268-
func (m *MachineHealthCheck) SetV1Beta2Conditions(conditions []metav1.Condition) {
267+
// SetConditions sets conditions for an API object.
268+
func (m *MachineHealthCheck) SetConditions(conditions []metav1.Condition) {
269269
m.Status.Conditions = conditions
270270
}
271271

‎api/v1beta2/machineset_types.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -457,16 +457,16 @@ type MachineSet struct {
457457
Status MachineSetStatus `json:"status,omitempty"`
458458
}
459459

460-
// GetConditions returns the set of conditions for the MachineSet.
461-
func (m *MachineSet) GetConditions() Conditions {
460+
// GetV1Beta1Conditions returns the set of conditions for the MachineSet.
461+
func (m *MachineSet) GetV1Beta1Conditions() Conditions {
462462
if m.Status.Deprecated == nil || m.Status.Deprecated.V1Beta1 == nil {
463463
return nil
464464
}
465465
return m.Status.Deprecated.V1Beta1.Conditions
466466
}
467467

468-
// SetConditions updates the set of conditions on the MachineSet.
469-
func (m *MachineSet) SetConditions(conditions Conditions) {
468+
// SetV1Beta1Conditions updates the set of conditions on the MachineSet.
469+
func (m *MachineSet) SetV1Beta1Conditions(conditions Conditions) {
470470
if m.Status.Deprecated == nil {
471471
m.Status.Deprecated = &MachineSetDeprecatedStatus{}
472472
}
@@ -476,13 +476,13 @@ func (m *MachineSet) SetConditions(conditions Conditions) {
476476
m.Status.Deprecated.V1Beta1.Conditions = conditions
477477
}
478478

479-
// GetV1Beta2Conditions returns the set of conditions for this object.
480-
func (m *MachineSet) GetV1Beta2Conditions() []metav1.Condition {
479+
// GetConditions returns the set of conditions for this object.
480+
func (m *MachineSet) GetConditions() []metav1.Condition {
481481
return m.Status.Conditions
482482
}
483483

484-
// SetV1Beta2Conditions sets conditions for an API object.
485-
func (m *MachineSet) SetV1Beta2Conditions(conditions []metav1.Condition) {
484+
// SetConditions sets conditions for an API object.
485+
func (m *MachineSet) SetConditions(conditions []metav1.Condition) {
486486
m.Status.Conditions = conditions
487487
}
488488

‎bootstrap/kubeadm/api/v1beta2/kubeadmconfig_types.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -539,16 +539,16 @@ type KubeadmConfig struct {
539539
Status KubeadmConfigStatus `json:"status,omitempty"`
540540
}
541541

542-
// GetConditions returns the set of conditions for this object.
543-
func (c *KubeadmConfig) GetConditions() clusterv1.Conditions {
542+
// GetV1Beta1Conditions returns the set of conditions for this object.
543+
func (c *KubeadmConfig) GetV1Beta1Conditions() clusterv1.Conditions {
544544
if c.Status.Deprecated == nil || c.Status.Deprecated.V1Beta1 == nil {
545545
return nil
546546
}
547547
return c.Status.Deprecated.V1Beta1.Conditions
548548
}
549549

550-
// SetConditions sets the conditions on this object.
551-
func (c *KubeadmConfig) SetConditions(conditions clusterv1.Conditions) {
550+
// SetV1Beta1Conditions sets the conditions on this object.
551+
func (c *KubeadmConfig) SetV1Beta1Conditions(conditions clusterv1.Conditions) {
552552
if c.Status.Deprecated == nil {
553553
c.Status.Deprecated = &KubeadmConfigDeprecatedStatus{}
554554
}
@@ -558,13 +558,13 @@ func (c *KubeadmConfig) SetConditions(conditions clusterv1.Conditions) {
558558
c.Status.Deprecated.V1Beta1.Conditions = conditions
559559
}
560560

561-
// GetV1Beta2Conditions returns the set of conditions for this object.
562-
func (c *KubeadmConfig) GetV1Beta2Conditions() []metav1.Condition {
561+
// GetConditions returns the set of conditions for this object.
562+
func (c *KubeadmConfig) GetConditions() []metav1.Condition {
563563
return c.Status.Conditions
564564
}
565565

566-
// SetV1Beta2Conditions sets conditions for an API object.
567-
func (c *KubeadmConfig) SetV1Beta2Conditions(conditions []metav1.Condition) {
566+
// SetConditions sets conditions for an API object.
567+
func (c *KubeadmConfig) SetConditions(conditions []metav1.Condition) {
568568
c.Status.Conditions = conditions
569569
}
570570

0 commit comments

Comments
 (0)