From a95e10142d0eab0ea0778405189af64fe4865744 Mon Sep 17 00:00:00 2001 From: Nadia Pinaeva Date: Fri, 16 Aug 2024 20:44:32 +0200 Subject: [PATCH] UDN: allow multiple conditions of different types to co-exist in the status. Signed-off-by: Nadia Pinaeva --- dist/templates/k8s.ovn.org_userdefinednetworks.yaml.j2 | 3 +++ go-controller/pkg/crd/userdefinednetwork/v1/types.go | 2 ++ 2 files changed, 5 insertions(+) diff --git a/dist/templates/k8s.ovn.org_userdefinednetworks.yaml.j2 b/dist/templates/k8s.ovn.org_userdefinednetworks.yaml.j2 index cdacc9cceed..321f97f935d 100644 --- a/dist/templates/k8s.ovn.org_userdefinednetworks.yaml.j2 +++ b/dist/templates/k8s.ovn.org_userdefinednetworks.yaml.j2 @@ -287,6 +287,9 @@ spec: - type type: object type: array + x-kubernetes-list-map-keys: + - type + x-kubernetes-list-type: map type: object required: - spec diff --git a/go-controller/pkg/crd/userdefinednetwork/v1/types.go b/go-controller/pkg/crd/userdefinednetwork/v1/types.go index d620cdf6336..a9a986c880c 100644 --- a/go-controller/pkg/crd/userdefinednetwork/v1/types.go +++ b/go-controller/pkg/crd/userdefinednetwork/v1/types.go @@ -225,5 +225,7 @@ type UserDefinedNetworkList struct { // UserDefinedNetworkStatus contains the observed status of the UserDefinedNetwork. type UserDefinedNetworkStatus struct { + // +listType=map + // +listMapKey=type Conditions []metav1.Condition `json:"conditions,omitempty"` }