Change controller_block_overhead to quantity

When specifying resources like disk sizes, the value is expected to
represent a quantity rather than an integer so users can set values like
"1Gi". Applying this to controller_block_overhead as well.

Signed-off-by: Arik Hadas <ahadas@redhat.com>

Author: ahadas

operator/roles/forkliftcontroller/templates/controller/deployment-controller.yml.j2

@@ -80,10 +80,8 @@ spec:
         - name: FILESYSTEM_OVERHEAD
           value: "{{ controller_filesystem_overhead }}"
 {% endif %}
-{% if controller_block_overhead is number %}
         - name: BLOCK_OVERHEAD
           value: "{{ controller_block_overhead }}"
-{% endif %}
 {% if controller_vsphere_incremental_backup|bool %}
         - name: FEATURE_VSPHERE_INCREMENTAL_BACKUP
           value: "true"

pkg/controller/plan/util/utils.go

@@ -27,7 +27,7 @@ func CalculateSpaceWithOverhead(requestedSpace int64, volumeMode *core.Persisten
 	if *volumeMode == core.PersistentVolumeFilesystem {
 		spaceWithOverhead = int64(math.Ceil(float64(alignedSize) / (1 - float64(settings.Settings.FileSystemOverhead)/100)))
 	} else {
-		spaceWithOverhead = alignedSize + int64(settings.Settings.BlockOverhead)
+		spaceWithOverhead = alignedSize + settings.Settings.BlockOverhead
 	}
 	return spaceWithOverhead
 }

pkg/settings/BUILD.bazel

@@ -18,5 +18,6 @@ go_library(
     deps = [
         "//pkg/lib/error",
         "//pkg/lib/logging",
+        "//vendor/k8s.io/apimachinery/pkg/api/resource",
     ],
 )

pkg/settings/migration.go

@@ -6,6 +6,7 @@ import (
 	"strings"
 
 	liberr "github.com/konveyor/forklift-controller/pkg/lib/error"
+	"k8s.io/apimachinery/pkg/api/resource"
 )
 
 // Environment variables.
@@ -47,7 +48,7 @@ type Migration struct {
 	// FileSystem overhead in percantage
 	FileSystemOverhead int
 	// Block fixed overhead size
-	BlockOverhead int
+	BlockOverhead int64
 }
 
 // Load settings.
@@ -88,8 +89,12 @@ func (r *Migration) Load() (err error) {
 	if r.FileSystemOverhead, err = getNonNegativeEnvLimit(FileSystemOverhead, 10); err != nil {
 		return liberr.Wrap(err)
 	}
-	if r.BlockOverhead, err = getNonNegativeEnvLimit(BlockOverhead, 0); err != nil {
-		return liberr.Wrap(err)
+	if overhead, ok := os.LookupEnv(BlockOverhead); ok {
+		if quantity, err := resource.ParseQuantity(overhead); err != nil {
+			return liberr.Wrap(err)
+		} else if r.BlockOverhead, ok = quantity.AsInt64(); !ok {
+			return fmt.Errorf("Block overhead is invalid: %s", overhead)
+		}
 	}
 
 	return