Skip to content

Commit 8ec1d0b

Browse files
rebase #5720
1 parent ffdf7db commit 8ec1d0b

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

api/v1beta1/zz_generated.conversion.go

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

api/v1beta2/awsmachinetemplate_types.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ type AWSMachineTemplateStatus struct {
7575

7676
// Conditions defines current service state of the AWSMachineTemplate.
7777
// +optional
78-
Conditions clusterv1.Conditions `json:"conditions,omitempty"`
78+
Conditions clusterv1beta1.Conditions `json:"conditions,omitempty"`
7979
}
8080

8181
// AWSMachineTemplateSpec defines the desired state of AWSMachineTemplate.
@@ -119,12 +119,12 @@ type AWSMachineTemplateResource struct {
119119
}
120120

121121
// GetConditions returns the observations of the operational state of the AWSMachineTemplate resource.
122-
func (r *AWSMachineTemplate) GetConditions() clusterv1.Conditions {
122+
func (r *AWSMachineTemplate) GetConditions() clusterv1beta1.Conditions {
123123
return r.Status.Conditions
124124
}
125125

126-
// SetConditions sets the underlying service state of the AWSMachineTemplate to the predescribed clusterv1.Conditions.
127-
func (r *AWSMachineTemplate) SetConditions(conditions clusterv1.Conditions) {
126+
// SetConditions sets the underlying service state of the AWSMachineTemplate to the predescribed clusterv1beta1.Conditions.
127+
func (r *AWSMachineTemplate) SetConditions(conditions clusterv1beta1.Conditions) {
128128
r.Status.Conditions = conditions
129129
}
130130

0 commit comments

Comments
 (0)