From ee4deb984cee260395d97a1d7e7c83c16790930d Mon Sep 17 00:00:00 2001
From: Dan Prince <dprince@redhat.com>
Date: Tue, 19 Nov 2024 16:31:44 -0500
Subject: [PATCH] Mark controlNetworkName/storageRequest as optional

Also designateNetworkAttachment

Jira: OSPRH-11777
---
 api/bases/designate.openstack.org_designatebackendbind9s.yaml  | 2 --
 api/bases/designate.openstack.org_designates.yaml              | 3 ---
 api/v1beta1/designate_types.go                                 | 2 +-
 api/v1beta1/designatebackendbind9_types.go                     | 3 ++-
 .../bases/designate.openstack.org_designatebackendbind9s.yaml  | 2 --
 config/crd/bases/designate.openstack.org_designates.yaml       | 3 ---
 6 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/api/bases/designate.openstack.org_designatebackendbind9s.yaml b/api/bases/designate.openstack.org_designatebackendbind9s.yaml
index 787099e2..5ae3ee87 100644
--- a/api/bases/designate.openstack.org_designatebackendbind9s.yaml
+++ b/api/bases/designate.openstack.org_designatebackendbind9s.yaml
@@ -211,8 +211,6 @@ spec:
                 type: string
             required:
             - containerImage
-            - controlNetworkName
-            - storageRequest
             type: object
           status:
             description: DesignateBackendbind9Status defines the observed state of
diff --git a/api/bases/designate.openstack.org_designates.yaml b/api/bases/designate.openstack.org_designates.yaml
index 53591705..74ef82c2 100644
--- a/api/bases/designate.openstack.org_designates.yaml
+++ b/api/bases/designate.openstack.org_designates.yaml
@@ -630,8 +630,6 @@ spec:
                     type: string
                 required:
                 - containerImage
-                - controlNetworkName
-                - storageRequest
                 type: object
               designateCentral:
                 description: DesignateCentral - Spec definition for the Central service
@@ -1496,7 +1494,6 @@ spec:
             - designateBackendbind9
             - designateCentral
             - designateMdns
-            - designateNetworkAttachment
             - designateProducer
             - designateWorker
             - rabbitMqClusterName
diff --git a/api/v1beta1/designate_types.go b/api/v1beta1/designate_types.go
index 3d9c3853..8951db8f 100644
--- a/api/v1beta1/designate_types.go
+++ b/api/v1beta1/designate_types.go
@@ -177,7 +177,7 @@ type DesignateSpecBase struct {
 	// https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
 	Resources corev1.ResourceRequirements `json:"resources,omitempty"`
 
-	// +kubebuilder:validation:Required
+	// +kubebuilder:validation:Optional
 	// +kubebuilder:default=designate
 	// DesignateNetworkAttachment is a NetworkAttachment resource name for the Designate Control Network
 	DesignateNetworkAttachment string `json:"designateNetworkAttachment"`
diff --git a/api/v1beta1/designatebackendbind9_types.go b/api/v1beta1/designatebackendbind9_types.go
index c669f0f6..16183589 100644
--- a/api/v1beta1/designatebackendbind9_types.go
+++ b/api/v1beta1/designatebackendbind9_types.go
@@ -67,6 +67,7 @@ type DesignateBackendbind9SpecBase struct {
 	CustomBindOptions []string `json:"customBindOptions,omitempty"`
 
 	// +kubebuilder:default="designate"
+	// +kubebuilder:validation:Optional
 	// ControlNetworkName - specify which network attachment is to be used for control, notifys and zone transfers.
 	ControlNetworkName string `json:"controlNetworkName"`
 
@@ -74,7 +75,7 @@ type DesignateBackendbind9SpecBase struct {
 	// StorageClass
 	StorageClass string `json:"storageClass,omitempty"`
 
-	// +kubebuilder:validation:Required
+	// +kubebuilder:validation:Optional
 	// StorageRequest
 	StorageRequest string `json:"storageRequest"`
 }
diff --git a/config/crd/bases/designate.openstack.org_designatebackendbind9s.yaml b/config/crd/bases/designate.openstack.org_designatebackendbind9s.yaml
index 787099e2..5ae3ee87 100644
--- a/config/crd/bases/designate.openstack.org_designatebackendbind9s.yaml
+++ b/config/crd/bases/designate.openstack.org_designatebackendbind9s.yaml
@@ -211,8 +211,6 @@ spec:
                 type: string
             required:
             - containerImage
-            - controlNetworkName
-            - storageRequest
             type: object
           status:
             description: DesignateBackendbind9Status defines the observed state of
diff --git a/config/crd/bases/designate.openstack.org_designates.yaml b/config/crd/bases/designate.openstack.org_designates.yaml
index 53591705..74ef82c2 100644
--- a/config/crd/bases/designate.openstack.org_designates.yaml
+++ b/config/crd/bases/designate.openstack.org_designates.yaml
@@ -630,8 +630,6 @@ spec:
                     type: string
                 required:
                 - containerImage
-                - controlNetworkName
-                - storageRequest
                 type: object
               designateCentral:
                 description: DesignateCentral - Spec definition for the Central service
@@ -1496,7 +1494,6 @@ spec:
             - designateBackendbind9
             - designateCentral
             - designateMdns
-            - designateNetworkAttachment
             - designateProducer
             - designateWorker
             - rabbitMqClusterName