Skip to content

Commit 8898e13

Browse files
bnallapetabnallapeta
committed
update API types to use v1beta2 conditions
Signed-off-by: Bharath Nallapeta <nr.bharath97@gmail.com>
1 parent 43629c4 commit 8898e13

File tree

9 files changed

+93
-28
lines changed

9 files changed

+93
-28
lines changed

‎api/v1alpha1/openstackfloatingippool_types.go‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,8 @@ import (
2020
"fmt"
2121

2222
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
23-
clusterv1beta1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
2423

25-
infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1"
24+
infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1beta2"
2625
)
2726

2827
const (
@@ -88,7 +87,7 @@ type OpenStackFloatingIPPoolStatus struct {
8887
// +optional
8988
FloatingIPNetwork *infrav1.NetworkStatus `json:"floatingIPNetwork,omitempty"`
9089

91-
Conditions clusterv1beta1.Conditions `json:"conditions,omitempty"`
90+
Conditions []metav1.Condition `json:"conditions,omitempty"`
9291
}
9392

9493
//+kubebuilder:object:root=true
@@ -114,12 +113,12 @@ type OpenStackFloatingIPPoolList struct {
114113
}
115114

116115
// GetConditions returns the observations of the operational state of the OpenStackFloatingIPPool resource.
117-
func (r *OpenStackFloatingIPPool) GetConditions() clusterv1beta1.Conditions {
116+
func (r *OpenStackFloatingIPPool) GetConditions() []metav1.Condition {
118117
return r.Status.Conditions
119118
}
120119

121120
// SetConditions sets the underlying service state of the OpenStackFloatingIPPool to the predescribed clusterv1.Conditions.
122-
func (r *OpenStackFloatingIPPool) SetConditions(conditions clusterv1beta1.Conditions) {
121+
func (r *OpenStackFloatingIPPool) SetConditions(conditions []metav1.Condition) {
123122
r.Status.Conditions = conditions
124123
}
125124

‎api/v1alpha1/openstackserver_types.go‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,8 @@ import (
2121
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2222
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
2323
runtime "k8s.io/apimachinery/pkg/runtime"
24-
clusterv1beta1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
2524

26-
infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1"
25+
infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1beta2"
2726
"sigs.k8s.io/cluster-api-provider-openstack/pkg/utils/optional"
2827
)
2928

@@ -153,7 +152,7 @@ type OpenStackServerStatus struct {
153152

154153
// Conditions defines current service state of the OpenStackServer.
155154
// +optional
156-
Conditions clusterv1beta1.Conditions `json:"conditions,omitempty"`
155+
Conditions []metav1.Condition `json:"conditions,omitempty"`
157156
}
158157

159158
// +genclient
@@ -185,12 +184,12 @@ type OpenStackServerList struct {
185184
}
186185

187186
// GetConditions returns the observations of the operational state of the OpenStackServer resource.
188-
func (r *OpenStackServer) GetConditions() clusterv1beta1.Conditions {
187+
func (r *OpenStackServer) GetConditions() []metav1.Condition {
189188
return r.Status.Conditions
190189
}
191190

192191
// SetConditions sets the underlying service state of the OpenStackServer to the predescribed clusterv1.Conditions.
193-
func (r *OpenStackServer) SetConditions(conditions clusterv1beta1.Conditions) {
192+
func (r *OpenStackServer) SetConditions(conditions []metav1.Condition) {
194193
r.Status.Conditions = conditions
195194
}
196195

‎api/v1alpha1/types.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ limitations under the License.
1717
package v1alpha1
1818

1919
import (
20-
infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1"
20+
infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1beta2"
2121
)
2222

2323
// ResolvedServerSpec contains resolved references to resources required by the server.

‎api/v1alpha1/zz_generated.deepcopy.go‎

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

‎api/v1beta2/conditions_consts.go‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ const (
4949

5050
const (
5151
// APIServerIngressReadyCondition reports on the current status of the network ingress (Loadbalancer, Floating IP) for Control Plane machines. Ready indicates that the instance can receive requests.
52-
APIServerIngressReadyCondition string = "APIServerIngressReadyCondition"
52+
APIServerIngressReadyCondition string = "APIServerIngressReady"
5353

5454
// LoadBalancerMemberErrorReason used when the instance could not be added as a loadbalancer member.
5555
LoadBalancerMemberErrorReason = "LoadBalancerMemberError"
@@ -85,6 +85,8 @@ const (
8585
// Ready indicates that the control plane endpoint has been successfully configured.
8686
APIEndpointReadyCondition string = "APIEndpointReady"
8787

88+
// ReadyConditionReason is the reason used when the resource is ready.
89+
ReadyConditionReason = "Ready"
8890
// NetworkReconcileFailedReason is used when network reconciliation fails.
8991
NetworkReconcileFailedReason = "NetworkCreateFailed"
9092
// SubnetReconcileFailedReason is used when subnet reconciliation fails.

‎api/v1beta2/openstackmachinetemplate_types.go‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,14 @@ type OpenStackMachineTemplateList struct {
7575
Items []OpenStackMachineTemplate `json:"items"`
7676
}
7777

78+
// GetIdentityRef returns the object's namespace and IdentityRef if it has an IdentityRef, or nulls if it does not.
79+
func (r *OpenStackMachineTemplate) GetIdentityRef() (*string, *OpenStackIdentityReference) {
80+
if r.Spec.Template.Spec.IdentityRef != nil {
81+
return &r.Namespace, r.Spec.Template.Spec.IdentityRef
82+
}
83+
return nil, nil
84+
}
85+
7886
func init() {
7987
objectTypes = append(objectTypes, &OpenStackMachineTemplate{}, &OpenStackMachineTemplateList{})
8088
}

‎api/v1beta2/types.go‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ limitations under the License.
1717
package v1beta2
1818

1919
import (
20+
"strings"
21+
2022
"k8s.io/utils/ptr"
2123

2224
"sigs.k8s.io/cluster-api-provider-openstack/pkg/utils/optional"
@@ -966,3 +968,15 @@ type ValueSpec struct {
966968
// +kubebuilder:validation:Required
967969
Value string `json:"value"`
968970
}
971+
972+
// JoinTags joins a slice of tags into a comma separated list of tags.
973+
func JoinTags(tags []NeutronTag) string {
974+
var b strings.Builder
975+
for i := range tags {
976+
if i > 0 {
977+
b.WriteString(",")
978+
}
979+
b.WriteString(string(tags[i]))
980+
}
981+
return b.String()
982+
}

‎api/v1beta2/zz_generated.deepcopy.go‎

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

‎api_violations.report‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
API rule violation: list_type_missing,sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha1,OpenStackFloatingIPPoolSpec,PreAllocatedFloatingIPs
22
API rule violation: list_type_missing,sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha1,OpenStackFloatingIPPoolStatus,AvailableIPs
33
API rule violation: list_type_missing,sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha1,OpenStackFloatingIPPoolStatus,ClaimedIPs
4+
API rule violation: list_type_missing,sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha1,OpenStackFloatingIPPoolStatus,Conditions
45
API rule violation: list_type_missing,sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha1,OpenStackFloatingIPPoolStatus,FailedIPs
56
API rule violation: list_type_missing,sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha1,OpenStackServerSpec,Ports
67
API rule violation: list_type_missing,sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha1,OpenStackServerSpec,SecurityGroups
78
API rule violation: list_type_missing,sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha1,OpenStackServerStatus,Addresses
9+
API rule violation: list_type_missing,sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha1,OpenStackServerStatus,Conditions
810
API rule violation: list_type_missing,sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha1,ResolvedServerSpec,Ports
911
API rule violation: list_type_missing,sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha1,ServerResources,Ports
1012
API rule violation: list_type_missing,sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1,LoadBalancer,AllowedCIDRs
@@ -23,6 +25,25 @@ API rule violation: list_type_missing,sigs.k8s.io/cluster-api-provider-openstack
2325
API rule violation: list_type_missing,sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1,Subnet,Tags
2426
API rule violation: list_type_missing,sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1,SubnetSpec,AllocationPools
2527
API rule violation: list_type_missing,sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1,SubnetSpec,DNSNameservers
28+
API rule violation: list_type_missing,sigs.k8s.io/cluster-api-provider-openstack/api/v1beta2,LoadBalancer,AllowedCIDRs
29+
API rule violation: list_type_missing,sigs.k8s.io/cluster-api-provider-openstack/api/v1beta2,LoadBalancer,Tags
30+
API rule violation: list_type_missing,sigs.k8s.io/cluster-api-provider-openstack/api/v1beta2,MachineResources,Ports
31+
API rule violation: list_type_missing,sigs.k8s.io/cluster-api-provider-openstack/api/v1beta2,NetworkStatus,Tags
32+
API rule violation: list_type_missing,sigs.k8s.io/cluster-api-provider-openstack/api/v1beta2,NetworkStatusWithSubnets,Subnets
33+
API rule violation: list_type_missing,sigs.k8s.io/cluster-api-provider-openstack/api/v1beta2,OpenStackClusterStatus,Conditions
34+
API rule violation: list_type_missing,sigs.k8s.io/cluster-api-provider-openstack/api/v1beta2,OpenStackClusterStatus,FailureDomains
35+
API rule violation: list_type_missing,sigs.k8s.io/cluster-api-provider-openstack/api/v1beta2,OpenStackMachineSpec,Ports
36+
API rule violation: list_type_missing,sigs.k8s.io/cluster-api-provider-openstack/api/v1beta2,OpenStackMachineSpec,SecurityGroups
37+
API rule violation: list_type_missing,sigs.k8s.io/cluster-api-provider-openstack/api/v1beta2,OpenStackMachineStatus,Addresses
38+
API rule violation: list_type_missing,sigs.k8s.io/cluster-api-provider-openstack/api/v1beta2,OpenStackMachineStatus,Conditions
39+
API rule violation: list_type_missing,sigs.k8s.io/cluster-api-provider-openstack/api/v1beta2,ResolvedMachineSpec,Ports
40+
API rule violation: list_type_missing,sigs.k8s.io/cluster-api-provider-openstack/api/v1beta2,ResolvedPortSpecFields,AllowedAddressPairs
41+
API rule violation: list_type_missing,sigs.k8s.io/cluster-api-provider-openstack/api/v1beta2,Router,IPs
42+
API rule violation: list_type_missing,sigs.k8s.io/cluster-api-provider-openstack/api/v1beta2,Router,Tags
43+
API rule violation: list_type_missing,sigs.k8s.io/cluster-api-provider-openstack/api/v1beta2,SecurityGroupRuleSpec,RemoteManagedGroups
44+
API rule violation: list_type_missing,sigs.k8s.io/cluster-api-provider-openstack/api/v1beta2,Subnet,Tags
45+
API rule violation: list_type_missing,sigs.k8s.io/cluster-api-provider-openstack/api/v1beta2,SubnetSpec,AllocationPools
46+
API rule violation: list_type_missing,sigs.k8s.io/cluster-api-provider-openstack/api/v1beta2,SubnetSpec,DNSNameservers
2647
API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/core/v1beta1,ClusterClassPatch,Definitions
2748
API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/core/v1beta1,ClusterClassSpec,Patches
2849
API rule violation: list_type_missing,sigs.k8s.io/cluster-api/api/core/v1beta1,ClusterClassSpec,Variables
@@ -92,6 +113,10 @@ API rule violation: names_match,sigs.k8s.io/cluster-api-provider-openstack/api/v
92113
API rule violation: names_match,sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1,Router,IPs
93114
API rule violation: names_match,sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1,SubnetFilter,IPv6AddressMode
94115
API rule violation: names_match,sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1,SubnetFilter,IPv6RAMode
116+
API rule violation: names_match,sigs.k8s.io/cluster-api-provider-openstack/api/v1beta2,ResolvedFixedIP,SubnetID
117+
API rule violation: names_match,sigs.k8s.io/cluster-api-provider-openstack/api/v1beta2,Router,IPs
118+
API rule violation: names_match,sigs.k8s.io/cluster-api-provider-openstack/api/v1beta2,SubnetFilter,IPv6AddressMode
119+
API rule violation: names_match,sigs.k8s.io/cluster-api-provider-openstack/api/v1beta2,SubnetFilter,IPv6RAMode
95120
API rule violation: names_match,sigs.k8s.io/cluster-api/api/core/v1beta1,ClusterClassStatus,V1Beta2
96121
API rule violation: names_match,sigs.k8s.io/cluster-api/api/core/v1beta1,ClusterStatus,V1Beta2
97122
API rule violation: names_match,sigs.k8s.io/cluster-api/api/core/v1beta1,JSONSchemaProps,XIntOrString

0 commit comments

Comments
 (0)