Commit f270644
committed
Align and remove omitempty from databaseInstance
For adoption testing a ctlplane with disabled manila gets applied:
~~~
manila:
enabled: false
template:
manilaAPI: {}
manilaScheduler: {}
manilaShares: {}
~~~
This fails with because the manila databaseInstance parameter has
omitempty specified:
~~~
$ oc apply -f ./test_deployment.yaml
The OpenStackControlPlane "openstack" is invalid:
* spec.manila.template.databaseInstance: Required value
* <nil>: Invalid value: "null": some validation rules were not checked because the object was invalid; correct the existing errors to complete validation
~~~
This aligns the databaseInstance parameter and removes the omitempty
like it is speficied in all other service operators.
Signed-off-by: Martin Schuppert <mschuppert@redhat.com>1 parent 789370f commit f270644
3 files changed
Lines changed: 3 additions & 1 deletion
File tree
- api
- bases
- v1beta1
- config/crd/bases
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1780 | 1780 | | |
1781 | 1781 | | |
1782 | 1782 | | |
| 1783 | + | |
1783 | 1784 | | |
1784 | 1785 | | |
1785 | 1786 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
74 | 74 | | |
75 | 75 | | |
76 | 76 | | |
77 | | - | |
| 77 | + | |
78 | 78 | | |
79 | 79 | | |
80 | 80 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1780 | 1780 | | |
1781 | 1781 | | |
1782 | 1782 | | |
| 1783 | + | |
1783 | 1784 | | |
1784 | 1785 | | |
1785 | 1786 | | |
| |||
0 commit comments