Make ServiceNetwork optional in IPSetReservration

jira: https://issues.redhat.com/browse/OSPRH-11679 Signed-off-by: rabi <[email protected]>
openstack-k8s-operators · Nov 18, 2024 · c1a72fe · c1a72fe
1 parent 47b4c2e
commit c1a72fe
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/apis/bases/network.openstack.org_ipsets.yaml b/apis/bases/network.openstack.org_ipsets.yaml
@@ -195,7 +195,6 @@ spec:
                   - address
                   - dnsDomain
                   - network
-                  - serviceNetwork
                   - subnet
                   type: object
                 type: array

diff --git a/apis/network/v1beta1/ipset_types.go b/apis/network/v1beta1/ipset_types.go
@@ -83,14 +83,15 @@ type IPSetReservation struct {
 	// DNSDomain of the subnet
 	DNSDomain string `json:"dnsDomain"`
 
+	// +kubebuilder:validation:Optional
 	// ServiceNetwork mapping
-	ServiceNetwork ServiceNetNameStr `json:"serviceNetwork"`
+	ServiceNetwork ServiceNetNameStr `json:"serviceNetwork" optional:"true"`
 }
 
 // IPSetStatus defines the observed state of IPSet
 type IPSetStatus struct {
 	// Reservation
-	Reservation []IPSetReservation `json:"reservations,omitempty" optional:"true"`
+	Reservation []IPSetReservation `json:"reservations,omitempty"`
 
 	// Conditions
 	Conditions condition.Conditions `json:"conditions,omitempty" optional:"true"`

diff --git a/config/crd/bases/network.openstack.org_ipsets.yaml b/config/crd/bases/network.openstack.org_ipsets.yaml
@@ -195,7 +195,6 @@ spec:
                   - address
                   - dnsDomain
                   - network
-                  - serviceNetwork
                   - subnet
                   type: object
                 type: array