chore(cloudbuild): add configurable source bucket

This pull request introduces a new configurable parameter for specifying a custom bucket. For example, the bucket name could follow the format `gs://[PROJECT_ID]_[builds/region]_cloudbuild`.
GoogleContainerTools · Jun 19, 2024 · a20542b · a20542b
1 parent 3967f5c
commit a20542b
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/docs-v2/content/en/schemas/v4beta11.json b/docs-v2/content/en/schemas/v4beta11.json
@@ -2041,6 +2041,11 @@
     },
     "GoogleCloudBuild": {
       "properties": {
+        "bucket": {
+          "type": "string",
+          "description": "specifies the Cloud Storage bucket to store the staged build sources.",
+          "x-intellij-html-description": "specifies the Cloud Storage bucket to store the staged build sources."
+        },
         "concurrency": {
           "type": "integer",
           "description": "how many artifacts can be built concurrently. 0 means \"no-limit\".",
@@ -2157,6 +2162,7 @@
         "gradleImage",
         "packImage",
         "koImage",
+        "bucket",
         "concurrency",
         "workerPool",
         "region",

diff --git a/pkg/skaffold/build/gcb/cloud_build.go b/pkg/skaffold/build/gcb/cloud_build.go
@@ -106,7 +106,12 @@ func (b *Builder) buildArtifactWithCloudBuild(ctx context.Context, out io.Writer
 	}
 	log.Entry(ctx).Debugf("project id set to %s", projectID)
 
-	cbBucket := fmt.Sprintf("%s%s", projectID, constants.GCSBucketSuffix)
+	cbBucket := b.Bucket
+	if cbBucket == "" {
+		cbBucket = fmt.Sprintf("%s%s", projectID, constants.GCSBucketSuffix)
+	}
+	log.Entry(ctx).Debugf("bucket set to %s", cbBucket)
+
 	buildObject := fmt.Sprintf("source/%s-%s.tar.gz", projectID, uuid.New().String())
 
 	if err := b.createBucketIfNotExists(ctx, c, projectID, cbBucket); err != nil {

diff --git a/pkg/skaffold/schema/latest/config.go b/pkg/skaffold/schema/latest/config.go
@@ -450,6 +450,9 @@ type GoogleCloudBuild struct {
 	// Defaults to `gcr.io/k8s-skaffold/skaffold`.
 	KoImage string `yaml:"koImage,omitempty"`
 
+	// Bucket specifies the Cloud Storage bucket to store the staged build sources.
+	Bucket string `yaml:"bucket,omitempty"`
+
 	// Concurrency is how many artifacts can be built concurrently. 0 means "no-limit".
 	// Defaults to `0`.
 	Concurrency int `yaml:"concurrency,omitempty"`