chore: improve the diff format for upgrade-to-v1 command (#595)

wangyelei · web-flow · commit 7b3b0438d9dd · 2025-03-27T17:42:18.000+08:00
diff --git a/pkg/cmd/cluster/upgrade_to_1.0.go b/pkg/cmd/cluster/upgrade_to_1.0.go
@@ -648,6 +648,8 @@ func (o *UpgradeToV1Options) Convert09ComponentDef(cluster *kbappsv1.Cluster,
 }
 
 func (o *UpgradeToV1Options) printDiff(clusterV1Alpha1 *kbappsv1alpha1.Cluster, clusterV1 *kbappsv1.Cluster) {
+	delete(clusterV1Alpha1.Annotations, corev1.LastAppliedConfigAnnotation)
+	delete(clusterV1.Annotations, corev1.LastAppliedConfigAnnotation)
 	clusterV1Alpha1.Status = kbappsv1alpha1.ClusterStatus{}
 	clusterV1Alpha1.ObjectMeta.ManagedFields = nil
 	clusterV1.Status = kbappsv1.ClusterStatus{}

Original file line number	Diff line number	Diff line change
`@@ -648,6 +648,8 @@ func (o UpgradeToV1Options) Convert09ComponentDef(cluster kbappsv1.Cluster,`
`648`	`648`	`}`
`649`	`649`
`650`	`650`	`func (o UpgradeToV1Options) printDiff(clusterV1Alpha1 kbappsv1alpha1.Cluster, clusterV1 *kbappsv1.Cluster) {`
	`651`	`+ delete(clusterV1Alpha1.Annotations, corev1.LastAppliedConfigAnnotation)`
	`652`	`+ delete(clusterV1.Annotations, corev1.LastAppliedConfigAnnotation)`
`651`	`653`	`clusterV1Alpha1.Status = kbappsv1alpha1.ClusterStatus{}`
`652`	`654`	`clusterV1Alpha1.ObjectMeta.ManagedFields = nil`
`653`	`655`	`clusterV1.Status = kbappsv1.ClusterStatus{}`