* Remove machine leasing for updates on deploy, since leases prevent …

…direct updates * Add Vm size configuration to fly.toml * Rename 'version' to 'platform_version' in fly.toml to avoid confusion with release versions
superfly · Jun 26, 2022 · 98ce2d2 · 98ce2d2
1 parent 5cabbf3
commit 98ce2d2
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 35 deletions.
diff --git a/internal/app/app.go b/internal/app/app.go
@@ -58,19 +58,24 @@ func LoadConfig(path string) (cfg *Config, err error) {
 
 // Config wraps the properties of app configuration.
 type Config struct {
-	AppName       string                 `toml:"app,omitempty"`
-	Build         *Build                 `toml:"build,omitempty"`
-	Version       int                    `toml:"version,omitempty"`
-	Count         int                    `toml:"count,omitempty"`
-	PrimaryRegion string                 `toml:"primary_region,omitempty"`
-	HttpService   *HttpService           `toml:"http_service,omitempty"`
-	Definition    map[string]interface{} `toml:"definition,omitempty"`
-	Path          string                 `toml:"path,omitempty"`
+	AppName         string                 `toml:"app,omitempty"`
+	Build           *Build                 `toml:"build,omitempty"`
+	PlatformVersion int                    `toml:"platform_version,omitempty"`
+	PrimaryRegion   string                 `toml:"primary_region,omitempty"`
+	HttpService     *HttpService           `toml:"http_service,omitempty"`
+	VM              *VM                    `toml:"vm,omitempty"`
+	Definition      map[string]interface{} `toml:"definition,omitempty"`
+	Path            string                 `toml:"path,omitempty"`
 }
 type HttpService struct {
 	InternalPort int  `json:"internal_port" toml:"internal_port" validate:"required,numeric"`
 	ForceHttps   bool `toml:"force_https"`
 }
+type VM struct {
+	CpuCount int `toml:"cpu_count,omitempty"`
+	Memory   int `toml:"memory,omitempty"`
+}
+
 type Build struct {
 	Builder    string
 	Args       map[string]string
@@ -127,7 +132,7 @@ func (c *Config) unmarshalTOML(file *os.File) (err error) {
 	// Config version 2 is for machines apps, with explicit structs for the whole config.
 	// Config version 1 is for nomad apps, for which most values are unmarshalled differently.
 	if _, err = toml.NewDecoder(file).Decode(&c); err == nil {
-		if c.Version < MachinesVersion {
+		if c.PlatformVersion < MachinesVersion {
 			file.Seek(0, io.SeekStart)
 			_, err = toml.NewDecoder(file).Decode(&data)
 			if err != nil {
@@ -218,7 +223,7 @@ func (c *Config) marshalTOML(w io.Writer) error {
 	fmt.Fprintf(w, "# fly.toml file generated for %s on %s\n\n", c.AppName, time.Now().Format(time.RFC3339))
 
 	// For machines apps, encode and write directly, bypassing custom marshalling
-	if c.Version > 1 {
+	if c.PlatformVersion > NomadVersion {
 		encoder.Encode(&c)
 		_, err := b.WriteTo(w)
 		return err

diff --git a/internal/command/deploy/deploy.go b/internal/command/deploy/deploy.go
@@ -105,7 +105,7 @@ func DeployWithConfig(ctx context.Context, appConfig *app.Config) (err error) {
 	var release *api.Release
 	var releaseCommand *api.ReleaseCommand
 
-	if appConfig.Version >= app.MachinesVersion {
+	if appConfig.PlatformVersion >= app.MachinesVersion {
 		return createMachinesRelease(ctx, appConfig, img)
 	} else {
 		release, releaseCommand, err = createRelease(ctx, appConfig, img)

diff --git a/internal/command/deploy/machines.go b/internal/command/deploy/machines.go
@@ -60,6 +60,22 @@ func createMachinesRelease(ctx context.Context, config *app.Config, img *imgsrc.
 			},
 		}
 	}
+	machineGuest := &api.MachineGuest{
+		CPUs:     1,
+		CPUKind:  "shared",
+		MemoryMB: 256,
+	}
+
+	if config.VM != nil {
+		if config.VM.CpuCount > 0 {
+			machineGuest.CPUs = config.VM.CpuCount
+		}
+		if config.VM.Memory > 0 {
+			machineGuest.MemoryMB = config.VM.Memory
+		}
+	}
+
+	machineConfig.Guest = machineGuest
 
 	err = config.Validate()
 
@@ -81,35 +97,16 @@ func createMachinesRelease(ctx context.Context, config *app.Config, img *imgsrc.
 	}
 
 	if len(machines) > 0 {
-		ttl := api.IntPointer(40)
-
-		for _, machine := range machines {
-			fmt.Fprintf(io.Out, "Leasing VM %s with TTL %d\n", machine.ID, ttl)
-			lease, err := flapsClient.GetLease(ctx, machine.ID, ttl)
-
-			if err != nil {
-				return err
-			}
-
-			machine.LeaseNonce = lease.Data.Nonce
-		}
 
 		for _, machine := range machines {
 
 			fmt.Fprintf(io.Out, "Updating VM %s\n", machine.ID)
 			launchInput.ID = machine.ID
-			flapsClient.Update(ctx, launchInput)
-
-		}
-
-		for _, machine := range machines {
-			fmt.Fprintf(io.Out, "Releasing VM %s with nonce %s\n", machine.ID, machine.LeaseNonce)
-
-			err = flapsClient.ReleaseLease(ctx, machine.ID, machine.LeaseNonce)
-
+			_, err = flapsClient.Update(ctx, launchInput)
 			if err != nil {
-				fmt.Fprintf(io.Out, "Could not release lease %s on machine %s. Error: %s, Continuing.", machine.LeaseNonce, machine.ID, err)
+				return err
 			}
+
 		}
 
 		fmt.Fprintln(io.Out)

diff --git a/internal/command/machine/launch.go b/internal/command/machine/launch.go
@@ -127,14 +127,19 @@ func run(ctx context.Context) (err error) {
 
 	// TODO: Handle imported fly.toml config
 
-	// Setup new fly.toml config file
+	// Setup new fly.toml config file with default values
 
 	appConfig := app.NewConfig()
 
 	// Config version 2 is for machine apps
-	appConfig.Version = app.MachinesVersion
+	appConfig.PlatformVersion = app.MachinesVersion
 	appConfig.AppName = createdApp.Name
 
+	appConfig.VM = &app.VM{
+		CpuCount: 1,
+		Memory:   256,
+	}
+
 	// Launch in the specified region, or when not specified, in the nearest region
 	regionCode := flag.GetString(ctx, "region")