Skip to content

Commit

Permalink
Merge pull request #1934 from shiftstack/fix-serializations
Browse files Browse the repository at this point in the history 
⚠️ Rename fields to correctly do uppercase acronyms
  • Loading branch information
@k8s-ci-robot
k8s-ci-robot authored Mar 7, 2024
2 parents b4670cb + c7c5baf commit 47f0c1b
Show file tree
Hide file tree
Showing 9 changed files with 115 additions and 86 deletions.
2 changes: 1 addition & 1 deletion api/v1beta1/openstackcluster_types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ type OpenStackClusterSpec struct {
// If left empty, the network will have the default MTU defined in Openstack network service.
// To use this field, the Openstack installation requires the net-mtu neutron API extension.
// +optional
NetworkMTU int `json:"networkMtu,omitempty"`
NetworkMTU int `json:"networkMTU,omitempty"`

// ExternalRouterIPs is an array of externalIPs on the respective subnets.
// This is necessary if the router needs a fixed ip in a specific subnet.
Expand Down
16 changes: 8 additions & 8 deletions api/v1beta1/types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,15 +79,15 @@ type SecurityGroupFilter struct {
ID string `json:"id,omitempty"`
Name string `json:"name,omitempty"`
Description string `json:"description,omitempty"`
ProjectID string `json:"projectId,omitempty"`
ProjectID string `json:"projectID,omitempty"`

FilterByNeutronTags `json:",inline"`
}

type NetworkFilter struct {
Name string `json:"name,omitempty"`
Description string `json:"description,omitempty"`
ProjectID string `json:"projectId,omitempty"`
ProjectID string `json:"projectID,omitempty"`
ID string `json:"id,omitempty"`

FilterByNeutronTags `json:",inline"`
Expand All @@ -96,12 +96,12 @@ type NetworkFilter struct {
type SubnetFilter struct {
Name string `json:"name,omitempty"`
Description string `json:"description,omitempty"`
ProjectID string `json:"projectId,omitempty"`
ProjectID string `json:"projectID,omitempty"`
IPVersion int `json:"ipVersion,omitempty"`
GatewayIP string `json:"gateway_ip,omitempty"`
GatewayIP string `json:"gatewayIP,omitempty"`
CIDR string `json:"cidr,omitempty"`
IPv6AddressMode string `json:"ipv6AddressMode,omitempty"`
IPv6RAMode string `json:"ipv6RaMode,omitempty"`
IPv6RAMode string `json:"ipv6RAMode,omitempty"`
ID string `json:"id,omitempty"`

FilterByNeutronTags `json:",inline"`
Expand All @@ -111,7 +111,7 @@ type RouterFilter struct {
ID string `json:"id,omitempty"`
Name string `json:"name,omitempty"`
Description string `json:"description,omitempty"`
ProjectID string `json:"projectId,omitempty"`
ProjectID string `json:"projectID,omitempty"`

FilterByNeutronTags `json:",inline"`
}
Expand Down Expand Up @@ -190,7 +190,7 @@ type PortOpts struct {

// HostID specifies the ID of the host where the port resides.
// +optional
HostID optional.String `json:"hostId,omitempty"`
HostID optional.String `json:"hostID,omitempty"`

// VNICType specifies the type of vNIC which this port should be
// attached to. This is used to determine which mechanism driver(s) to
Expand Down Expand Up @@ -596,7 +596,7 @@ type APIServerLoadBalancer struct {
// AdditionalPorts adds additional tcp ports to the load balancer.
AdditionalPorts []int `json:"additionalPorts,omitempty"`
// AllowedCIDRs restrict access to all API-Server listeners to the given address CIDRs.
AllowedCIDRs []string `json:"allowedCidrs,omitempty"`
AllowedCIDRs []string `json:"allowedCIDRs,omitempty"`
// Octavia Provider Used to create load balancer
Provider string `json:"provider,omitempty"`
}
Expand Down
48 changes: 24 additions & 24 deletions config/crd/bases/infrastructure.cluster.x-k8s.io_openstackclusters.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4874,7 +4874,7 @@ spec:
items:
type: integer
type: array
allowedCidrs:
allowedCIDRs:
description: AllowedCIDRs restrict access to all API-Server listeners
to the given address CIDRs.
items:
Expand Down Expand Up @@ -5094,15 +5094,15 @@ spec:
type: string
description:
type: string
gateway_ip:
gatewayIP:
type: string
id:
type: string
ipVersion:
type: integer
ipv6AddressMode:
type: string
ipv6RaMode:
ipv6RAMode:
type: string
name:
type: string
Expand Down Expand Up @@ -5132,7 +5132,7 @@ spec:
type: string
type: array
x-kubernetes-list-type: set
projectId:
projectID:
type: string
tags:
description: |-
Expand Down Expand Up @@ -5165,7 +5165,7 @@ spec:
type: object
type: array
x-kubernetes-list-type: atomic
hostId:
hostID:
description: HostID specifies the ID of the host where
the port resides.
type: string
Expand Down Expand Up @@ -5216,7 +5216,7 @@ spec:
type: string
type: array
x-kubernetes-list-type: set
projectId:
projectID:
type: string
tags:
description: |-
Expand Down Expand Up @@ -5307,7 +5307,7 @@ spec:
type: string
type: array
x-kubernetes-list-type: set
projectId:
projectID:
type: string
tags:
description: |-
Expand Down Expand Up @@ -5447,7 +5447,7 @@ spec:
type: string
type: array
x-kubernetes-list-type: set
projectId:
projectID:
type: string
tags:
description: |-
Expand Down Expand Up @@ -5617,7 +5617,7 @@ spec:
type: string
type: array
x-kubernetes-list-type: set
projectId:
projectID:
type: string
tags:
description: |-
Expand Down Expand Up @@ -5664,15 +5664,15 @@ spec:
type: string
description:
type: string
gateway_ip:
gatewayIP:
type: string
id:
type: string
ipVersion:
type: integer
ipv6AddressMode:
type: string
ipv6RaMode:
ipv6RAMode:
type: string
name:
type: string
Expand Down Expand Up @@ -5702,7 +5702,7 @@ spec:
type: string
type: array
x-kubernetes-list-type: set
projectId:
projectID:
type: string
tags:
description: |-
Expand Down Expand Up @@ -5930,7 +5930,7 @@ spec:
type: string
type: array
x-kubernetes-list-type: set
projectId:
projectID:
type: string
tags:
description: |-
Expand Down Expand Up @@ -5960,7 +5960,7 @@ spec:
type: array
x-kubernetes-list-type: set
type: object
networkMtu:
networkMTU:
description: |-
NetworkMTU sets the maximum transmission unit (MTU) value to address fragmentation for the private network ID.
This value will be used only if the Cluster actuator creates the network.
Expand Down Expand Up @@ -6004,7 +6004,7 @@ spec:
type: string
type: array
x-kubernetes-list-type: set
projectId:
projectID:
type: string
tags:
description: |-
Expand Down Expand Up @@ -6047,15 +6047,15 @@ spec:
type: string
description:
type: string
gateway_ip:
gatewayIP:
type: string
id:
type: string
ipVersion:
type: integer
ipv6AddressMode:
type: string
ipv6RaMode:
ipv6RAMode:
type: string
name:
type: string
Expand Down Expand Up @@ -6085,7 +6085,7 @@ spec:
type: string
type: array
x-kubernetes-list-type: set
projectId:
projectID:
type: string
tags:
description: |-
Expand Down Expand Up @@ -6253,15 +6253,15 @@ spec:
type: string
description:
type: string
gateway_ip:
gatewayIP:
type: string
id:
type: string
ipVersion:
type: integer
ipv6AddressMode:
type: string
ipv6RaMode:
ipv6RAMode:
type: string
name:
type: string
Expand Down Expand Up @@ -6291,7 +6291,7 @@ spec:
type: string
type: array
x-kubernetes-list-type: set
projectId:
projectID:
type: string
tags:
description: |-
Expand Down Expand Up @@ -6324,7 +6324,7 @@ spec:
type: object
type: array
x-kubernetes-list-type: atomic
hostId:
hostID:
description: HostID specifies the ID of the host where
the port resides.
type: string
Expand Down Expand Up @@ -6375,7 +6375,7 @@ spec:
type: string
type: array
x-kubernetes-list-type: set
projectId:
projectID:
type: string
tags:
description: |-
Expand Down Expand Up @@ -6466,7 +6466,7 @@ spec:
type: string
type: array
x-kubernetes-list-type: set
projectId:
projectID:
type: string
tags:
description: |-
Expand Down
Loading

0 comments on commit 47f0c1b

Please sign in to comment.