Support disk size and machine type for GCB

Signed-off-by: David Gageot <david@gageot.net>
GoogleContainerTools · Jul 11, 2018 · eccf398 · eccf398
1 parent a143d38
commit eccf398
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/examples/annotated-skaffold.yaml b/examples/annotated-skaffold.yaml
@@ -137,5 +137,8 @@ profiles:
   - name: gcb
     build:
       googleCloudBuild:
-        projectId: k8s-skaffold
         # Google Cloud Build's project id
+        projectId: k8s-skaffold
+        # diskSizeGb: 200
+        # machineType: "N1_HIGHCPU_8"|"N1_HIGHCPU_32"
+
diff --git a/pkg/skaffold/build/container_builder.go b/pkg/skaffold/build/container_builder.go
@@ -148,6 +148,10 @@ func (cb *GoogleCloudBuilder) buildArtifact(ctx context.Context, out io.Writer,
 			},
 		},
 		Images: []string{artifact.ImageName},
+		Options: &cloudbuild.BuildOptions{
+			DiskSizeGb:  cb.DiskSizeGb,
+			MachineType: cb.MachineType,
+		},
 	})
 	op, err := call.Context(ctx).Do()
 	if err != nil {

diff --git a/pkg/skaffold/schema/v1alpha2/config.go b/pkg/skaffold/schema/v1alpha2/config.go
@@ -85,7 +85,9 @@ type LocalBuild struct {
 // GoogleCloudBuild contains the fields needed to do a remote build on
 // Google Container Builder.
 type GoogleCloudBuild struct {
-	ProjectID string `yaml:"projectId"`
+	ProjectID   string `yaml:"projectId"`
+	DiskSizeGb  int64  `yaml:"diskSizeGb,omitempty"`
+	MachineType string `yaml:"machineType,omitempty"`
 }
 
 // KanikoBuild contains the fields needed to do a on-cluster build using