Add maxItems to all condition fields

Signed-off-by: Stefan Büringer [email protected]
kubernetes-sigs · Oct 4, 2024 · d11927c · d11927c
1 parent 9569cd6
commit d11927c
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 0 deletions.
diff --git a/config/crd/bases/addons.cluster.x-k8s.io_clusterresourcesets.yaml b/config/crd/bases/addons.cluster.x-k8s.io_clusterresourcesets.yaml
diff --git a/config/crd/bases/cluster.x-k8s.io_machinepools.yaml b/config/crd/bases/cluster.x-k8s.io_machinepools.yaml
diff --git a/docs/proposals/20240916-improve-status-in-CAPI-resources.md b/docs/proposals/20240916-improve-status-in-CAPI-resources.md
@@ -291,6 +291,7 @@ type MachineStatus struct {
  // +optional
  // +listType=map
  // +listMapKey=type
+ // +kubebuilder:validation:MaxItems=32
  Conditions []metav1.Condition `json:"conditions,omitempty"`
 
  // Other fields...
@@ -488,6 +489,7 @@ type MachineSetStatus struct {
  // +optional
  // +listType=map
  // +listMapKey=type
+ // +kubebuilder:validation:MaxItems=32
  Conditions []metav1.Condition `json:"conditions,omitempty"`
 
  // Other fields...
@@ -616,6 +618,7 @@ type MachineDeploymentStatus struct {
  // +optional
  // +listType=map
  // +listMapKey=type
+ // +kubebuilder:validation:MaxItems=32
  Conditions []metav1.Condition `json:"conditions,omitempty"`
 
  // Other fields...
@@ -730,6 +733,7 @@ type ClusterStatus struct {
  // +optional
  // +listType=map
  // +listMapKey=type
+ // +kubebuilder:validation:MaxItems=32
  Conditions []metav1.Condition `json:"conditions,omitempty"`
 
  // ControlPlane groups all the observations about Cluster's ControlPlane current state.
@@ -981,6 +985,7 @@ type KubeadmControlPlaneStatus struct {
  // +optional
  // +listType=map
  // +listMapKey=type
+ // +kubebuilder:validation:MaxItems=32
  Conditions []metav1.Condition `json:"conditions,omitempty"`
 
  // Other fields...
@@ -1100,6 +1105,7 @@ type MachinePoolStatus struct {
  // +optional
  // +listType=map
  // +listMapKey=type
+ // +kubebuilder:validation:MaxItems=32
  Conditions []metav1.Condition `json:"conditions,omitempty"`
 
  // Other fields...

diff --git a/exp/addons/api/v1beta1/clusterresourceset_types.go b/exp/addons/api/v1beta1/clusterresourceset_types.go
@@ -115,6 +115,7 @@ type ClusterResourceSetV1Beta2Status struct {
  // +optional
  // +listType=map
  // +listMapKey=type
+ // +kubebuilder:validation:MaxItems=32
  Conditions []metav1.Condition `json:"conditions,omitempty"`
 }
 

diff --git a/exp/api/v1beta1/machinepool_types.go b/exp/api/v1beta1/machinepool_types.go
@@ -137,6 +137,7 @@ type MachinePoolV1Beta2Status struct {
  // +optional
  // +listType=map
  // +listMapKey=type
+ // +kubebuilder:validation:MaxItems=32
  Conditions []metav1.Condition `json:"conditions,omitempty"`
 
  // readyReplicas is the number of ready replicas for this MachinePool. A machine is considered ready when Machine's Ready condition is true.

diff --git a/internal/test/builder/crd/test.cluster.x-k8s.io_phase1obj.yaml b/internal/test/builder/crd/test.cluster.x-k8s.io_phase1obj.yaml
@@ -156,6 +156,7 @@ spec:
  - status
  - type
  type: object
+ maxItems: 32
  type: array
  x-kubernetes-list-map-keys:
  - type

diff --git a/internal/test/builder/crd/test.cluster.x-k8s.io_phase2obj.yaml b/internal/test/builder/crd/test.cluster.x-k8s.io_phase2obj.yaml
@@ -105,6 +105,7 @@ spec:
  - status
  - type
  type: object
+ maxItems: 32
  type: array
  x-kubernetes-list-map-keys:
  - type

diff --git a/internal/test/builder/crd/test.cluster.x-k8s.io_phase3obj.yaml b/internal/test/builder/crd/test.cluster.x-k8s.io_phase3obj.yaml
@@ -104,6 +104,7 @@ spec:
  - status
  - type
  type: object
+ maxItems: 32
  type: array
  x-kubernetes-list-map-keys:
  - type

diff --git a/internal/test/builder/v1beta2_transition.go b/internal/test/builder/v1beta2_transition.go
@@ -138,6 +138,7 @@ type Phase1ObjStatusV1Beta2 struct {
  // +optional
  // +listType=map
  // +listMapKey=type
+ // +kubebuilder:validation:MaxItems=32
  Conditions []metav1.Condition `json:"conditions,omitempty"`
 }
 
@@ -201,6 +202,7 @@ type Phase2ObjStatus struct {
  // +optional
  // +listType=map
  // +listMapKey=type
+ // +kubebuilder:validation:MaxItems=32
  Conditions []metav1.Condition `json:"conditions,omitempty"`
 
  // +optional
@@ -284,6 +286,7 @@ type Phase3ObjStatus struct {
  // +optional
  // +listType=map
  // +listMapKey=type
+ // +kubebuilder:validation:MaxItems=32
  Conditions []metav1.Condition `json:"conditions,omitempty"`
 }