Add omitempty for ClusterRequest Timeout

openshift-kni · Sep 10, 2024 · c9b0237 · c9b0237
1 parent 0b7d344
commit c9b0237
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/api/v1alpha1/clusterrequest_types.go b/api/v1alpha1/clusterrequest_types.go
@@ -38,7 +38,7 @@ type ClusterRequestSpec struct {
 
 	ClusterTemplateInput ClusterTemplateInput `json:"clusterTemplateInput"`
 
-	Timeout Timeout `json:"timeout"`
+	Timeout Timeout `json:"timeout,omitempty"`
 }
 
 // ClusterTemplateInput provides the input data that follows the schema defined in the referenced ClusterTemplate.

diff --git a/bundle/manifests/oran.openshift.io_clusterrequests.yaml b/bundle/manifests/oran.openshift.io_clusterrequests.yaml
diff --git a/config/crd/bases/oran.openshift.io_clusterrequests.yaml b/config/crd/bases/oran.openshift.io_clusterrequests.yaml
@@ -90,7 +90,6 @@ spec:
             - clusterTemplateInput
             - clusterTemplateRef
             - site
-            - timeout
             type: object
           status:
             description: ClusterRequestStatus defines the observed state of ClusterRequest

diff --git a/config/samples/oran.openshift.io_v1alpha1_clusterrequest.yaml b/config/samples/oran.openshift.io_v1alpha1_clusterrequest.yaml
@@ -9,6 +9,10 @@ metadata:
     app.kubernetes.io/created-by: oran-o2ims
   name: clusterrequest-sample
 spec:
+  timeout:
+    clusterProvisioning: 80
+    configuration: 40
+    hardwareProvisioning: 60
   clusterTemplateRef: clustertemplate-sample
   clusterTemplateInput:
     clusterInstanceInput: