Merge branch 'master' of github.com:GoogleCloudPlatform/kaniko into maintainer

README.md

@@ -55,7 +55,7 @@ Requirements:
 
 To run kaniko in a Kubernetes cluster, you will need a standard running Kubernetes cluster and a Kubernetes secret, which contains the auth required to push the final image. 
 
-To create the secret, first you will need to create a service account in the Pantheon project you want to push the final image to, with `Storage Admin` permissions.
+To create the secret, first you will need to create a service account in the Google Cloud Console project you want to push the final image to, with `Storage Admin` permissions.
 You can download a JSON key for this service account, and rename it `kaniko-secret.json`.
 To create the secret, run:
 

integration-test.sh

@@ -13,7 +13,16 @@
 # limitations under the License.
 
 #!/bin/bash
-set -e
+set -ex
+
+if [ -f "$KOKORO_GFILE_DIR"/common.sh ]; then
+    echo "Installing dependencies..."
+    source "$KOKORO_GFILE_DIR/common.sh"
+    mkdir -p /usr/local/go/src/github.com/GoogleCloudPlatform/
+    cp -r github/kaniko /usr/local/go/src/github.com/GoogleCloudPlatform/
+    pushd /usr/local/go/src/github.com/GoogleCloudPlatform/kaniko
+fi
 
 echo "Running integration tests..."
+make out/executor
 go run integration_tests/integration_test_yaml.go | gcloud container builds submit --config /dev/fd/0 .

integration_tests/integration_test_yaml.go

@@ -182,7 +182,8 @@ type step struct {
 }
 
 type testyaml struct {
-	Steps []step
+	Steps   []step
+	Timeout string
 }
 
 func main() {
@@ -232,6 +233,7 @@ func main() {
 	y := testyaml{
 		Steps: []step{containerDiffStep, containerDiffPermissions, structureTestsStep, structureTestPermissions, GCSBucketTarBuildContext, uploadTarBuildContext, buildExecutorImage,
 			buildOnbuildImage, pushOnbuildBase},
+		Timeout: "1200s",
 	}
 	for _, test := range fileTests {
 		// First, build the image with docker

pkg/util/fs_util.go

@@ -160,6 +160,7 @@ func CreateFile(path string, reader io.Reader, perm os.FileMode) error {
 	if err != nil {
 		return err
 	}
+	defer dest.Close()
 	if _, err := io.Copy(dest, reader); err != nil {
 		return err
 	}