Remove all references to EphemeralStorage (rigdev#80)

cmd/rig/cmd/capsule/get_resources.go

@@ -47,7 +47,6 @@ func GetResources(ctx context.Context, cmd *cobra.Command, capsuleID CapsuleID,
 	t.AppendRows([]table.Row{
 		{"CPU", milliIntToString(uint64(requests.Cpu)), milliIntToString(uint64(limits.Cpu))},
 		{"Memory", intToByteString(requests.Memory), intToByteString(limits.Memory)},
-		{"Ephemeral Storage", intToByteString(requests.EphemeralStorage), intToByteString(limits.EphemeralStorage)},
 	})
 	cmd.Println(t.Render())
 

cmd/rig/cmd/capsule/set_resources.go

@@ -15,12 +15,10 @@ import (
 )
 
 var (
-	requestCPU       string
-	requestMemory    string
-	requestEphemeral string
-	limitCPU         string
-	limitMemory      string
-	limitEphemeral   string
+	requestCPU    string
+	requestMemory string
+	limitCPU      string
+	limitMemory   string
 )
 
 func setupSetResources(parent *cobra.Command) {
@@ -33,11 +31,9 @@ func setupSetResources(parent *cobra.Command) {
 
 	setResources.Flags().StringVar(&requestCPU, "request-cpu", "", "Minimum CPU cores per container")
 	setResources.Flags().StringVar(&requestMemory, "request-memory", "", "Minimum memory per container")
-	setResources.Flags().StringVar(&requestEphemeral, "request-ephemeral", "", "Minimum ephemeral storage per container")
 
 	setResources.Flags().StringVar(&limitCPU, "limit-cpu", "", "Maximum CPU cores per container")
 	setResources.Flags().StringVar(&limitMemory, "limit-memory", "", "Maximum memory per container")
-	setResources.Flags().StringVar(&limitEphemeral, "limit-ephemeral", "", "Maximum ephemeral storage per container")
 
 	parent.AddCommand(setResources)
 }
@@ -102,9 +98,8 @@ func setResourcesInteractive(curResources *capsule.Resources) error {
 
 		var cpu string
 		var mem string
-		var ephemeral string
 		for {
-			i, _, err := common.PromptSelect(fmt.Sprintf("Which resource %s to update", name), []string{"CPU", "Memory", "Ephemeral Storage", "Done"})
+			i, _, err := common.PromptSelect(fmt.Sprintf("Which resource %s to update", name), []string{"CPU", "Memory", "Done"})
 			if err != nil {
 				return err
 			}
@@ -121,10 +116,6 @@ func setResourcesInteractive(curResources *capsule.Resources) error {
 				name = "memory"
 				current = intToByteString(curR.Memory)
 				resourceString = &mem
-			case 2:
-				name = "ephemeral storage"
-				current = intToByteString(curR.EphemeralStorage)
-				resourceString = &ephemeral
 			default:
 				done = true
 			}
@@ -138,7 +129,7 @@ func setResourcesInteractive(curResources *capsule.Resources) error {
 				return err
 			}
 		}
-		if err := updateResources(curR, cpu, mem, ephemeral); err != nil {
+		if err := updateResources(curR, cpu, mem); err != nil {
 			return err
 		}
 	}
@@ -155,18 +146,18 @@ func intToByteString(i uint64) string {
 }
 
 func setResourcesFromFlags(curResources *capsule.Resources) error {
-	if err := updateResources(curResources.Requests, requestCPU, requestMemory, requestEphemeral); err != nil {
+	if err := updateResources(curResources.Requests, requestCPU, requestMemory); err != nil {
 		return err
 	}
 
-	if err := updateResources(curResources.Limits, limitCPU, limitMemory, limitEphemeral); err != nil {
+	if err := updateResources(curResources.Limits, limitCPU, limitMemory); err != nil {
 		return err
 	}
 
 	return nil
 }
 
-func updateResources(resources *capsule.ResourceList, cpu, mem, ephemeral string) error {
+func updateResources(resources *capsule.ResourceList, cpu, mem string) error {
 	if cpu != "" {
 		milliCPU, err := parseMilli(cpu)
 		if err != nil {
@@ -183,14 +174,6 @@ func updateResources(resources *capsule.ResourceList, cpu, mem, ephemeral string
 		resources.Memory = mem
 	}
 
-	if ephemeral != "" {
-		storage, err := parseBytes(ephemeral)
-		if err != nil {
-			return nil
-		}
-		resources.EphemeralStorage = storage
-	}
-
 	return nil
 }
 
@@ -217,6 +200,6 @@ func parseBytes(s string) (uint64, error) {
 }
 
 func allFlagsEmpty() bool {
-	return requestCPU == "" && requestMemory == "" && requestEphemeral == "" && limitCPU == "" && limitMemory == "" && limitEphemeral == ""
+	return requestCPU == "" && requestMemory == "" && limitCPU == "" && limitMemory == ""
 
 }

internal/client/k8s/upsert_capsule.go

@@ -390,9 +390,6 @@ func fillResourceList(r *capsule.ResourceList, list v1.ResourceList) {
 	if r.Memory != 0 {
 		list[v1.ResourceMemory] = *resource.NewQuantity(int64(r.Memory), resource.DecimalSI)
 	}
-	if r.EphemeralStorage != 0 {
-		list[v1.ResourceEphemeralStorage] = *resource.NewQuantity(int64(r.EphemeralStorage), resource.DecimalSI)
-	}
 }
 
 func createContainer(capsuleName string, cc *cluster.Capsule) *acsv1.ContainerApplyConfiguration {
@@ -435,8 +432,7 @@ func createProxyContainer(capsuleName string, cc *cluster.Capsule) (*acsv1.Conta
 	rl := v1.ResourceList{
 		v1.ResourceCPU: resource.MustParse("500m"),
 		// TODO: validate that this limit is okay with regards to mounting configmaps and secrets as files.
-		v1.ResourceEphemeralStorage: resource.MustParse("0"),
-		v1.ResourceMemory:           resource.MustParse("128Mi"),
+		v1.ResourceMemory: resource.MustParse("128Mi"),
 	}
 
 	con := acsv1.Container().

pkg/utils/defaults.go

@@ -10,9 +10,8 @@ var DefaultResources = &capsule.Resources{
 		Memory: 512_000_000,
 	},
 	Limits: &capsule.ResourceList{
-		Cpu:              0,
-		Memory:           0,
-		EphemeralStorage: 0,
+		Cpu:    0,
+		Memory: 0,
 	},
 }
 
@@ -35,7 +34,4 @@ func feedDefaultResourceList(r, defaultR *capsule.ResourceList) {
 	if r.Memory == 0 {
 		r.Memory = defaultR.Memory
 	}
-	if r.EphemeralStorage == 0 {
-		r.EphemeralStorage = defaultR.EphemeralStorage
-	}
 }