Skip to content

Commit eebfdec

Browse files
Merge pull request #183 from Deydra71/add-kubebuilder-vladiations
Add missing kubebuilder validations
2 parents 336a127 + 996c1cc commit eebfdec

File tree

3 files changed

+24
-12
lines changed

3 files changed

+24
-12
lines changed

api/bases/barbican.openstack.org_barbicans.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ spec:
4545
description: BarbicanSpec defines the desired state of Barbican
4646
properties:
4747
barbicanAPI:
48-
description: BarbicanAPITemplate defines the input parameters for
49-
the Barbican API service
48+
description: BarbicanAPI - Spec definition for the API services of
49+
this Barbican deployment
5050
properties:
5151
containerImage:
5252
description: ContainerImage - Barbican Container Image URL (will
@@ -367,8 +367,8 @@ spec:
367367
- containerImage
368368
type: object
369369
barbicanKeystoneListener:
370-
description: BarbicanKeystoneListenerTemplate defines common Spec
371-
elements for the KeystoneListener process
370+
description: BarbicanKeystoneListener - Spec definition for the KeystoneListener
371+
service of this Barbican deployment
372372
properties:
373373
containerImage:
374374
description: ContainerImage - Barbican Container Image URL (will
@@ -472,8 +472,8 @@ spec:
472472
- containerImage
473473
type: object
474474
barbicanWorker:
475-
description: BarbicanWorkerTemplate defines common Spec elements for
476-
the Worker process
475+
description: BarbicanWorker - Spec definition for the Worker service
476+
of this Barbican deployment
477477
properties:
478478
containerImage:
479479
description: ContainerImage - Barbican Container Image URL (will

api/v1beta1/barbican_types.go

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,21 +42,33 @@ const (
4242
type BarbicanSpec struct {
4343
BarbicanSpecBase `json:",inline"`
4444

45+
// +kubebuilder:validation:Required
46+
// BarbicanAPI - Spec definition for the API services of this Barbican deployment
4547
BarbicanAPI BarbicanAPITemplate `json:"barbicanAPI"`
4648

49+
// +kubebuilder:validation:Required
50+
// BarbicanWorker - Spec definition for the Worker service of this Barbican deployment
4751
BarbicanWorker BarbicanWorkerTemplate `json:"barbicanWorker"`
4852

53+
// +kubebuilder:validation:Required
54+
// BarbicanKeystoneListener - Spec definition for the KeystoneListener service of this Barbican deployment
4955
BarbicanKeystoneListener BarbicanKeystoneListenerTemplate `json:"barbicanKeystoneListener"`
5056
}
5157

5258
// BarbicanSpecCore defines the desired state of Barbican, for use with the OpenStackControlplane CR (no containerImages)
5359
type BarbicanSpecCore struct {
5460
BarbicanSpecBase `json:",inline"`
5561

62+
// +kubebuilder:validation:Required
63+
// BarbicanAPI - Spec definition for the API services of this Barbican deployment
5664
BarbicanAPI BarbicanAPITemplateCore `json:"barbicanAPI"`
5765

66+
// +kubebuilder:validation:Required
67+
// BarbicanWorker - Spec definition for the Worker service of this Barbican deployment
5868
BarbicanWorker BarbicanWorkerTemplateCore `json:"barbicanWorker"`
5969

70+
// +kubebuilder:validation:Required
71+
// BarbicanKeystoneListener - Spec definition for the KeystoneListener service of this Barbican deployment
6072
BarbicanKeystoneListener BarbicanKeystoneListenerTemplateCore `json:"barbicanKeystoneListener"`
6173
}
6274

config/crd/bases/barbican.openstack.org_barbicans.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ spec:
4545
description: BarbicanSpec defines the desired state of Barbican
4646
properties:
4747
barbicanAPI:
48-
description: BarbicanAPITemplate defines the input parameters for
49-
the Barbican API service
48+
description: BarbicanAPI - Spec definition for the API services of
49+
this Barbican deployment
5050
properties:
5151
containerImage:
5252
description: ContainerImage - Barbican Container Image URL (will
@@ -367,8 +367,8 @@ spec:
367367
- containerImage
368368
type: object
369369
barbicanKeystoneListener:
370-
description: BarbicanKeystoneListenerTemplate defines common Spec
371-
elements for the KeystoneListener process
370+
description: BarbicanKeystoneListener - Spec definition for the KeystoneListener
371+
service of this Barbican deployment
372372
properties:
373373
containerImage:
374374
description: ContainerImage - Barbican Container Image URL (will
@@ -472,8 +472,8 @@ spec:
472472
- containerImage
473473
type: object
474474
barbicanWorker:
475-
description: BarbicanWorkerTemplate defines common Spec elements for
476-
the Worker process
475+
description: BarbicanWorker - Spec definition for the Worker service
476+
of this Barbican deployment
477477
properties:
478478
containerImage:
479479
description: ContainerImage - Barbican Container Image URL (will

0 commit comments

Comments
 (0)