Skip to content

Commit 75079c7

Browse files
committed
OpenStackCluster: Set explicit listType=atomic
For non-mergeable list types, make the default 'atomic' behaviour explicit.
1 parent 2d96db6 commit 75079c7

File tree

3 files changed

+9
-0
lines changed

3 files changed

+9
-0
lines changed

api/v1beta1/openstackcluster_types.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ type OpenStackClusterSpec struct {
3434
// subnets with the defined CIDR, and a router connected to these subnets. Currently only one IPv4
3535
// subnet is supported. If you leave this empty, no network will be created.
3636
// +kubebuilder:validation:MaxItems=1
37+
// +listType=atomic
3738
// +optional
3839
ManagedSubnets []SubnetSpec `json:"managedSubnets,omitempty"`
3940

@@ -52,6 +53,7 @@ type OpenStackClusterSpec struct {
5253
// all subnets in Network will be used. If 2 subnets are specified, one
5354
// must be IPv4 and the other IPv6.
5455
// +kubebuilder:validation:MaxItems=2
56+
// +listType=atomic
5557
// +optional
5658
Subnets []SubnetFilter `json:"subnets,omitempty"`
5759

@@ -64,6 +66,7 @@ type OpenStackClusterSpec struct {
6466

6567
// ExternalRouterIPs is an array of externalIPs on the respective subnets.
6668
// This is necessary if the router needs a fixed ip in a specific subnet.
69+
// +listType=atomic
6770
// +optional
6871
ExternalRouterIPs []ExternalRouterIPParam `json:"externalRouterIPs,omitempty"`
6972

config/crd/bases/infrastructure.cluster.x-k8s.io_openstackclusters.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5736,6 +5736,7 @@ spec:
57365736
- subnet
57375737
type: object
57385738
type: array
5739+
x-kubernetes-list-type: atomic
57395740
identityRef:
57405741
description: |-
57415742
IdentityRef is a reference to a secret holding OpenStack credentials
@@ -5893,6 +5894,7 @@ spec:
58935894
type: object
58945895
maxItems: 1
58955896
type: array
5897+
x-kubernetes-list-type: atomic
58965898
network:
58975899
description: |-
58985900
Network specifies an existing network to use if no ManagedSubnets
@@ -6117,6 +6119,7 @@ spec:
61176119
type: object
61186120
maxItems: 2
61196121
type: array
6122+
x-kubernetes-list-type: atomic
61206123
tags:
61216124
description: Tags for all resources in cluster
61226125
items:

config/crd/bases/infrastructure.cluster.x-k8s.io_openstackclustertemplates.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3168,6 +3168,7 @@ spec:
31683168
- subnet
31693169
type: object
31703170
type: array
3171+
x-kubernetes-list-type: atomic
31713172
identityRef:
31723173
description: |-
31733174
IdentityRef is a reference to a secret holding OpenStack credentials
@@ -3327,6 +3328,7 @@ spec:
33273328
type: object
33283329
maxItems: 1
33293330
type: array
3331+
x-kubernetes-list-type: atomic
33303332
network:
33313333
description: |-
33323334
Network specifies an existing network to use if no ManagedSubnets
@@ -3551,6 +3553,7 @@ spec:
35513553
type: object
35523554
maxItems: 2
35533555
type: array
3556+
x-kubernetes-list-type: atomic
35543557
tags:
35553558
description: Tags for all resources in cluster
35563559
items:

0 commit comments

Comments
 (0)