Skip to content

Commit 90bf8d5

Browse files
bnallapetabnallapeta
committed
fix e2e tests
Signed-off-by: Bharath Nallapeta <nr.bharath97@gmail.com>
1 parent 7a7a491 commit 90bf8d5

File tree

45 files changed

+254
-256
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+254
-256
lines changed

‎Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -583,10 +583,10 @@ templates: templates/cluster-template.yaml \
583583
templates/cluster-template-flatcar-sysext.yaml \
584584
templates/cluster-template-capi-v1beta1.yaml
585585

586-
templates/cluster-template.yaml: kustomize/v1beta1/default $(KUSTOMIZE) FORCE
586+
templates/cluster-template.yaml: kustomize/default $(KUSTOMIZE) FORCE
587587
$(KUSTOMIZE) build "$<" > "$@"
588588

589-
templates/cluster-template-%.yaml: kustomize/v1beta1/% $(KUSTOMIZE) FORCE
589+
templates/cluster-template-%.yaml: kustomize/% $(KUSTOMIZE) FORCE
590590
$(KUSTOMIZE) build "$<" > "$@"
591591

592592
.PHONY: release-templates

‎api/v1beta1/conversion.go‎

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

1919
import (
20+
"sort"
2021
"strings"
2122
"unsafe"
2223

@@ -202,6 +203,9 @@ func Convert_v1beta1_OpenStackClusterStatus_To_v1beta2_OpenStackClusterStatus(in
202203
Attributes: fd.Attributes,
203204
})
204205
}
206+
sort.Slice(out.FailureDomains, func(i, j int) bool {
207+
return out.FailureDomains[i].Name < out.FailureDomains[j].Name
208+
})
205209
}
206210

207211
out.Conditions = infrav1.ConvertConditionsToV1Beta2(in.Conditions, 0)

‎api/v1beta1/openstackcluster_types.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,6 @@ type OpenStackClusterStatus struct {
311311
// +genclient
312312
// +kubebuilder:object:root=true
313313
// +kubebuilder:resource:path=openstackclusters,scope=Namespaced,categories=cluster-api,shortName=osc
314-
// +kubebuilder:storageversion
315314
// +kubebuilder:subresource:status
316315
// +kubebuilder:printcolumn:name="Cluster",type="string",JSONPath=".metadata.labels.cluster\\.x-k8s\\.io/cluster-name",description="Cluster to which this OpenStackCluster belongs"
317316
// +kubebuilder:printcolumn:name="Ready",type="string",JSONPath=".status.ready",description="Cluster infrastructure is ready for OpenStack instances"

‎api/v1beta1/openstackclustertemplate_types.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ type OpenStackClusterTemplateSpec struct {
3232

3333
// +genclient
3434
// +kubebuilder:object:root=true
35-
// +kubebuilder:storageversion
3635
// +kubebuilder:resource:path=openstackclustertemplates,scope=Namespaced,categories=cluster-api,shortName=osct
3736

3837
// OpenStackClusterTemplate is the Schema for the openstackclustertemplates API.

‎api/v1beta1/openstackmachine_types.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,6 @@ type OpenStackMachineStatus struct {
267267

268268
// +genclient
269269
// +kubebuilder:object:root=true
270-
// +kubebuilder:storageversion
271270
// +kubebuilder:resource:path=openstackmachines,scope=Namespaced,categories=cluster-api,shortName=osm
272271
// +kubebuilder:subresource:status
273272
// +kubebuilder:printcolumn:name="Cluster",type="string",JSONPath=".metadata.labels.cluster\\.x-k8s\\.io/cluster-name",description="Cluster to which this OpenStackMachine belongs"

‎api/v1beta1/openstackmachinetemplate_types.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ type NodeInfo struct {
5555

5656
// +genclient
5757
// +kubebuilder:object:root=true
58-
// +kubebuilder:storageversion
5958
// +kubebuilder:resource:path=openstackmachinetemplates,scope=Namespaced,categories=cluster-api,shortName=osmt
6059
// +kubebuilder:subresource:status
6160

‎api/v1beta2/openstackcluster_types.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -258,6 +258,7 @@ type OpenStackClusterStatus struct {
258258

259259
// +genclient
260260
// +kubebuilder:object:root=true
261+
// +kubebuilder:storageversion
261262
// +kubebuilder:resource:path=openstackclusters,scope=Namespaced,categories=cluster-api,shortName=osc
262263
// +kubebuilder:subresource:status
263264
// +kubebuilder:printcolumn:name="Cluster",type="string",JSONPath=".metadata.labels.cluster\\.x-k8s\\.io/cluster-name",description="Cluster to which this OpenStackCluster belongs"

‎api/v1beta2/openstackclustertemplate_types.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ type OpenStackClusterTemplateSpec struct {
3232

3333
// +genclient
3434
// +kubebuilder:object:root=true
35+
// +kubebuilder:storageversion
3536
// +kubebuilder:resource:path=openstackclustertemplates,scope=Namespaced,categories=cluster-api,shortName=osct
3637

3738
// OpenStackClusterTemplate is the Schema for the openstackclustertemplates API.

‎api/v1beta2/openstackmachine_types.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,7 @@ type OpenStackMachineStatus struct {
228228

229229
// +genclient
230230
// +kubebuilder:object:root=true
231+
// +kubebuilder:storageversion
231232
// +kubebuilder:resource:path=openstackmachines,scope=Namespaced,categories=cluster-api,shortName=osm
232233
// +kubebuilder:subresource:status
233234
// +kubebuilder:printcolumn:name="Cluster",type="string",JSONPath=".metadata.labels.cluster\\.x-k8s\\.io/cluster-name",description="Cluster to which this OpenStackMachine belongs"

‎api/v1beta2/openstackmachinetemplate_types.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ type NodeInfo struct {
5454

5555
// +genclient
5656
// +kubebuilder:object:root=true
57+
// +kubebuilder:storageversion
5758
// +kubebuilder:resource:path=openstackmachinetemplates,scope=Namespaced,categories=cluster-api,shortName=osmt
5859
// +kubebuilder:subresource:status
5960

0 commit comments

Comments
 (0)