Merge pull request kubernetes-sigs#12223 from chrischdi/pr-ipam-v1beta1-revert-condition-funcs

k8s-ci-robot · web-flow · commit d798c4bfd039 · 2025-05-16T05:33:13.000-07:00
🐛 ipam: revert condition func changes for IPAddressClaim v1beta1
diff --git a/exp/ipam/api/v1beta1/ipaddressclaim_types.go b/exp/ipam/api/v1beta1/ipaddressclaim_types.go
@@ -86,26 +86,26 @@ type IPAddressClaim struct {
 	Status IPAddressClaimStatus `json:"status,omitempty"`
 }
 
-// GetV1Beta1Conditions returns the set of conditions for this object.
-func (m *IPAddressClaim) GetV1Beta1Conditions() clusterv1beta1.Conditions {
+// GetConditions returns the set of conditions for this object.
+func (m *IPAddressClaim) GetConditions() clusterv1beta1.Conditions {
 	return m.Status.Conditions
 }
 
-// SetV1Beta1Conditions sets the conditions on this object.
-func (m *IPAddressClaim) SetV1Beta1Conditions(conditions clusterv1beta1.Conditions) {
+// SetConditions sets the conditions on this object.
+func (m *IPAddressClaim) SetConditions(conditions clusterv1beta1.Conditions) {
 	m.Status.Conditions = conditions
 }
 
-// GetConditions returns the set of conditions for this object.
-func (m *IPAddressClaim) GetConditions() []metav1.Condition {
+// GetV1Beta2Conditions returns the set of conditions for this object.
+func (m *IPAddressClaim) GetV1Beta2Conditions() []metav1.Condition {
 	if m.Status.V1Beta2 == nil {
 		return nil
 	}
 	return m.Status.V1Beta2.Conditions
 }
 
-// SetConditions sets conditions for an API object.
-func (m *IPAddressClaim) SetConditions(conditions []metav1.Condition) {
+// SetV1Beta2Conditions sets conditions for an API object.
+func (m *IPAddressClaim) SetV1Beta2Conditions(conditions []metav1.Condition) {
 	if m.Status.V1Beta2 == nil {
 		m.Status.V1Beta2 = &IPAddressClaimV1Beta2Status{}
 	}

Original file line number	Diff line number	Diff line change
`@@ -86,26 +86,26 @@ type IPAddressClaim struct {`
`86`	`86`	Status IPAddressClaimStatus `json:"status,omitempty"`
`87`	`87`	`}`
`88`	`88`
`89`		`-// GetV1Beta1Conditions returns the set of conditions for this object.`
`90`		`-func (m *IPAddressClaim) GetV1Beta1Conditions() clusterv1beta1.Conditions {`
	`89`	`+// GetConditions returns the set of conditions for this object.`
	`90`	`+func (m *IPAddressClaim) GetConditions() clusterv1beta1.Conditions {`
`91`	`91`	`return m.Status.Conditions`
`92`	`92`	`}`
`93`	`93`
`94`		`-// SetV1Beta1Conditions sets the conditions on this object.`
`95`		`-func (m *IPAddressClaim) SetV1Beta1Conditions(conditions clusterv1beta1.Conditions) {`
	`94`	`+// SetConditions sets the conditions on this object.`
	`95`	`+func (m *IPAddressClaim) SetConditions(conditions clusterv1beta1.Conditions) {`
`96`	`96`	`m.Status.Conditions = conditions`
`97`	`97`	`}`
`98`	`98`
`99`		`-// GetConditions returns the set of conditions for this object.`
`100`		`-func (m *IPAddressClaim) GetConditions() []metav1.Condition {`
	`99`	`+// GetV1Beta2Conditions returns the set of conditions for this object.`
	`100`	`+func (m *IPAddressClaim) GetV1Beta2Conditions() []metav1.Condition {`
`101`	`101`	`if m.Status.V1Beta2 == nil {`
`102`	`102`	`return nil`
`103`	`103`	`}`
`104`	`104`	`return m.Status.V1Beta2.Conditions`
`105`	`105`	`}`
`106`	`106`
`107`		`-// SetConditions sets conditions for an API object.`
`108`		`-func (m *IPAddressClaim) SetConditions(conditions []metav1.Condition) {`
	`107`	`+// SetV1Beta2Conditions sets conditions for an API object.`
	`108`	`+func (m *IPAddressClaim) SetV1Beta2Conditions(conditions []metav1.Condition) {`
`109`	`109`	`if m.Status.V1Beta2 == nil {`
`110`	`110`	`m.Status.V1Beta2 = &IPAddressClaimV1Beta2Status{}`
`111`	`111`	`}`