⚠️ Add x-kubernetes unique validation for the Conditions list

kubernetes-sigs · Oct 2, 2024 · ee6aef0 · ee6aef0
1 parent f88d7ae
commit ee6aef0
Show file tree

Hide file tree

Showing 21 changed files with 65 additions and 0 deletions.
diff --git a/api/v1beta1/condition_types.go b/api/v1beta1/condition_types.go
@@ -89,6 +89,8 @@ type Condition struct {
 // ANCHOR: Conditions
 
 // Conditions provide observations of the operational state of a Cluster API resource.
+// +listType=map
+// +listMapKey=type
 type Conditions []Condition
 
 // ANCHOR_END: Conditions
diff --git a/bootstrap/kubeadm/config/crd/bases/bootstrap.cluster.x-k8s.io_kubeadmconfigs.yaml b/bootstrap/kubeadm/config/crd/bases/bootstrap.cluster.x-k8s.io_kubeadmconfigs.yaml
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_clusterclasses.yaml b/config/crd/bases/cluster.x-k8s.io_clusterclasses.yaml
diff --git a/config/crd/bases/cluster.x-k8s.io_clusters.yaml b/config/crd/bases/cluster.x-k8s.io_clusters.yaml
diff --git a/config/crd/bases/cluster.x-k8s.io_machinedeployments.yaml b/config/crd/bases/cluster.x-k8s.io_machinedeployments.yaml
diff --git a/config/crd/bases/cluster.x-k8s.io_machinehealthchecks.yaml b/config/crd/bases/cluster.x-k8s.io_machinehealthchecks.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/config/crd/bases/cluster.x-k8s.io_machines.yaml b/config/crd/bases/cluster.x-k8s.io_machines.yaml
diff --git a/config/crd/bases/cluster.x-k8s.io_machinesets.yaml b/config/crd/bases/cluster.x-k8s.io_machinesets.yaml
diff --git a/config/crd/bases/ipam.cluster.x-k8s.io_ipaddressclaims.yaml b/config/crd/bases/ipam.cluster.x-k8s.io_ipaddressclaims.yaml
diff --git a/config/crd/bases/runtime.cluster.x-k8s.io_extensionconfigs.yaml b/config/crd/bases/runtime.cluster.x-k8s.io_extensionconfigs.yaml
diff --git a/...rolplane/kubeadm/config/crd/bases/controlplane.cluster.x-k8s.io_kubeadmcontrolplanes.yaml b/...rolplane/kubeadm/config/crd/bases/controlplane.cluster.x-k8s.io_kubeadmcontrolplanes.yaml
diff --git a/internal/test/builder/crd/test.cluster.x-k8s.io_phase0obj.yaml b/internal/test/builder/crd/test.cluster.x-k8s.io_phase0obj.yaml
@@ -95,6 +95,9 @@ spec:
                   - type
                   type: object
                 type: array
+                x-kubernetes-list-map-keys:
+                - type
+                x-kubernetes-list-type: map
             type: object
         type: object
     served: 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
@@ -96,6 +96,9 @@ spec:
                   - type
                   type: object
                 type: array
+                x-kubernetes-list-map-keys:
+                - type
+                x-kubernetes-list-type: map
               v1beta2:
                 description: Phase1ObjStatusV1Beta2 defines the status.V1Beta2 of
                   a Phase1Obj.

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
@@ -164,6 +164,9 @@ spec:
                           - type
                           type: object
                         type: array
+                        x-kubernetes-list-map-keys:
+                        - type
+                        x-kubernetes-list-type: map
                     type: object
                 type: object
             type: object

diff --git a/...nfrastructure/docker/config/crd/bases/infrastructure.cluster.x-k8s.io_dockerclusters.yaml b/...nfrastructure/docker/config/crd/bases/infrastructure.cluster.x-k8s.io_dockerclusters.yaml
diff --git a/...structure/docker/config/crd/bases/infrastructure.cluster.x-k8s.io_dockermachinepools.yaml b/...structure/docker/config/crd/bases/infrastructure.cluster.x-k8s.io_dockermachinepools.yaml
diff --git a/...nfrastructure/docker/config/crd/bases/infrastructure.cluster.x-k8s.io_dockermachines.yaml b/...nfrastructure/docker/config/crd/bases/infrastructure.cluster.x-k8s.io_dockermachines.yaml
diff --git a/...structure/inmemory/config/crd/bases/infrastructure.cluster.x-k8s.io_inmemoryclusters.yaml b/...structure/inmemory/config/crd/bases/infrastructure.cluster.x-k8s.io_inmemoryclusters.yaml
diff --git a/...structure/inmemory/config/crd/bases/infrastructure.cluster.x-k8s.io_inmemorymachines.yaml b/...structure/inmemory/config/crd/bases/infrastructure.cluster.x-k8s.io_inmemorymachines.yaml