change BuildTime to BuildDuration

Signed-off-by: wanjunlei <wanjunlei@kubesphere.io>
wanjunlei · Jun 25, 2023 · fd732c7 · fd732c7
1 parent 0de0379
commit fd732c7
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 26 deletions.
diff --git a/apis/core/v1beta2/builder_types.go b/apis/core/v1beta2/builder_types.go
@@ -156,11 +156,11 @@ type BuilderOutput struct {
 
 // BuilderStatus defines the observed state of Builder
 type BuilderStatus struct {
-	Phase     string           `json:"phase,omitempty"`
-	State     string           `json:"state,omitempty"`
-	Reason    string           `json:"reason,omitempty"`
-	Message   string           `json:"message,omitempty"`
-	BuildTime *metav1.Duration `json:"buildTime,omitempty"`
+	Phase         string           `json:"phase,omitempty"`
+	State         string           `json:"state,omitempty"`
+	Reason        string           `json:"reason,omitempty"`
+	Message       string           `json:"message,omitempty"`
+	BuildDuration *metav1.Duration `json:"buildDuration,omitempty"`
 	// Associate resources.
 	ResourceRef map[string]string `json:"resourceRef,omitempty"`
 	// Output holds the results emitted from step definition of an output
@@ -182,7 +182,7 @@ type BuilderStatus struct {
 //+kubebuilder:printcolumn:name="Phase",type=string,JSONPath=`.status.phase`
 //+kubebuilder:printcolumn:name="State",type=string,JSONPath=`.status.state`
 //+kubebuilder:printcolumn:name="Reason",type=string,JSONPath=`.status.reason`
-//+kubebuilder:printcolumn:name="BuildTime",type=string,JSONPath=`.status.buildTime`
+//+kubebuilder:printcolumn:name="BuildDuration",type=string,JSONPath=`.status.buildDuration`
 //+kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp"
 
 // Builder is the Schema for the builders API

diff --git a/apis/core/v1beta2/function_types.go b/apis/core/v1beta2/function_types.go
@@ -144,7 +144,7 @@ type Condition struct {
 	LastSuccessfulResourceRef string           `json:"lastSuccessfulResourceRef,omitempty"`
 	ResourceHash              string           `json:"resourceHash,omitempty"`
 	Service                   string           `json:"service,omitempty"`
-	BuildTime                 *metav1.Duration `json:"buildTime,omitempty"`
+	BuildDuration             *metav1.Duration `json:"buildDuration,omitempty"`
 }
 
 type FunctionAddress struct {

diff --git a/apis/core/v1beta2/zz_generated.deepcopy.go b/apis/core/v1beta2/zz_generated.deepcopy.go
diff --git a/config/bundle.yaml b/config/bundle.yaml
@@ -188,8 +188,8 @@ spec:
     - jsonPath: .status.reason
       name: Reason
       type: string
-    - jsonPath: .status.buildTime
-      name: BuildTime
+    - jsonPath: .status.buildDuration
+      name: BuildDuration
       type: string
     - jsonPath: .metadata.creationTimestamp
       name: Age
@@ -346,7 +346,7 @@ spec:
             type: object
           status:
             properties:
-              buildTime:
+              buildDuration:
                 type: string
               message:
                 type: string
@@ -9367,7 +9367,7 @@ spec:
                 type: array
               build:
                 properties:
-                  buildTime:
+                  buildDuration:
                     type: string
                   lastSuccessfulResourceRef:
                     type: string
@@ -9460,7 +9460,7 @@ spec:
                 type: object
               serving:
                 properties:
-                  buildTime:
+                  buildDuration:
                     type: string
                   lastSuccessfulResourceRef:
                     type: string

diff --git a/config/crd/bases/core.openfunction.io_builders.yaml b/config/crd/bases/core.openfunction.io_builders.yaml
@@ -173,8 +173,8 @@ spec:
     - jsonPath: .status.reason
       name: Reason
       type: string
-    - jsonPath: .status.buildTime
-      name: BuildTime
+    - jsonPath: .status.buildDuration
+      name: BuildDuration
       type: string
     - jsonPath: .metadata.creationTimestamp
       name: Age
@@ -331,7 +331,7 @@ spec:
             type: object
           status:
             properties:
-              buildTime:
+              buildDuration:
                 type: string
               message:
                 type: string

diff --git a/config/crd/bases/core.openfunction.io_functions.yaml b/config/crd/bases/core.openfunction.io_functions.yaml
@@ -8193,7 +8193,7 @@ spec:
                 type: array
               build:
                 properties:
-                  buildTime:
+                  buildDuration:
                     type: string
                   lastSuccessfulResourceRef:
                     type: string
@@ -8286,7 +8286,7 @@ spec:
                 type: object
               serving:
                 properties:
-                  buildTime:
+                  buildDuration:
                     type: string
                   lastSuccessfulResourceRef:
                     type: string

diff --git a/controllers/core/builder_controller.go b/controllers/core/builder_controller.go
@@ -105,7 +105,7 @@ func (r *BuilderReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ct
 		builder.Status.State = openfunction.Timeout
 		builder.Status.Reason = openfunction.Timeout
 		builder.Status.Message = openfunction.Timeout
-		builder.Status.BuildTime = builder.Spec.Timeout
+		builder.Status.BuildDuration = builder.Spec.Timeout
 
 		if err := r.Status().Update(r.ctx, builder); err != nil {
 			log.Error(err, "Failed to update builder status")
@@ -179,7 +179,7 @@ func (r *BuilderReconciler) getBuilderResult(builder *openfunction.Builder, buil
 		builder.Status.Reason = reason
 		builder.Status.Message = message
 		if !builder.CreationTimestamp.IsZero() {
-			builder.Status.BuildTime = &metav1.Duration{
+			builder.Status.BuildDuration = &metav1.Duration{
 				Duration: metav1.Now().UTC().Sub(builder.CreationTimestamp.UTC()).Truncate(time.Second),
 			}
 		}
@@ -257,7 +257,7 @@ func (r *BuilderReconciler) buildTimeout(builder *openfunction.Builder) error {
 		b.Status.State = openfunction.Timeout
 		b.Status.Reason = openfunction.Timeout
 		b.Status.Message = openfunction.Timeout
-		b.Status.BuildTime = builder.Spec.Timeout
+		b.Status.BuildDuration = builder.Spec.Timeout
 		return r.Status().Update(r.ctx, b)
 	}
 

diff --git a/controllers/core/function_controller.go b/controllers/core/function_controller.go
@@ -153,7 +153,7 @@ func (r *FunctionReconciler) createBuilder(fn *openfunction.Function) error {
 	fn.Status.Build.State = ""
 	fn.Status.Build.Reason = ""
 	fn.Status.Build.Message = ""
-	fn.Status.Build.BuildTime = nil
+	fn.Status.Build.BuildDuration = nil
 	fn.Status.Build.ResourceRef = ""
 	if err := r.Status().Update(r.ctx, fn); err != nil {
 		log.Error(err, "Failed to reset function build status")
@@ -259,7 +259,7 @@ func (r *FunctionReconciler) updateFuncWithBuilderStatus(fn *openfunction.Functi
 		fn.Status.Build.State = builder.Status.State
 		fn.Status.Build.Reason = builder.Status.Reason
 		fn.Status.Build.Message = builder.Status.Message
-		fn.Status.Build.BuildTime = builder.Status.BuildTime
+		fn.Status.Build.BuildDuration = builder.Status.BuildDuration
 		// If build had complete, update function serving status.
 		if builder.Status.State == openfunction.Succeeded {
 			if builder.Status.Output != nil {