Adding support for Cloud Native Buildpacks (#3000)

* Prepare version v1beta18

Signed-off-by: David Gageot <david@gageot.net>

* Support for Cloud Native Buildpacks

Signed-off-by: David Gageot <david@gageot.net>

docs/config.toml

@@ -79,7 +79,7 @@ weight = 1
 copyright = "Skaffold Authors"
 privacy_policy = "https://policies.google.com/privacy"
 github_repo = "https://github.com/GoogleContainerTools/skaffold"
-skaffold_version = "skaffold/v1beta17"
+skaffold_version = "skaffold/v1beta18"
 
 # Google Custom Search Engine ID. Remove or comment out to disable search.
 gcs_engine_id = "013756393218025596041:3nojel67sum"

integration/build_test.go

@@ -89,9 +89,10 @@ func TestBuild(t *testing.T) {
 			dir:         "testdata/tagPolicy",
 			args:        []string{"-p", "envTemplate"},
 			expectImage: imageName + "tag",
-		}, {
-			description: "buildpacks",
-			dir:         "examples/buildpacks",
+		},
+		{
+			description: "custom",
+			dir:         "examples/custom",
 			setup: func(t *testing.T, _ string) func() {
 				cmd := exec.Command("pack", "set-default-builder", "heroku/buildpacks")
 				if err := cmd.Run(); err != nil {

integration/examples/bazel/skaffold.yaml

@@ -1,4 +1,4 @@
-apiVersion: skaffold/v1beta17
+apiVersion: skaffold/v1beta18
 kind: Config
 build:
   artifacts:

integration/examples/buildpacks/go.mod

@@ -1,3 +1,4 @@
 module github.com/GoogleContainerTools/skaffold/examples/buildpacks
 
-go 1.12
+// +heroku goVersion go1.13.1
+go 1.13

integration/examples/buildpacks/main.go

@@ -2,13 +2,17 @@ package main
 
 import (
 	"fmt"
-	"time"
+	"log"
+	"net/http"
 )
 
 func main() {
-	for {
-		fmt.Println("Hello world!")
+	http.HandleFunc("/", hello)
 
-		time.Sleep(time.Second * 1)
-	}
+	log.Println("Listening on port 8080")
+	http.ListenAndServe(":8080", nil)
+}
+
+func hello(w http.ResponseWriter, r *http.Request) {
+	fmt.Fprintf(w, "Hello, World!")
 }

integration/examples/buildpacks/skaffold.yaml

@@ -1,14 +1,7 @@
-apiVersion: skaffold/v1beta17
+apiVersion: skaffold/v1beta18
 kind: Config
 build:
   artifacts:
   - image: gcr.io/k8s-skaffold/skaffold-example
-    custom:
-      buildCommand: ./build.sh
-      dependencies:
-        paths:
-        - .
-deploy:
-  kubectl:
-    manifests:
-      - k8s-*
+    buildpack:
+      builder: "heroku/buildpacks"

integration/examples/buildpacks/README.adoc → integration/examples/custom/README.adoc

@@ -57,7 +57,7 @@ and the skaffold config, which configures artifact `gcr.io/k8s-skaffold/skaffold
 
 ```yaml
 $ cat skaffold.yaml
-apiVersion: skaffold/v1beta14
+apiVersion: skaffold/v1beta15
 kind: Config
 build:
   artifacts:

integration/examples/custom/go.mod

@@ -0,0 +1,3 @@
+module github.com/GoogleContainerTools/skaffold/examples/buildpacks
+
+go 1.12

integration/examples/custom/k8s-pod.yaml

@@ -0,0 +1,8 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  name: getting-started
+spec:
+  containers:
+  - name: getting-started
+    image: gcr.io/k8s-skaffold/skaffold-example

integration/examples/custom/main.go

@@ -0,0 +1,14 @@
+package main
+
+import (
+	"fmt"
+	"time"
+)
+
+func main() {
+	for {
+		fmt.Println("Hello world!")
+
+		time.Sleep(time.Second * 1)
+	}
+}

integration/examples/custom/skaffold.yaml

@@ -0,0 +1,14 @@
+apiVersion: skaffold/v1beta18
+kind: Config
+build:
+  artifacts:
+  - image: gcr.io/k8s-skaffold/skaffold-example
+    custom:
+      buildCommand: ./build.sh
+      dependencies:
+        paths:
+        - .
+deploy:
+  kubectl:
+    manifests:
+      - k8s-*

integration/examples/gcb-kaniko/skaffold.yaml

@@ -1,4 +1,4 @@
-apiVersion: skaffold/v1beta17
+apiVersion: skaffold/v1beta18
 kind: Config
 build:
   googleCloudBuild:

integration/examples/generate-pipeline/skaffold.yaml

@@ -1,4 +1,4 @@
-apiVersion: skaffold/v1beta17
+apiVersion: skaffold/v1beta18
 kind: Config
 build:
   artifacts:

integration/examples/getting-started/skaffold.yaml

@@ -1,4 +1,4 @@
-apiVersion: skaffold/v1beta17
+apiVersion: skaffold/v1beta18
 kind: Config
 build:
   artifacts:

integration/examples/google-cloud-build/skaffold.yaml

@@ -1,4 +1,4 @@
-apiVersion: skaffold/v1beta17
+apiVersion: skaffold/v1beta18
 kind: Config
 build:
   googleCloudBuild:

integration/examples/helm-deployment-dependencies/skaffold.yaml

@@ -1,4 +1,4 @@
-apiVersion: skaffold/v1beta17
+apiVersion: skaffold/v1beta18
 kind: Config
 build:
   tagPolicy:

integration/examples/helm-deployment/skaffold.yaml

@@ -1,4 +1,4 @@
-apiVersion: skaffold/v1beta17
+apiVersion: skaffold/v1beta18
 kind: Config
 build:
   tagPolicy:

integration/examples/hot-reload/skaffold.yaml

@@ -1,4 +1,4 @@
-apiVersion: skaffold/v1beta17
+apiVersion: skaffold/v1beta18
 kind: Config
 build:
   artifacts:

integration/examples/jib-gradle/skaffold.yaml

@@ -1,4 +1,4 @@
-apiVersion: skaffold/v1beta17
+apiVersion: skaffold/v1beta18
 kind: Config
 build:
   artifacts:

integration/examples/jib-multimodule/skaffold.yaml

@@ -1,4 +1,4 @@
-apiVersion: skaffold/v1beta17
+apiVersion: skaffold/v1beta18
 kind: Config
 build:
   artifacts:

integration/examples/jib/skaffold.yaml

@@ -1,4 +1,4 @@
-apiVersion: skaffold/v1beta17
+apiVersion: skaffold/v1beta18
 kind: Config
 build:
   artifacts:

integration/examples/kaniko-local/skaffold.yaml

@@ -1,4 +1,4 @@
-apiVersion: skaffold/v1beta17
+apiVersion: skaffold/v1beta18
 kind: Config
 build:
   artifacts:

integration/examples/kaniko/skaffold.yaml

@@ -1,4 +1,4 @@
-apiVersion: skaffold/v1beta17
+apiVersion: skaffold/v1beta18
 kind: Config
 build:
   artifacts:

integration/examples/kustomize/skaffold.yaml

@@ -1,4 +1,4 @@
-apiVersion: skaffold/v1beta17
+apiVersion: skaffold/v1beta18
 kind: Config
 deploy:
   kustomize: {}

integration/examples/microservices/skaffold.yaml

@@ -1,4 +1,4 @@
-apiVersion: skaffold/v1beta17
+apiVersion: skaffold/v1beta18
 kind: Config
 build:
   artifacts:

integration/examples/nodejs/skaffold.yaml

@@ -1,4 +1,4 @@
-apiVersion: skaffold/v1beta17
+apiVersion: skaffold/v1beta18
 kind: Config
 build:
   artifacts:

integration/examples/profiles/skaffold.yaml

@@ -1,4 +1,4 @@
-apiVersion: skaffold/v1beta17
+apiVersion: skaffold/v1beta18
 kind: Config
 build:
   # only build and deploy "world-service" on main profile

integration/examples/react-reload/skaffold.yaml

@@ -1,4 +1,4 @@
-apiVersion: skaffold/v1beta17
+apiVersion: skaffold/v1beta18
 kind: Config
 build:
   artifacts:

integration/examples/structure-tests/skaffold.yaml

@@ -1,4 +1,4 @@
-apiVersion: skaffold/v1beta17
+apiVersion: skaffold/v1beta18
 kind: Config
 build:
   artifacts:

integration/examples/tagging-with-environment-variables/skaffold.yaml

@@ -1,4 +1,4 @@
-apiVersion: skaffold/v1beta17
+apiVersion: skaffold/v1beta18
 kind: Config
 build:
   artifacts:

integration/run_test.go

@@ -142,8 +142,13 @@ func TestRun(t *testing.T) {
 			args:        []string{"-p", "gcb"},
 			deployments: []string{"web"},
 			gcpOnly:     true,
-		},
-		{
+		}, {
+			description: "buildpacks",
+			dir:         "examples/buildpacks",
+			pods:        []string{"getting-started"},
+			// Don't run on kind because of this issue: https://github.com/buildpack/pack/issues/277
+			gcpOnly: true,
+		}, {
 			description: "custom builder",
 			dir:         "testdata/custom",
 			pods:        []string{"bazel"},

integration/testdata/build/skaffold.yaml

@@ -1,4 +1,4 @@
-apiVersion: skaffold/v1beta17
+apiVersion: skaffold/v1beta18
 kind: Config
 build:
   local:

integration/testdata/custom/skaffold.yaml

@@ -1,4 +1,4 @@
-apiVersion: skaffold/v1beta17
+apiVersion: skaffold/v1beta18
 kind: Config
 build:
   artifacts:

integration/testdata/debug/skaffold.yaml

@@ -1,4 +1,4 @@
-apiVersion: skaffold/v1beta17
+apiVersion: skaffold/v1beta18
 kind: Config
 build:
   artifacts:

integration/testdata/dev/skaffold.yaml

@@ -1,4 +1,4 @@
-apiVersion: skaffold/v1beta17
+apiVersion: skaffold/v1beta18
 kind: Config
 build:
   artifacts:

integration/testdata/gke_loadbalancer/skaffold.yaml

@@ -1,4 +1,4 @@
-apiVersion: skaffold/v1beta17
+apiVersion: skaffold/v1beta18
 kind: Config
 build:
   artifacts:

integration/testdata/jib-gradle/skaffold.yaml

@@ -1,4 +1,4 @@
-apiVersion: skaffold/v1beta17
+apiVersion: skaffold/v1beta18
 kind: Config
 build:
   artifacts:

integration/testdata/jib/skaffold.yaml

@@ -1,4 +1,4 @@
-apiVersion: skaffold/v1beta17
+apiVersion: skaffold/v1beta18
 kind: Config
 build:
   artifacts:

integration/testdata/kaniko-microservices/skaffold.yaml

@@ -1,4 +1,4 @@
-apiVersion: skaffold/v1beta17
+apiVersion: skaffold/v1beta18
 kind: Config
 build:
   artifacts:

integration/testdata/kaniko-sub-folder/skaffold.yaml

@@ -1,4 +1,4 @@
-apiVersion: skaffold/v1beta17
+apiVersion: skaffold/v1beta18
 kind: Config
 build:
   artifacts:

integration/testdata/kaniko-target/skaffold.yaml

@@ -1,4 +1,4 @@
-apiVersion: skaffold/v1beta17
+apiVersion: skaffold/v1beta18
 kind: Config
 build:
   artifacts:

integration/testdata/tagPolicy/skaffold.yaml

@@ -1,4 +1,4 @@
-apiVersion: skaffold/v1beta17
+apiVersion: skaffold/v1beta18
 kind: Config
 build:
   artifacts:

pkg/skaffold/build/buildpacks/buildpacks.go

@@ -0,0 +1,59 @@
+/*
+Copyright 2019 The Skaffold Authors
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package buildpacks
+
+import (
+	"context"
+	"io"
+
+	"github.com/pkg/errors"
+
+	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/docker"
+	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest"
+)
+
+// BuildpackBuilder is a builder for buildpack artifacts
+type BuildpackBuilder struct {
+	localDocker docker.LocalDaemon
+	pushImages  bool
+}
+
+// NewArtifactBuilder returns a new buildpack artifact builder
+func NewArtifactBuilder(localDocker docker.LocalDaemon, pushImages bool) *BuildpackBuilder {
+	return &BuildpackBuilder{
+		localDocker: localDocker,
+		pushImages:  pushImages,
+	}
+}
+
+// Build builds an artifact with Cloud Native Buildpacks:
+// https://buildpacks.io/
+func (b *BuildpackBuilder) Build(ctx context.Context, out io.Writer, a *latest.Artifact, tag string) (string, error) {
+	built, err := b.build(ctx, out, a.Workspace, a.BuildpackArtifact, tag)
+	if err != nil {
+		return "", err
+	}
+
+	if err := b.localDocker.Tag(ctx, built, tag); err != nil {
+		return "", errors.Wrapf(err, "tagging %s->%s", built, tag)
+	}
+
+	if b.pushImages {
+		return b.localDocker.Push(ctx, out, tag)
+	}
+	return b.localDocker.ImageID(ctx, tag)
+}