use metav1.Time

pingcap · Apr 15, 2020 · d5ba990 · d5ba990
1 parent cdac855
commit d5ba990
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 25 deletions.
diff --git a/docs/api-references/docs.md b/docs/api-references/docs.md
@@ -2413,7 +2413,9 @@ int32
 <td>
 <code>lastAutoScalingTimestamp</code></br>
 <em>
-string
+<a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.13/#time-v1-meta">
+Kubernetes meta/v1.Time
+</a>
 </em>
 </td>
 <td>

diff --git a/manifests/crd.yaml b/manifests/crd.yaml
@@ -10781,8 +10781,10 @@ spec:
                   format: int32
                   type: integer
                 lastAutoScalingTimestamp:
-                  description: LastAutoScalingTimestamp describes the last auto-scaling
-                    timestamp for the component(tidb/tikv)
+                  description: Time is a wrapper around time.Time which supports correct
+                    marshaling to YAML and JSON.  Wrappers are provided for many of
+                    the factory methods that the time package offers.
+                  format: date-time
                   type: string
                 metrics:
                   description: MetricsStatusList describes the metrics status in the
@@ -10826,8 +10828,10 @@ spec:
                   format: int32
                   type: integer
                 lastAutoScalingTimestamp:
-                  description: LastAutoScalingTimestamp describes the last auto-scaling
-                    timestamp for the component(tidb/tikv)
+                  description: Time is a wrapper around time.Time which supports correct
+                    marshaling to YAML and JSON.  Wrappers are provided for many of
+                    the factory methods that the time package offers.
+                  format: date-time
                   type: string
                 metrics:
                   description: MetricsStatusList describes the metrics status in the

diff --git a/pkg/apis/pingcap/v1alpha1/openapi_generated.go b/pkg/apis/pingcap/v1alpha1/openapi_generated.go
diff --git a/pkg/apis/pingcap/v1alpha1/tidbclusterautoscaler_types.go b/pkg/apis/pingcap/v1alpha1/tidbclusterautoscaler_types.go
@@ -185,7 +185,7 @@ type BasicAutoScalerStatus struct {
 	RecommendedReplicas *int32 `json:"recommendedReplicas,omitempty"`
 	// LastAutoScalingTimestamp describes the last auto-scaling timestamp for the component(tidb/tikv)
 	// +optional
-	LastAutoScalingTimestamp *string `json:"lastAutoScalingTimestamp,omitempty"`
+	LastAutoScalingTimestamp *metav1.Time `json:"lastAutoScalingTimestamp,omitempty"`
 }
 
 // +k8s:openapi-gen=true

diff --git a/pkg/apis/pingcap/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/pingcap/v1alpha1/zz_generated.deepcopy.go
diff --git a/pkg/autoscaler/autoscaler/autoscaler_manager.go b/pkg/autoscaler/autoscaler/autoscaler_manager.go
@@ -133,17 +133,18 @@ func (am *autoScalerManager) updateAutoScaling(oldTc *v1alpha1.TidbCluster,
 	if tac.Annotations == nil {
 		tac.Annotations = map[string]string{}
 	}
-	f := func(key string) (string, error) {
+	f := func(key string) (*time.Time, error) {
 		v, ok := tac.Annotations[key]
 		if ok {
 			ts, err := strconv.ParseInt(v, 10, 64)
 			if err != nil {
 				klog.Errorf("failed to convert label[%s] key to int64, err:%v", key, err)
-				return "", err
+				return nil, err
 			}
-			return time.Unix(ts, 0).Format(time.RFC3339), nil
+			t := time.Unix(ts, 0)
+			return &t, nil
 		}
-		return "", nil
+		return nil, nil
 	}
 
 	if tac.Spec.TiKV != nil {
@@ -152,8 +153,8 @@ func (am *autoScalerManager) updateAutoScaling(oldTc *v1alpha1.TidbCluster,
 		if err != nil {
 			return err
 		}
-		if len(lastTimestamp) > 0 {
-			tac.Status.TiKV.LastAutoScalingTimestamp = &lastTimestamp
+		if lastTimestamp != nil {
+			tac.Status.TiKV.LastAutoScalingTimestamp = &metav1.Time{Time: *lastTimestamp}
 		}
 	} else {
 		tac.Status.TiKV = nil
@@ -164,8 +165,8 @@ func (am *autoScalerManager) updateAutoScaling(oldTc *v1alpha1.TidbCluster,
 		if err != nil {
 			return err
 		}
-		if len(lastTimestamp) > 0 {
-			tac.Status.TiDB.LastAutoScalingTimestamp = &lastTimestamp
+		if lastTimestamp != nil {
+			tac.Status.TiDB.LastAutoScalingTimestamp = &metav1.Time{Time: *lastTimestamp}
 		}
 	} else {
 		tac.Status.TiDB = nil