Always set the defaults.VolumeSize if its nil

Signed-off-by: tylerslaton <[email protected]>
cjellick · Oct 5, 2023 · f5b8da7 · f5b8da7
1 parent 53caa0d
commit f5b8da7
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 24 deletions.
diff --git a/pkg/controller/defaults/defaults.go b/pkg/controller/defaults/defaults.go
@@ -5,6 +5,7 @@ import (
 	internalv1 "github.com/acorn-io/runtime/pkg/apis/internal.acorn.io/v1"
 	"github.com/acorn-io/runtime/pkg/condition"
 	"github.com/acorn-io/runtime/pkg/config"
+	"github.com/acorn-io/z"
 )
 
 // Calculate is a handler that sets the defaults for an AppInstance to its status if
@@ -29,6 +30,11 @@ func Calculate(req router.Request, resp router.Response) (err error) {
 			err = nil
 		}
 	}()
+
+	if appInstance.Status.Defaults.VolumeSize == nil {
+		appInstance.Status.Defaults.VolumeSize = z.Pointer(internalv1.DefaultSize.DeepCopy())
+	}
+
 	if appInstance.Generation != appInstance.Status.ObservedGeneration {
 		if err = calculate(req, appInstance); err != nil {
 			return err
@@ -56,9 +62,5 @@ func calculate(req router.Request, appInstance *internalv1.AppInstance) error {
 		return err
 	}
 
-	if err = addDefaultVolumeSize(req.Ctx, req.Client, appInstance); err != nil {
-		return err
-	}
-
 	return nil
 }
diff --git a/pkg/controller/defaults/testdata/memory/same-generation/expected.golden b/pkg/controller/defaults/testdata/memory/same-generation/expected.golden
@@ -48,6 +48,7 @@ status:
       "": 0
       left: 0
       oneimage: 0
+    volumeSize: 10G
   namespace: app-created-namespace
   staged:
     appImage:

diff --git a/pkg/controller/defaults/testdata/memory/two-ccc-defaults-should-error/expected.yaml b/pkg/controller/defaults/testdata/memory/two-ccc-defaults-should-error/expected.yaml
@@ -11,6 +11,7 @@ spec:
 status:
   defaults:
     region: local
+    volumeSize: 10G
   observedGeneration: 1
   namespace: app-created-namespace
   appImage:

diff --git a/pkg/controller/defaults/testdata/memory/two-pcc-defaults-should-error/expected.yaml b/pkg/controller/defaults/testdata/memory/two-pcc-defaults-should-error/expected.yaml
@@ -11,6 +11,7 @@ spec:
 status:
   defaults:
     region: local
+    volumeSize: 10G
   observedGeneration: 1
   namespace: app-created-namespace
   appImage:

diff --git a/pkg/controller/defaults/testdata/volumeclass/volume-class-defaults-same-gen/expected.golden b/pkg/controller/defaults/testdata/volumeclass/volume-class-defaults-same-gen/expected.golden
@@ -34,7 +34,8 @@ status:
     status: "True"
     success: true
     type: defaults
-  defaults: {}
+  defaults:
+    volumeSize: 10G
   namespace: app-created-namespace
   observedGeneration: 1
   staged:

diff --git a/pkg/controller/defaults/testdata/volumeclass/volume-class-two-cluster-defaults/expected.yaml b/pkg/controller/defaults/testdata/volumeclass/volume-class-two-cluster-defaults/expected.yaml
@@ -9,6 +9,7 @@ spec:
 status:
   defaults:
     region: local
+    volumeSize: 10G
   observedGeneration: 1
   namespace: app-created-namespace
   appImage:

diff --git a/pkg/controller/defaults/testdata/volumeclass/volume-class-two-project-defaults/expected.yaml b/pkg/controller/defaults/testdata/volumeclass/volume-class-two-project-defaults/expected.yaml
@@ -9,6 +9,7 @@ spec:
 status:
   defaults:
     region: local
+    volumeSize: 10G
   observedGeneration: 1
   namespace: app-created-namespace
   appImage:

diff --git a/pkg/controller/defaults/volumesize.go b/pkg/controller/defaults/volumesize.go