Add VolmueSize to Defaults section of AppInstanceStatus

tylerslaton · tylerslaton · commit c8c37967fa01 · 2023-10-03T18:14:14.000-04:00
Signed-off-by: tylerslaton &lt;mtslaton1@gmail.com&gt;
diff --git a/pkg/apis/internal.acorn.io/v1/appinstance.go b/pkg/apis/internal.acorn.io/v1/appinstance.go
@@ -6,6 +6,7 @@ import (
 	"strings"
 
 	corev1 "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
@@ -222,9 +223,10 @@ type AppStatusStaged struct {
 }
 
 type Defaults struct {
-	Volumes map[string]VolumeDefault `json:"volumes,omitempty"`
-	Memory  map[string]*int64        `json:"memory,omitempty"`
-	Region  string                   `json:"region,omitempty"`
+	VolumeSize *resource.Quantity       `json:"volumeSize,omitempty"`
+	Volumes    map[string]VolumeDefault `json:"volumes,omitempty"`
+	Memory     map[string]*int64        `json:"memory,omitempty"`
+	Region     string                   `json:"region,omitempty"`
 }
 
 type VolumeDefault struct {
diff --git a/pkg/apis/internal.acorn.io/v1/zz_generated.deepcopy.go b/pkg/apis/internal.acorn.io/v1/zz_generated.deepcopy.go
diff --git a/pkg/controller/defaults/defaults.go b/pkg/controller/defaults/defaults.go
@@ -3,7 +3,6 @@ package defaults
 import (
 	"github.com/acorn-io/baaah/pkg/router"
 	internalv1 "github.com/acorn-io/runtime/pkg/apis/internal.acorn.io/v1"
-	v1 "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"
 )
@@ -16,8 +15,8 @@ import (
 // calculating the defaults only when the generation changes, we can ensure that
 // updated defaults are only applied when an AppInstance is updated directly.
 func Calculate(req router.Request, resp router.Response) (err error) {
-	appInstance := req.Object.(*v1.AppInstance)
-	status := condition.Setter(appInstance, resp, v1.AppInstanceConditionDefaults)
+	appInstance := req.Object.(*internalv1.AppInstance)
+	status := condition.Setter(appInstance, resp, internalv1.AppInstanceConditionDefaults)
 
 	defer func() {
 		if err == nil {
@@ -57,5 +56,9 @@ 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/all-set-overwrite/expected.golden b/pkg/controller/defaults/testdata/memory/all-set-overwrite/expected.golden
@@ -50,6 +50,7 @@ status:
       left: 0
       oneimage: 0
     region: local
+    volumeSize: 10G
   namespace: app-created-namespace
   observedGeneration: 1
   staged:
diff --git a/pkg/controller/defaults/testdata/memory/all-set/expected.golden b/pkg/controller/defaults/testdata/memory/all-set/expected.golden
@@ -49,6 +49,7 @@ status:
       left: 0
       oneimage: 0
     region: local
+    volumeSize: 10G
   namespace: app-created-namespace
   observedGeneration: 1
   staged:
diff --git a/pkg/controller/defaults/testdata/memory/container/expected.golden b/pkg/controller/defaults/testdata/memory/container/expected.golden
@@ -49,6 +49,7 @@ status:
       left: 0
       oneimage: 0
     region: local
+    volumeSize: 10G
   namespace: app-created-namespace
   observedGeneration: 1
   staged:
diff --git a/pkg/controller/defaults/testdata/memory/job/expected.golden b/pkg/controller/defaults/testdata/memory/job/expected.golden
@@ -49,6 +49,7 @@ status:
       left: 0
       oneimage: 0
     region: local
+    volumeSize: 10G
   namespace: app-created-namespace
   observedGeneration: 1
   staged:
diff --git a/pkg/controller/defaults/testdata/memory/overwrite-acornfile-memory/expected.golden b/pkg/controller/defaults/testdata/memory/overwrite-acornfile-memory/expected.golden
@@ -50,6 +50,7 @@ status:
       left: 0
       oneimage: 0
     region: local
+    volumeSize: 10G
   namespace: app-created-namespace
   observedGeneration: 1
   staged:
diff --git a/pkg/controller/defaults/testdata/memory/sidecar/expected.golden b/pkg/controller/defaults/testdata/memory/sidecar/expected.golden
@@ -49,6 +49,7 @@ status:
       left: 0
       oneimage: 0
     region: local
+    volumeSize: 10G
   namespace: app-created-namespace
   observedGeneration: 1
   staged:
diff --git a/pkg/controller/defaults/testdata/memory/two-containers/expected.golden b/pkg/controller/defaults/testdata/memory/two-containers/expected.golden
@@ -51,6 +51,7 @@ status:
       oneimage: 0
       twoimage: 0
     region: local
+    volumeSize: 10G
   namespace: app-created-namespace
   observedGeneration: 1
   staged:
diff --git a/pkg/controller/defaults/testdata/memory/with-acornfile-memory/expected.golden b/pkg/controller/defaults/testdata/memory/with-acornfile-memory/expected.golden
@@ -48,6 +48,7 @@ status:
       left: 0
       oneimage: 0
     region: local
+    volumeSize: 10G
   namespace: app-created-namespace
   observedGeneration: 1
   staged:
diff --git a/pkg/controller/defaults/testdata/region/default/expected.golden b/pkg/controller/defaults/testdata/region/default/expected.golden
@@ -30,6 +30,7 @@ status:
       "": 0
       container-name: 0
     region: local
+    volumeSize: 10G
   namespace: app-created-namespace
   observedGeneration: 1
   staged:
diff --git a/pkg/controller/defaults/testdata/region/project-default-status/expected.golden b/pkg/controller/defaults/testdata/region/project-default-status/expected.golden
@@ -30,6 +30,7 @@ status:
       "": 0
       container-name: 0
     region: local
+    volumeSize: 10G
   namespace: app-created-namespace
   observedGeneration: 1
   staged:
diff --git a/pkg/controller/defaults/testdata/region/region-on-spec/expected.golden b/pkg/controller/defaults/testdata/region/region-on-spec/expected.golden
@@ -30,6 +30,7 @@ status:
     memory:
       "": 0
       container-name: 0
+    volumeSize: 10G
   namespace: app-created-namespace
   observedGeneration: 1
   staged:
diff --git a/pkg/controller/defaults/testdata/volumeclass/cluster-and-project-class-same-name/expected.golden b/pkg/controller/defaults/testdata/volumeclass/cluster-and-project-class-same-name/expected.golden
@@ -37,6 +37,7 @@ status:
       "": 0
       container-name: 0
     region: local
+    volumeSize: 10G
     volumes:
       foo:
         accessModes:
diff --git a/pkg/controller/defaults/testdata/volumeclass/volume-class-fill-cluster-default/expected.golden b/pkg/controller/defaults/testdata/volumeclass/volume-class-fill-cluster-default/expected.golden
@@ -36,6 +36,7 @@ status:
       "": 0
       container-name: 0
     region: local
+    volumeSize: 10G
     volumes:
       foo:
         accessModes:
diff --git a/pkg/controller/defaults/testdata/volumeclass/volume-class-fill-defaults-with-bind/expected.golden b/pkg/controller/defaults/testdata/volumeclass/volume-class-fill-defaults-with-bind/expected.golden
@@ -40,6 +40,7 @@ status:
       "": 0
       container-name: 0
     region: local
+    volumeSize: 10G
     volumes:
       foo:
         accessModes:
diff --git a/pkg/controller/defaults/testdata/volumeclass/volume-class-fill-defaults/expected.golden b/pkg/controller/defaults/testdata/volumeclass/volume-class-fill-defaults/expected.golden
@@ -37,6 +37,7 @@ status:
       "": 0
       container-name: 0
     region: local
+    volumeSize: 10G
     volumes:
       foo:
         accessModes:
diff --git a/pkg/controller/defaults/testdata/volumeclass/volume-class-fill-project-default/expected.golden b/pkg/controller/defaults/testdata/volumeclass/volume-class-fill-project-default/expected.golden
@@ -36,6 +36,7 @@ status:
       "": 0
       container-name: 0
     region: local
+    volumeSize: 10G
     volumes:
       foo:
         accessModes:
diff --git a/pkg/controller/defaults/testdata/volumeclass/volume-class-fill-size/expected.golden b/pkg/controller/defaults/testdata/volumeclass/volume-class-fill-size/expected.golden
@@ -39,6 +39,7 @@ status:
       "": 0
       container-name: 0
     region: local
+    volumeSize: 10G
     volumes:
       foo:
         size: 2Gi
diff --git a/pkg/controller/defaults/volumesize.go b/pkg/controller/defaults/volumesize.go
@@ -0,0 +1,19 @@
+package defaults
+
+import (
+	"context"
+
+	v1 "github.com/acorn-io/runtime/pkg/apis/internal.acorn.io/v1"
+	"github.com/acorn-io/z"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+)
+
+func addDefaultVolumeSize(ctx context.Context, c client.Client, appInstance *v1.AppInstance) error {
+	// Only set Defaults.VolumeSize once.
+	if appInstance.Status.Defaults.VolumeSize != nil {
+		return nil
+	}
+	defaultVolumeSize := z.Pointer(v1.DefaultSize.DeepCopy())
+	appInstance.Status.Defaults.VolumeSize = defaultVolumeSize
+	return nil
+}
diff --git a/pkg/openapi/generated/openapi_generated.go b/pkg/openapi/generated/openapi_generated.go

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@ import (`
`6`	`6`	`"strings"`
`7`	`7`
`8`	`8`	`corev1 "k8s.io/api/core/v1"`
	`9`	`+ "k8s.io/apimachinery/pkg/api/resource"`
`9`	`10`	`metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"`
`10`	`11`	`)`
`11`	`12`
`@@ -222,9 +223,10 @@ type AppStatusStaged struct {`
`222`	`223`	`}`
`223`	`224`
`224`	`225`	`type Defaults struct {`
`225`		- Volumes map[string]VolumeDefault `json:"volumes,omitempty"`
`226`		- Memory map[string]*int64 `json:"memory,omitempty"`
`227`		- Region string `json:"region,omitempty"`
	`226`	+ VolumeSize *resource.Quantity `json:"volumeSize,omitempty"`
	`227`	+ Volumes map[string]VolumeDefault `json:"volumes,omitempty"`
	`228`	+ Memory map[string]*int64 `json:"memory,omitempty"`
	`229`	+ Region string `json:"region,omitempty"`
`228`	`230`	`}`
`229`	`231`
`230`	`232`	`type VolumeDefault struct {`