Merge pull request ovn-kubernetes#4664 from npinaeva/udn-status

UDN: allow multiple conditions from different fieldManagers to co-exist in the status.
pperiyasamy · Aug 29, 2024 · 28b1db4 · 28b1db4
2 parents da1386b + a95e101
commit 28b1db4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git 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
@@ -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"`
 }