Skip to content

Commit ee4deb9

Browse files
committed
Mark controlNetworkName/storageRequest as optional
Also designateNetworkAttachment Jira: OSPRH-11777
1 parent ba17591 commit ee4deb9

6 files changed

+3
-12
lines changed

api/bases/designate.openstack.org_designatebackendbind9s.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -211,8 +211,6 @@ spec:
211211
type: string
212212
required:
213213
- containerImage
214-
- controlNetworkName
215-
- storageRequest
216214
type: object
217215
status:
218216
description: DesignateBackendbind9Status defines the observed state of

api/bases/designate.openstack.org_designates.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -630,8 +630,6 @@ spec:
630630
type: string
631631
required:
632632
- containerImage
633-
- controlNetworkName
634-
- storageRequest
635633
type: object
636634
designateCentral:
637635
description: DesignateCentral - Spec definition for the Central service
@@ -1496,7 +1494,6 @@ spec:
14961494
- designateBackendbind9
14971495
- designateCentral
14981496
- designateMdns
1499-
- designateNetworkAttachment
15001497
- designateProducer
15011498
- designateWorker
15021499
- rabbitMqClusterName

api/v1beta1/designate_types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ type DesignateSpecBase struct {
177177
// https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
178178
Resources corev1.ResourceRequirements `json:"resources,omitempty"`
179179

180-
// +kubebuilder:validation:Required
180+
// +kubebuilder:validation:Optional
181181
// +kubebuilder:default=designate
182182
// DesignateNetworkAttachment is a NetworkAttachment resource name for the Designate Control Network
183183
DesignateNetworkAttachment string `json:"designateNetworkAttachment"`

api/v1beta1/designatebackendbind9_types.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,14 +67,15 @@ type DesignateBackendbind9SpecBase struct {
6767
CustomBindOptions []string `json:"customBindOptions,omitempty"`
6868

6969
// +kubebuilder:default="designate"
70+
// +kubebuilder:validation:Optional
7071
// ControlNetworkName - specify which network attachment is to be used for control, notifys and zone transfers.
7172
ControlNetworkName string `json:"controlNetworkName"`
7273

7374
// +kubebuilder:validation:Optional
7475
// StorageClass
7576
StorageClass string `json:"storageClass,omitempty"`
7677

77-
// +kubebuilder:validation:Required
78+
// +kubebuilder:validation:Optional
7879
// StorageRequest
7980
StorageRequest string `json:"storageRequest"`
8081
}

config/crd/bases/designate.openstack.org_designatebackendbind9s.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -211,8 +211,6 @@ spec:
211211
type: string
212212
required:
213213
- containerImage
214-
- controlNetworkName
215-
- storageRequest
216214
type: object
217215
status:
218216
description: DesignateBackendbind9Status defines the observed state of

config/crd/bases/designate.openstack.org_designates.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -630,8 +630,6 @@ spec:
630630
type: string
631631
required:
632632
- containerImage
633-
- controlNetworkName
634-
- storageRequest
635633
type: object
636634
designateCentral:
637635
description: DesignateCentral - Spec definition for the Central service
@@ -1496,7 +1494,6 @@ spec:
14961494
- designateBackendbind9
14971495
- designateCentral
14981496
- designateMdns
1499-
- designateNetworkAttachment
15001497
- designateProducer
15011498
- designateWorker
15021499
- rabbitMqClusterName

0 commit comments

Comments
 (0)