Skip to content

Commit 6111e85

Browse files
committed
KAL: Enabled conditions linter
Enable the linter and fix the issues it reported. Signed-off-by: Lennart Jern <lennart.jern@est.tech>
1 parent 0520af0 commit 6111e85

16 files changed

Lines changed: 263 additions & 221 deletions

.golangci-kal.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ linters:
1515
linters:
1616
enable:
1717
- "commentstart" # Ensure comments start with the serialized version of the field name.
18-
# - "conditions" # Ensure conditions have the correct json tags and markers.
18+
- "conditions" # Ensure conditions have the correct json tags and markers.
1919
# - "conflictingmarkers" # Ensure there are no conflicting markers.
2020
- "duplicatemarkers" # Ensure there are no exact duplicate markers for types and fields.
2121
# - "forbiddenmarkers" # Ensure that types and fields do not contain any markers that are forbidden.

api/v1beta1/zz_generated.conversion.go

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

api/v1beta2/openstackcluster_types.go

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,15 @@ type ClusterInitialization struct {
199199

200200
// OpenStackClusterStatus defines the observed state of OpenStackCluster.
201201
type OpenStackClusterStatus struct {
202+
// conditions defines current service state of the OpenStackCluster.
203+
// This field surfaces into Cluster's status.conditions[InfrastructureReady] condition.
204+
// The Ready condition must surface issues during the entire lifecycle of the OpenStackCluster
205+
// (both during initial provisioning and after the initial provisioning is completed).
206+
// +optional
207+
// +listType=map
208+
// +listMapKey=type
209+
Conditions []metav1.Condition `json:"conditions,omitempty"`
210+
202211
// initialization contains information about the initialization status of the cluster.
203212
// +optional
204213
Initialization *ClusterInitialization `json:"initialization,omitempty"`
@@ -241,13 +250,6 @@ type OpenStackClusterStatus struct {
241250
// bastion contains the information about the deployed bastion host
242251
// +optional
243252
Bastion *BastionStatus `json:"bastion,omitempty"`
244-
245-
// conditions defines current service state of the OpenStackCluster.
246-
// This field surfaces into Cluster's status.conditions[InfrastructureReady] condition.
247-
// The Ready condition must surface issues during the entire lifecycle of the OpenStackCluster
248-
// (both during initial provisioning and after the initial provisioning is completed).
249-
// +optional
250-
Conditions []metav1.Condition `json:"conditions,omitempty"`
251253
}
252254

253255
// +genclient

api/v1beta2/openstackmachine_types.go

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,15 @@ type MachineInitialization struct {
186186

187187
// OpenStackMachineStatus defines the observed state of OpenStackMachine.
188188
type OpenStackMachineStatus struct {
189+
// conditions defines current service state of the OpenStackMachine.
190+
// This field surfaces into Machine's status.conditions[InfrastructureReady] condition.
191+
// The Ready condition must surface issues during the entire lifecycle of the OpenStackMachine
192+
// (both during initial provisioning and after the initial provisioning is completed).
193+
// +optional
194+
// +listType=map
195+
// +listMapKey=type
196+
Conditions []metav1.Condition `json:"conditions,omitempty"`
197+
189198
// initialization contains information about the initialization status of the machine.
190199
// +optional
191200
Initialization *MachineInitialization `json:"initialization,omitempty"`
@@ -211,13 +220,6 @@ type OpenStackMachineStatus struct {
211220
// resources contains references to OpenStack resources created for the machine.
212221
// +optional
213222
Resources *MachineResources `json:"resources,omitempty"`
214-
215-
// conditions defines current service state of the OpenStackMachine.
216-
// This field surfaces into Machine's status.conditions[InfrastructureReady] condition.
217-
// The Ready condition must surface issues during the entire lifecycle of the OpenStackMachine
218-
// (both during initial provisioning and after the initial provisioning is completed).
219-
// +optional
220-
Conditions []metav1.Condition `json:"conditions,omitempty"`
221223
}
222224

223225
// +genclient

api/v1beta2/openstackmachinetemplate_types.go

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,14 @@ type OpenStackMachineTemplateSpec struct {
2929

3030
// OpenStackMachineTemplateStatus defines the observed state of OpenStackMachineTemplate.
3131
type OpenStackMachineTemplateStatus struct {
32+
// conditions defines current service state of the OpenStackMachineTemplate.
33+
// The Ready condition must surface issues during the entire lifecycle of the OpenStackMachineTemplate.
34+
// (both during initial provisioning and after the initial provisioning is completed).
35+
// +optional
36+
// +listType=map
37+
// +listMapKey=type
38+
Conditions []metav1.Condition `json:"conditions,omitempty"`
39+
3240
// capacity defines the resource capacity for this machine.
3341
// This value is used for autoscaling from zero operations as defined in:
3442
// https://github.com/kubernetes-sigs/cluster-api/blob/main/docs/proposals/20210310-opt-in-autoscaling-from-zero.md
@@ -37,12 +45,6 @@ type OpenStackMachineTemplateStatus struct {
3745
// nodeInfo contains information about the node's operating system.
3846
// +optional
3947
NodeInfo NodeInfo `json:"nodeInfo,omitempty,omitzero"`
40-
41-
// conditions defines current service state of the OpenStackMachineTemplate.
42-
// The Ready condition must surface issues during the entire lifecycle of the OpenStackMachineTemplate.
43-
// (both during initial provisioning and after the initial provisioning is completed).
44-
// +optional
45-
Conditions []metav1.Condition `json:"conditions,omitempty"`
4648
}
4749

4850
// NodeInfo contains information about the node's architecture and operating system.

api/v1beta2/zz_generated.deepcopy.go

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

api_violations.report

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,10 @@ API rule violation: list_type_missing,sigs.k8s.io/cluster-api-provider-openstack
3030
API rule violation: list_type_missing,sigs.k8s.io/cluster-api-provider-openstack/api/v1beta2,MachineResources,Ports
3131
API rule violation: list_type_missing,sigs.k8s.io/cluster-api-provider-openstack/api/v1beta2,NetworkStatus,Tags
3232
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
3433
API rule violation: list_type_missing,sigs.k8s.io/cluster-api-provider-openstack/api/v1beta2,OpenStackClusterStatus,FailureDomains
3534
API rule violation: list_type_missing,sigs.k8s.io/cluster-api-provider-openstack/api/v1beta2,OpenStackMachineSpec,Ports
3635
API rule violation: list_type_missing,sigs.k8s.io/cluster-api-provider-openstack/api/v1beta2,OpenStackMachineSpec,SecurityGroups
3736
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,OpenStackMachineTemplateStatus,Conditions
4037
API rule violation: list_type_missing,sigs.k8s.io/cluster-api-provider-openstack/api/v1beta2,ResolvedMachineSpec,Ports
4138
API rule violation: list_type_missing,sigs.k8s.io/cluster-api-provider-openstack/api/v1beta2,ResolvedPortSpecFields,AllowedAddressPairs
4239
API rule violation: list_type_missing,sigs.k8s.io/cluster-api-provider-openstack/api/v1beta2,Router,IPs

0 commit comments

Comments
 (0)