Merge pull request #416 from openshift-cherrypick-robot/cherry-pick-412-to-18.0-fr1

openshift-merge-bot[bot] · web-flow · commit 248c7edb4442 · 2024-11-19T14:49:14.000Z
[18.0-fr1] Change apiTimeout type to Optional
diff --git a/api/bases/octavia.openstack.org_octavias.yaml b/api/bases/octavia.openstack.org_octavias.yaml
@@ -1388,7 +1388,6 @@ spec:
                 type: string
             required:
             - apacheContainerImage
-            - apiTimeout
             - databaseInstance
             - octaviaAPI
             - octaviaNetworkAttachment
diff --git a/api/v1beta1/octavia_types.go b/api/v1beta1/octavia_types.go
@@ -204,7 +204,7 @@ type OctaviaSpecBase struct {
 	// Apache Container Image URL
 	ApacheContainerImage string `json:"apacheContainerImage"`
 
-	// +kubebuilder:validation:Required
+	// +kubebuilder:validation:Optional
 	// +kubebuilder:default=120
 	// Octavia API timeout
 	APITimeout int `json:"apiTimeout"`
diff --git a/config/crd/bases/octavia.openstack.org_octavias.yaml b/config/crd/bases/octavia.openstack.org_octavias.yaml
@@ -1388,7 +1388,6 @@ spec:
                 type: string
             required:
             - apacheContainerImage
-            - apiTimeout
             - databaseInstance
             - octaviaAPI
             - octaviaNetworkAttachment
