Skip to content

add region, machine-type and worker-pool flags to image builder #36296

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
upodroid wants to merge 1 commit into
base: master
Choose a base branch
from
+29 −1
Open

add region, machine-type and worker-pool flags to image builder #36296

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions images/builder/cloudbuild.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,5 @@ substitutions:
images:
- 'gcr.io/$PROJECT_ID/image-builder:$_GIT_TAG'
- 'gcr.io/$PROJECT_ID/image-builder:latest'
tags:
- builder
28 changes: 27 additions & 1 deletion images/builder/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,9 @@ func getProjectID() (string, error) {
}

func getImageName(o options, tag string, config string) (string, error) {
// If you specify images in cloudbuild.yaml, your image won't be multi-arch
// and you should migrate to building with buildx, here is an example
// https://docs.cloud.google.com/dataflow/docs/guides/multi-architecture-container#use-cloud-build
var cloudbuildyamlFile CloudBuildYAMLFile
buf, _ := os.ReadFile(o.cloudbuildFile)
if err := yaml.Unmarshal(buf, &cloudbuildyamlFile); err != nil {
Expand Down Expand Up @@ -188,6 +191,18 @@ func runSingleJob(o options, jobName, uploaded, version string, subs map[string]
args = append(args, "--project", o.project)
}

if o.machineType != "" {
args = append(args, "--machine-type", o.machineType)
}

if o.workerPool != "" {
args = append(args, "--worker-pool", o.workerPool)
}

if o.region != "" {
args = append(args, "--region", o.region)
}

if o.scratchBucket != "" {
args = append(args, "--gcs-log-dir", o.scratchBucket+gcsLogsDir)
args = append(args, "--gcs-source-staging-dir", o.scratchBucket+gcsSourceDir)
Expand Down Expand Up @@ -306,6 +321,9 @@ func runBuildJobs(o options) []error {
return []error{err}
}
var imageName, _ = getImageName(o, tag, "")
if imageName != "" {
log.Printf("WARNING: the image built is not multi-arch, please amend this as soon as possible")
}
log.Printf("Successfully built image: %v \n", imageName)
return nil
}
Expand All @@ -325,7 +343,9 @@ func runBuildJobs(o options) []error {
log.Printf("Job %q failed: %v\n", job, err)
} else {
var imageName, _ = getImageName(o, tag, job)
log.Printf("Successfully built image: %v \n", imageName)
if imageName != "" {
log.Printf("WARNING: the image built is not multi-arch, please amend this as soon as possible")
}
log.Printf("Job %q completed.\n", job)
}
}(k, v)
Expand All @@ -348,6 +368,9 @@ type options struct {
envPassthrough string
pollingInterval int
suppressLogs bool
machineType string
workerPool string
region string

// withGitDirectory will include the .git directory when uploading the source to GCB
withGitDirectory bool
Expand Down Expand Up @@ -378,6 +401,9 @@ func parseFlags() options {
flag.BoolVar(&o.withGitDirectory, "with-git-dir", o.withGitDirectory, "If true, upload the .git directory to GCB, so we can e.g. get the git log and tag.")
flag.IntVar(&o.pollingInterval, "polling-interval", 10, "Amount of time in seconds to wait between polling build status. (default=10)")
flag.BoolVar(&o.suppressLogs, "suppress-logs", o.suppressLogs, "If true, build logs not streamed to stdout.")
flag.StringVar(&o.region, "region", "global", "If specified, use the given region for the GCB build, otherwise 'global' is used.")
flag.StringVar(&o.machineType, "machine-type", "", "If specified, use the given machine type for the GCB build.")
flag.StringVar(&o.workerPool, "worker-pool", "", "If specified, use the given worker pool for the GCB build.")

flag.Parse()

Expand Down