Merge pull request #249 from dprince/api_fixes

Mark controlNetworkName/storageRequest as optional
openstack-k8s-operators · Nov 20, 2024 · 5151e76 · 5151e76
2 parents 9ce3c64 + ee4deb9
commit 5151e76
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 12 deletions.
diff --git 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
@@ -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
@@ -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
@@ -67,14 +67,15 @@ 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"`
 
 	// +kubebuilder:validation:Optional
 	// 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
@@ -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
@@ -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