Allows to set disk image size.

Author: ser-io

tools/baseimage/cmd/create_gce_x86_64_fixed_kernel/main.go

@@ -70,7 +70,7 @@ func createImageMain(project, zone, linuxImageDeb string) error {
 		}
 	}()
 	log.Println("creating disk...")
-	disk, err := h.CreateDisk(debianSourceImageProject, debianSourceImage, attachedDiskName)
+	disk, err := h.CreateDisk(debianSourceImageProject, debianSourceImage, attachedDiskName, gce.CreateDiskOpts{})
 	if err != nil {
 		return fmt.Errorf("failed to create disk: %w", err)
 	}

tools/baseimage/cmd/create_gce_x86_64_image/main.go

@@ -71,7 +71,7 @@ func createImageMain(project, zone string, opts createImageOpts) error {
 		}
 	}()
 	log.Println("creating disk...")
-	disk, err := h.CreateDisk(opts.SourceImageProject, opts.SourceImage, attachedDiskName)
+	disk, err := h.CreateDisk(opts.SourceImageProject, opts.SourceImage, attachedDiskName, gce.CreateDiskOpts{})
 	if err != nil {
 		return fmt.Errorf("failed to create disk: %w", err)
 	}

tools/baseimage/cmd/gce_install_cuttlefish_packages/main.go

@@ -82,6 +82,7 @@ func installCuttlefishDebs(project, zone, insName string, debSrcs []string) erro
 		dstname string
 		content string
 	}{
+		{"fill_available_disk_space.sh", scripts.FillAvailableDiskSpace},
 		{"mount_attached_disk.sh", scripts.MountAttachedDisk},
 		{"install.sh", scripts.InstallCuttlefishPackages},
 	}
@@ -133,7 +134,9 @@ func amendImageMain(project, zone string, opts amendImageOpts) error {
 	attachedDiskName := fmt.Sprintf("%s-attached-disk", insName)
 
 	log.Println("creating disk...")
-	_, err = h.CreateDisk(opts.SourceImageProject, opts.SourceImage, attachedDiskName)
+	createDiskOpts := gce.CreateDiskOpts{SizeGb: 32}
+	_, err = h.CreateDisk(
+		opts.SourceImageProject, opts.SourceImage, attachedDiskName, createDiskOpts)
 	if err != nil {
 		return fmt.Errorf("failed to create disk: %w", err)
 	}

tools/baseimage/pkg/gce/helper.go

@@ -44,10 +44,15 @@ func NewGceHelper(project, zone string) (*GceHelper, error) {
 	}, nil
 }
 
-func (h *GceHelper) CreateDisk(sourceImageProject, sourceImage, name string) (*compute.Disk, error) {
+type CreateDiskOpts struct {
+	SizeGb int64
+}
+
+func (h *GceHelper) CreateDisk(sourceImageProject, sourceImage, name string, opts CreateDiskOpts) (*compute.Disk, error) {
 	payload := &compute.Disk{
 		Name:        name,
 		SourceImage: fmt.Sprintf("projects/%s/global/images/%s", sourceImageProject, sourceImage),
+		SizeGb:      opts.SizeGb,
 	}
 	op, err := h.Service.Disks.Insert(h.Project, h.Zone, payload).Do()
 	if err != nil {

tools/baseimage/pkg/gce/scripts/scripts.go

@@ -172,6 +172,19 @@ chmod a+x NVIDIA-Linux-${nvidia_arch}-${nvidia_version}.run
 NVIDIA-Linux-${nvidia_arch}-${nvidia_version}/nvidia-installer --silent --no-install-compat32-libs --no-backup --no-wine-files --install-libglvnd --dkms -k "${kmodver}"
 `
 
+const FillAvailableDiskSpace = `#!/usr/bin/env bash
+set -o errexit -o nounset -o pipefail
+
+sudo apt update
+
+sudo apt install -y cloud-utils
+sudo apt install -y cloud-guest-utils
+sudo apt install -y fdisk
+sudo growpart /dev/sdb 1 || /bin/true
+sudo e2fsck -f -y /dev/sdb1 || /bin/true
+sudo resize2fs /dev/sdb1
+`
+
 const InstallCuttlefishPackages = `#!/usr/bin/env bash
 set -o errexit -o nounset -o pipefail
 
@@ -180,6 +193,8 @@ if [[ $# -eq 0 ]] ; then
   exit 1
 fi
 
+./fill_available_disk_space.sh
+
 ./mount_attached_disk.sh
 
 kmodver_begin=$(sudo chroot /mnt/image/ /usr/bin/dpkg -s linux-image-cloud-amd64 | grep ^Depends: | \