fix(revert): revert "fix: empty string of backup.status.size"

This reverts commit fb0a416.

The original fix doesn't initialize backup.status.size to "0".

Longhorn 10358

Signed-off-by: Derek Su <derek.su@suse.com>

k8s/crds.yaml

@@ -970,7 +970,6 @@ spec:
                 description: The address of the replica that runs snapshot backup.
                 type: string
               size:
-                default: "0"
                 description: The snapshot size.
                 type: string
               snapshotCreatedAt:
@@ -999,8 +998,6 @@ spec:
               volumeSize:
                 description: The volume size.
                 type: string
-            required:
-            - size
             type: object
         type: object
     served: true

k8s/pkg/apis/longhorn/v1beta2/backup.go

@@ -84,7 +84,7 @@ type BackupStatus struct {
 	// +optional
 	BackupCreatedAt string `json:"backupCreatedAt"`
 	// The snapshot size.
-	// +kubebuilder:default="0"
+	// +optional
 	Size string `json:"size"`
 	// The labels of snapshot backup.
 	// +optional

upgrade/upgrade.go

@@ -31,7 +31,6 @@ import (
 	"github.com/longhorn/longhorn-manager/upgrade/v16xto170"
 	"github.com/longhorn/longhorn-manager/upgrade/v170to171"
 	"github.com/longhorn/longhorn-manager/upgrade/v17xto180"
-	"github.com/longhorn/longhorn-manager/upgrade/v18xto190"
 	"github.com/longhorn/longhorn-manager/upgrade/v1beta1"
 
 	longhorn "github.com/longhorn/longhorn-manager/k8s/pkg/apis/longhorn/v1beta2"
@@ -284,12 +283,6 @@ func doResourceUpgrade(namespace string, lhClient *lhclientset.Clientset, kubeCl
 			return err
 		}
 	}
-	if semver.Compare(lhVersionBeforeUpgrade, "v1.9.0") < 0 {
-		logrus.Info("Walking through the resource upgrade path v1.8.x to v1.9.0")
-		if err := v18xto190.UpgradeResources(namespace, lhClient, kubeClient, resourceMaps); err != nil {
-			return err
-		}
-	}
 	if err := upgradeutil.UpdateResources(namespace, lhClient, resourceMaps); err != nil {
 		return err
 	}
@@ -323,12 +316,6 @@ func doResourceUpgrade(namespace string, lhClient *lhclientset.Clientset, kubeCl
 			return err
 		}
 	}
-	if semver.Compare(lhVersionBeforeUpgrade, "v1.9.0") < 0 {
-		logrus.Info("Walking through the resource status upgrade path v1.8.x to v1.9.0")
-		if err := v18xto190.UpgradeResourcesStatus(namespace, lhClient, kubeClient, resourceMaps); err != nil {
-			return err
-		}
-	}
 	if err := upgradeutil.UpdateResourcesStatus(namespace, lhClient, resourceMaps); err != nil {
 		return err
 	}