Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -183,8 +183,8 @@ linters-settings:
- pkg: sigs.k8s.io/cluster-api/internal/webhooks/runtime
alias: runtimewebhooks
# CAPI utils
- pkg: sigs.k8s.io/cluster-api/util/conditions/v1beta2
alias: v1beta2conditions
- pkg: sigs.k8s.io/cluster-api/util/conditions/deprecated/v1beta1
alias: v1beta1conditions
- pkg: sigs.k8s.io/cluster-api/internal/topology/names
alias: topologynames
# CAPD
Expand Down Expand Up @@ -386,4 +386,4 @@ issues:
# Ignore non-constant format string in call to condition utils
- linters:
- govet
text: "non-constant format string in call to sigs\\.k8s\\.io\\/cluster-api\\/util\\/conditions\\."
text: "non-constant format string in call to sigs\\.k8s\\.io\\/cluster-api\\/util\\/conditions\\/deprecated\\/v1beta1\\."
16 changes: 8 additions & 8 deletions api/addons/v1beta2/clusterresourceset_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -157,16 +157,16 @@ type ClusterResourceSetV1Beta1DeprecatedStatus struct {

// ANCHOR_END: ClusterResourceSetStatus

// GetConditions returns the set of conditions for this object.
func (m *ClusterResourceSet) GetConditions() clusterv1.Conditions {
// GetV1Beta1Conditions returns the set of conditions for this object.
func (m *ClusterResourceSet) GetV1Beta1Conditions() clusterv1.Conditions {
if m.Status.Deprecated == nil || m.Status.Deprecated.V1Beta1 == nil {
return nil
}
return m.Status.Deprecated.V1Beta1.Conditions
}

// SetConditions sets the conditions on this object.
func (m *ClusterResourceSet) SetConditions(conditions clusterv1.Conditions) {
// SetV1Beta1Conditions sets the conditions on this object.
func (m *ClusterResourceSet) SetV1Beta1Conditions(conditions clusterv1.Conditions) {
if m.Status.Deprecated == nil {
m.Status.Deprecated = &ClusterResourceSetDeprecatedStatus{}
}
Expand All @@ -176,13 +176,13 @@ func (m *ClusterResourceSet) SetConditions(conditions clusterv1.Conditions) {
m.Status.Deprecated.V1Beta1.Conditions = conditions
}

// GetV1Beta2Conditions returns the set of conditions for this object.
func (m *ClusterResourceSet) GetV1Beta2Conditions() []metav1.Condition {
// GetConditions returns the set of conditions for this object.
func (m *ClusterResourceSet) GetConditions() []metav1.Condition {
return m.Status.Conditions
}

// SetV1Beta2Conditions sets conditions for an API object.
func (m *ClusterResourceSet) SetV1Beta2Conditions(conditions []metav1.Condition) {
// SetConditions sets conditions for an API object.
func (m *ClusterResourceSet) SetConditions(conditions []metav1.Condition) {
m.Status.Conditions = conditions
}

Expand Down
16 changes: 8 additions & 8 deletions api/v1beta2/cluster_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -1180,16 +1180,16 @@ func (c *Cluster) GetClassKey() types.NamespacedName {
return types.NamespacedName{Namespace: namespace, Name: c.Spec.Topology.Class}
}

// GetConditions returns the set of conditions for this object.
func (c *Cluster) GetConditions() Conditions {
// GetV1Beta1Conditions returns the set of conditions for this object.
func (c *Cluster) GetV1Beta1Conditions() Conditions {
if c.Status.Deprecated == nil || c.Status.Deprecated.V1Beta1 == nil {
return nil
}
return c.Status.Deprecated.V1Beta1.Conditions
}

// SetConditions sets the conditions on this object.
func (c *Cluster) SetConditions(conditions Conditions) {
// SetV1Beta1Conditions sets the conditions on this object.
func (c *Cluster) SetV1Beta1Conditions(conditions Conditions) {
if c.Status.Deprecated == nil {
c.Status.Deprecated = &ClusterDeprecatedStatus{}
}
Expand All @@ -1199,13 +1199,13 @@ func (c *Cluster) SetConditions(conditions Conditions) {
c.Status.Deprecated.V1Beta1.Conditions = conditions
}

// GetV1Beta2Conditions returns the set of conditions for this object.
func (c *Cluster) GetV1Beta2Conditions() []metav1.Condition {
// GetConditions returns the set of conditions for this object.
func (c *Cluster) GetConditions() []metav1.Condition {
return c.Status.Conditions
}

// SetV1Beta2Conditions sets conditions for an API object.
func (c *Cluster) SetV1Beta2Conditions(conditions []metav1.Condition) {
// SetConditions sets conditions for an API object.
func (c *Cluster) SetConditions(conditions []metav1.Condition) {
c.Status.Conditions = conditions
}

Expand Down
16 changes: 8 additions & 8 deletions api/v1beta2/clusterclass_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -1230,16 +1230,16 @@ type ClusterClassStatusVariableDefinition struct {
Schema VariableSchema `json:"schema"`
}

// GetConditions returns the set of conditions for this object.
func (c *ClusterClass) GetConditions() Conditions {
// GetV1Beta1Conditions returns the set of conditions for this object.
func (c *ClusterClass) GetV1Beta1Conditions() Conditions {
if c.Status.Deprecated == nil || c.Status.Deprecated.V1Beta1 == nil {
return nil
}
return c.Status.Deprecated.V1Beta1.Conditions
}

// SetConditions sets the conditions on this object.
func (c *ClusterClass) SetConditions(conditions Conditions) {
// SetV1Beta1Conditions sets the conditions on this object.
func (c *ClusterClass) SetV1Beta1Conditions(conditions Conditions) {
if c.Status.Deprecated == nil {
c.Status.Deprecated = &ClusterClassDeprecatedStatus{}
}
Expand All @@ -1249,13 +1249,13 @@ func (c *ClusterClass) SetConditions(conditions Conditions) {
c.Status.Deprecated.V1Beta1.Conditions = conditions
}

// GetV1Beta2Conditions returns the set of conditions for this object.
func (c *ClusterClass) GetV1Beta2Conditions() []metav1.Condition {
// GetConditions returns the set of conditions for this object.
func (c *ClusterClass) GetConditions() []metav1.Condition {
return c.Status.Conditions
}

// SetV1Beta2Conditions sets conditions for an API object.
func (c *ClusterClass) SetV1Beta2Conditions(conditions []metav1.Condition) {
// SetConditions sets conditions for an API object.
func (c *ClusterClass) SetConditions(conditions []metav1.Condition) {
c.Status.Conditions = conditions
}

Expand Down
16 changes: 8 additions & 8 deletions api/v1beta2/machine_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -717,16 +717,16 @@ type Machine struct {
Status MachineStatus `json:"status,omitempty"`
}

// GetConditions returns the set of conditions for this object.
func (m *Machine) GetConditions() Conditions {
// GetV1Beta1Conditions returns the set of conditions for this object.
func (m *Machine) GetV1Beta1Conditions() Conditions {
if m.Status.Deprecated == nil || m.Status.Deprecated.V1Beta1 == nil {
return nil
}
return m.Status.Deprecated.V1Beta1.Conditions
}

// SetConditions sets the conditions on this object.
func (m *Machine) SetConditions(conditions Conditions) {
// SetV1Beta1Conditions sets the conditions on this object.
func (m *Machine) SetV1Beta1Conditions(conditions Conditions) {
if m.Status.Deprecated == nil {
m.Status.Deprecated = &MachineDeprecatedStatus{}
}
Expand All @@ -736,13 +736,13 @@ func (m *Machine) SetConditions(conditions Conditions) {
m.Status.Deprecated.V1Beta1.Conditions = conditions
}

// GetV1Beta2Conditions returns the set of conditions for this object.
func (m *Machine) GetV1Beta2Conditions() []metav1.Condition {
// GetConditions returns the set of conditions for this object.
func (m *Machine) GetConditions() []metav1.Condition {
return m.Status.Conditions
}

// SetV1Beta2Conditions sets conditions for an API object.
func (m *Machine) SetV1Beta2Conditions(conditions []metav1.Condition) {
// SetConditions sets conditions for an API object.
func (m *Machine) SetConditions(conditions []metav1.Condition) {
m.Status.Conditions = conditions
}

Expand Down
16 changes: 8 additions & 8 deletions api/v1beta2/machinedeployment_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -641,16 +641,16 @@ func init() {
objectTypes = append(objectTypes, &MachineDeployment{}, &MachineDeploymentList{})
}

// GetConditions returns the set of conditions for the machinedeployment.
func (m *MachineDeployment) GetConditions() Conditions {
// GetV1Beta1Conditions returns the set of conditions for the machinedeployment.
func (m *MachineDeployment) GetV1Beta1Conditions() Conditions {
if m.Status.Deprecated == nil || m.Status.Deprecated.V1Beta1 == nil {
return nil
}
return m.Status.Deprecated.V1Beta1.Conditions
}

// SetConditions updates the set of conditions on the machinedeployment.
func (m *MachineDeployment) SetConditions(conditions Conditions) {
// SetV1Beta1Conditions updates the set of conditions on the machinedeployment.
func (m *MachineDeployment) SetV1Beta1Conditions(conditions Conditions) {
if m.Status.Deprecated == nil {
m.Status.Deprecated = &MachineDeploymentDeprecatedStatus{}
}
Expand All @@ -660,12 +660,12 @@ func (m *MachineDeployment) SetConditions(conditions Conditions) {
m.Status.Deprecated.V1Beta1.Conditions = conditions
}

// GetV1Beta2Conditions returns the set of conditions for this object.
func (m *MachineDeployment) GetV1Beta2Conditions() []metav1.Condition {
// GetConditions returns the set of conditions for this object.
func (m *MachineDeployment) GetConditions() []metav1.Condition {
return m.Status.Conditions
}

// SetV1Beta2Conditions sets conditions for an API object.
func (m *MachineDeployment) SetV1Beta2Conditions(conditions []metav1.Condition) {
// SetConditions sets conditions for an API object.
func (m *MachineDeployment) SetConditions(conditions []metav1.Condition) {
m.Status.Conditions = conditions
}
16 changes: 8 additions & 8 deletions api/v1beta2/machinehealthcheck_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -240,16 +240,16 @@ type MachineHealthCheck struct {
Status MachineHealthCheckStatus `json:"status,omitempty"`
}

// GetConditions returns the set of conditions for this object.
func (m *MachineHealthCheck) GetConditions() Conditions {
// GetV1Beta1Conditions returns the set of conditions for this object.
func (m *MachineHealthCheck) GetV1Beta1Conditions() Conditions {
if m.Status.Deprecated == nil || m.Status.Deprecated.V1Beta1 == nil {
return nil
}
return m.Status.Deprecated.V1Beta1.Conditions
}

// SetConditions sets the conditions on this object.
func (m *MachineHealthCheck) SetConditions(conditions Conditions) {
// SetV1Beta1Conditions sets the conditions on this object.
func (m *MachineHealthCheck) SetV1Beta1Conditions(conditions Conditions) {
if m.Status.Deprecated == nil {
m.Status.Deprecated = &MachineHealthCheckDeprecatedStatus{}
}
Expand All @@ -259,13 +259,13 @@ func (m *MachineHealthCheck) SetConditions(conditions Conditions) {
m.Status.Deprecated.V1Beta1.Conditions = conditions
}

// GetV1Beta2Conditions returns the set of conditions for this object.
func (m *MachineHealthCheck) GetV1Beta2Conditions() []metav1.Condition {
// GetConditions returns the set of conditions for this object.
func (m *MachineHealthCheck) GetConditions() []metav1.Condition {
return m.Status.Conditions
}

// SetV1Beta2Conditions sets conditions for an API object.
func (m *MachineHealthCheck) SetV1Beta2Conditions(conditions []metav1.Condition) {
// SetConditions sets conditions for an API object.
func (m *MachineHealthCheck) SetConditions(conditions []metav1.Condition) {
m.Status.Conditions = conditions
}

Expand Down
16 changes: 8 additions & 8 deletions api/v1beta2/machineset_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -457,16 +457,16 @@ type MachineSet struct {
Status MachineSetStatus `json:"status,omitempty"`
}

// GetConditions returns the set of conditions for the MachineSet.
func (m *MachineSet) GetConditions() Conditions {
// GetV1Beta1Conditions returns the set of conditions for the MachineSet.
func (m *MachineSet) GetV1Beta1Conditions() Conditions {
if m.Status.Deprecated == nil || m.Status.Deprecated.V1Beta1 == nil {
return nil
}
return m.Status.Deprecated.V1Beta1.Conditions
}

// SetConditions updates the set of conditions on the MachineSet.
func (m *MachineSet) SetConditions(conditions Conditions) {
// SetV1Beta1Conditions updates the set of conditions on the MachineSet.
func (m *MachineSet) SetV1Beta1Conditions(conditions Conditions) {
if m.Status.Deprecated == nil {
m.Status.Deprecated = &MachineSetDeprecatedStatus{}
}
Expand All @@ -476,13 +476,13 @@ func (m *MachineSet) SetConditions(conditions Conditions) {
m.Status.Deprecated.V1Beta1.Conditions = conditions
}

// GetV1Beta2Conditions returns the set of conditions for this object.
func (m *MachineSet) GetV1Beta2Conditions() []metav1.Condition {
// GetConditions returns the set of conditions for this object.
func (m *MachineSet) GetConditions() []metav1.Condition {
return m.Status.Conditions
}

// SetV1Beta2Conditions sets conditions for an API object.
func (m *MachineSet) SetV1Beta2Conditions(conditions []metav1.Condition) {
// SetConditions sets conditions for an API object.
func (m *MachineSet) SetConditions(conditions []metav1.Condition) {
m.Status.Conditions = conditions
}

Expand Down
16 changes: 8 additions & 8 deletions bootstrap/kubeadm/api/v1beta2/kubeadmconfig_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -539,16 +539,16 @@ type KubeadmConfig struct {
Status KubeadmConfigStatus `json:"status,omitempty"`
}

// GetConditions returns the set of conditions for this object.
func (c *KubeadmConfig) GetConditions() clusterv1.Conditions {
// GetV1Beta1Conditions returns the set of conditions for this object.
func (c *KubeadmConfig) GetV1Beta1Conditions() clusterv1.Conditions {
if c.Status.Deprecated == nil || c.Status.Deprecated.V1Beta1 == nil {
return nil
}
return c.Status.Deprecated.V1Beta1.Conditions
}

// SetConditions sets the conditions on this object.
func (c *KubeadmConfig) SetConditions(conditions clusterv1.Conditions) {
// SetV1Beta1Conditions sets the conditions on this object.
func (c *KubeadmConfig) SetV1Beta1Conditions(conditions clusterv1.Conditions) {
if c.Status.Deprecated == nil {
c.Status.Deprecated = &KubeadmConfigDeprecatedStatus{}
}
Expand All @@ -558,13 +558,13 @@ func (c *KubeadmConfig) SetConditions(conditions clusterv1.Conditions) {
c.Status.Deprecated.V1Beta1.Conditions = conditions
}

// GetV1Beta2Conditions returns the set of conditions for this object.
func (c *KubeadmConfig) GetV1Beta2Conditions() []metav1.Condition {
// GetConditions returns the set of conditions for this object.
func (c *KubeadmConfig) GetConditions() []metav1.Condition {
return c.Status.Conditions
}

// SetV1Beta2Conditions sets conditions for an API object.
func (c *KubeadmConfig) SetV1Beta2Conditions(conditions []metav1.Condition) {
// SetConditions sets conditions for an API object.
func (c *KubeadmConfig) SetConditions(conditions []metav1.Condition) {
c.Status.Conditions = conditions
}

Expand Down
Loading