Skip to content

Commit cf032b2

Browse files
Fernando Royoopenshift-cherrypick-robot
Fernando Royo
authored and
openshift-cherrypick-robot
committed
Change apiTimeout type to Optional
To keep backward compatibility with updates/upgrades of existing env, this parameter can not be type Required. Error msg on update env: message: 'error validating existing CRs against new CRD''s schema for "openstackcontrolplanes.core.openstack.org": error validating core.openstack.org/v1beta1, Kind=OpenStackControlPlane "openstack/controlplane": updated validation is too restrictive: [].spec.octavia.template.apiTimeout: Required value'
1 parent a0cc255 commit cf032b2

File tree

3 files changed

+1
-3
lines changed

3 files changed

+1
-3
lines changed

api/bases/octavia.openstack.org_octavias.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1388,7 +1388,6 @@ spec:
13881388
type: string
13891389
required:
13901390
- apacheContainerImage
1391-
- apiTimeout
13921391
- databaseInstance
13931392
- octaviaAPI
13941393
- octaviaNetworkAttachment

api/v1beta1/octavia_types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ type OctaviaSpecBase struct {
204204
// Apache Container Image URL
205205
ApacheContainerImage string `json:"apacheContainerImage"`
206206

207-
// +kubebuilder:validation:Required
207+
// +kubebuilder:validation:Optional
208208
// +kubebuilder:default=120
209209
// Octavia API timeout
210210
APITimeout int `json:"apiTimeout"`

config/crd/bases/octavia.openstack.org_octavias.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1388,7 +1388,6 @@ spec:
13881388
type: string
13891389
required:
13901390
- apacheContainerImage
1391-
- apiTimeout
13921391
- databaseInstance
13931392
- octaviaAPI
13941393
- octaviaNetworkAttachment

0 commit comments

Comments
 (0)