Merge branch 'master' into reset-on-deploy

Author: tejal29

CHANGELOG.md

@@ -1,8 +1,89 @@
+# v0.39.0 Release - 09/26/2019
+
+*Note*: This release comes with a new config version `v1beta15`.
+        To upgrade your `skaffold.yaml`, use `skaffold fix`. If you don't upgrade, skaffold will auto-upgrade in memory as best it can, and print a warning message.
+        See [deprecation-policy.md](/deprecation-policy.md) for details on what beta means.
+        The env vars `DIGEST`, `DIGEST_HEX` and `DIGEST_ALGO` now fail if found in `envTemplate` fields. 
+
+Highlights: 
+
+* We now include build args in the artifact cache hash generation [#2926](https://github.com/GoogleContainerTools/skaffold/pull/2926) 
+* Skaffold now passes the `--set-files` argument to the helm CLI: you can define `helm.release.setFiles` in the skaffold.yaml
+* Skaffold now passes the `--build-args` arguments to kustomize: you can define `deploy.kustomize.buildArgs` in the skaffold.yaml
+
+New Features:
+
+* Optional pull secret for Kaniko [#2910](https://github.com/GoogleContainerTools/skaffold/pull/2910)
+* Add Jib-Gradle support for Kotlin buildscripts [#2914](https://github.com/GoogleContainerTools/skaffold/pull/2914)
+* Add graceful termination for custom builders [#2886](https://github.com/GoogleContainerTools/skaffold/pull/2886)
+* Add docs and tutorial for buildpacks [#2879](https://github.com/GoogleContainerTools/skaffold/pull/2879)
+* kustomize build args [#2871](https://github.com/GoogleContainerTools/skaffold/pull/2871)
+* Add `setFiles` to `HelmDeploy.HelmRelease` skaffold config which will be add `--set-files` argument to helm CLI [#2895](https://github.com/GoogleContainerTools/skaffold/pull/2895)
+
+Bug Fixes:
+
+* fix flake TestGetSetFileValues [#2936](https://github.com/GoogleContainerTools/skaffold/pull/2936)
+* Fix helm deployer with imageStrategy helm and fix test runner [#2887](https://github.com/GoogleContainerTools/skaffold/pull/2887)
+* Include build args in cache hash generation [#2926](https://github.com/GoogleContainerTools/skaffold/pull/2926)
+* Fix test flake TestPollResourceStatus [#2907](https://github.com/GoogleContainerTools/skaffold/pull/2907)
+* Fix build script for doc generation. [#2884](https://github.com/GoogleContainerTools/skaffold/pull/2884)
+
+Updates & Refactors:
+
+* Create new v1beta15 config [#2881](https://github.com/GoogleContainerTools/skaffold/pull/2881)
+* adding release comment management to all config.go [#2917](https://github.com/GoogleContainerTools/skaffold/pull/2917)
+* Change final status check error message to be more concise. [#2930](https://github.com/GoogleContainerTools/skaffold/pull/2930)
+* Add unimplemented 'skaffold render' command [#2942](https://github.com/GoogleContainerTools/skaffold/pull/2942)
+* Bump golangci-lint to v0.19.0 [#2927](https://github.com/GoogleContainerTools/skaffold/pull/2927)
+* Add pod resource with no status check implemented. [#2928](https://github.com/GoogleContainerTools/skaffold/pull/2928)
+* added support for interface type in schema check [#2924](https://github.com/GoogleContainerTools/skaffold/pull/2924)
+* add protos for status check [#2916](https://github.com/GoogleContainerTools/skaffold/pull/2916)
+* Refactor Deployment common functions in to a  Base struct in prep to pod [#2905](https://github.com/GoogleContainerTools/skaffold/pull/2905)
+* Add missing T.Helper() in testutil.Check* as required [#2913](https://github.com/GoogleContainerTools/skaffold/pull/2913)
+* Removing testing version dependent skaffold config test in examples [#2890](https://github.com/GoogleContainerTools/skaffold/pull/2890)
+* rename hack/versions/cmd/new/new.go to hack/versions/cmd/new/version.go [#2882](https://github.com/GoogleContainerTools/skaffold/pull/2882)
+* [Refactor] Move pollDeploymentStatus to resource.Deployment.CheckStatus [#2896](https://github.com/GoogleContainerTools/skaffold/pull/2896)
+* init: Add default config name [#2668](https://github.com/GoogleContainerTools/skaffold/pull/2668)
+* Upgrade jib to 1.6.1 [#2891](https://github.com/GoogleContainerTools/skaffold/pull/2891)
+* Print deployment status after every 0.5 seconds. [#2866](https://github.com/GoogleContainerTools/skaffold/pull/2866)
+* Fail PR if it has a structural schema change in a released version [#2864](https://github.com/GoogleContainerTools/skaffold/pull/2864)
+
+Docs:
+
+* add better docs for recreate pods [#2937](https://github.com/GoogleContainerTools/skaffold/pull/2937)
+* added release comments manually [#2931](https://github.com/GoogleContainerTools/skaffold/pull/2931)
+* add github pull request template [#2894](https://github.com/GoogleContainerTools/skaffold/pull/2894)
+        
+        
+Huge thanks goes out to all of our contributors for this release:
+
+- Aisuko
+- Andreas Sommer
+- Balint Pato
+- Brian de Alwis
+- Cedric Kring
+- Chanseok Oh
+- Cornelius Weig
+- David Gageot
+- Dominic Werner
+- Jack Davis
+- Marlon Gamez
+- Medya Gh
+- Michael Beaumont
+- Nick Kubala
+- Prashant Arya
+- Priya Wadhwa
+- Tad Cordle
+- Tejal Desai
+- Willy Aguirre
+
+
 # v0.38.0 Release - 09/12/2019
 
 *Note*: This release comes with a new config version `v1beta14`.
         To upgrade your `skaffold.yaml`, use `skaffold fix`. If you don't upgrade, skaffold will auto-upgrade in memory as best it can, and print a warning message.
-        See [deprecation-policy.md](/deprecation-policy.md) for details on what beta means.
+        See [deprecation-policy.md](/deprecation-policy.md) for details on what beta means.        
+        The env vars `DIGEST`, `DIGEST_HEX` and `DIGEST_ALGO` won't work anymore in envTemplates.
 
 New Features:
 

DEVELOPMENT.md

@@ -60,22 +60,24 @@ Once you've done this, clone your fork to your local machine:
 
 Some changes to the skaffold code require a change to the skaffold config. These changes require a few extra steps:
 
-* Check to see what the latest config version was at the time of the last release. The easiest way to do this is to view the skaffold source on github at the last released tag.
-
-* Check the current config version in the code. This can be found in `pkg/skaffold/schema/latest/config.go`: look for something like
-
-```golang
-const Version string = "skaffold/v1betaXX"
-```
-* If the config versions are different, do nothing. Somebody has already bumped the config version for this release cycle.
-
-* **If the config versions are the same**:
-
-  * Run `./hack/new_version.sh` to freeze the current config version and cut a new version.
-
+* Open the latest Config at [pkg/skaffold/schema/latest/config.go](https://github.com/GoogleContainerTools/skaffold/blob/master/pkg/skaffold/schema/latest/config.go#L23) and inspect the comment at [L13](https://github.com/GoogleContainerTools/skaffold/blob/master/pkg/skaffold/schema/latest/config.go#L23)
+* If the line mentions the config version is not released, proceed making your changes.
+  ```
+  // This config version is not yet released, it is SAFE TO MODIFY the structs in this file.
+  ```
+
+* **If the line mentions** the config version is released then, 
+  ```
+  // !!! WARNING !!! This config version is already released, please DO NOT MODIFY the structs in this file.
+  ```
+  
+  * Run `./hack/new_version.sh` to create a new version.
+
+  * Run `make test` to verify changes.
+  
   * Commit these generated changes, and submit a PR.
 
-Once you've done this, continue making your changes locally, including the new config change.
+Once you've done this, merge or rebase your development branch with config changes, including the new config change.
 **Any new config changes belong in pkg/skaffold/schema/latest/config.go. Do not edit the older config versions.**
 
 * Be sure and update the documentation in `pkg/skaffold/schema/<previous_config_version>/upgrade.go` with any additions, removals, or updates you make to the config.

cmd/skaffold/app/cmd/cmd.go

@@ -136,6 +136,7 @@ func NewSkaffoldCommand(out, err io.Writer) *cobra.Command {
 				NewCmdBuild(),
 				NewCmdDeploy(),
 				NewCmdDelete(),
+				NewCmdRender(),
 			},
 		},
 		{

cmd/skaffold/app/cmd/flags.go

@@ -229,6 +229,14 @@ var FlagRegistry = []Flag{
 		FlagAddMethod: "BoolVar",
 		DefinedOn:     []string{"dev", "debug", "deploy", "run"},
 	},
+	{
+		Name:          "render-only",
+		Usage:         "Print rendered kubernetes manifests instead of deploying them",
+		Value:         &opts.RenderOnly,
+		DefValue:      false,
+		FlagAddMethod: "BoolVar",
+		DefinedOn:     []string{"dev", "run"},
+	},
 	{
 		Name:          "config",
 		Shorthand:     "c",

cmd/skaffold/app/cmd/render.go

@@ -0,0 +1,66 @@
+/*
+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 cmd
+
+import (
+	"context"
+	"io"
+	"io/ioutil"
+
+	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/runner"
+	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest"
+	"github.com/pkg/errors"
+	"github.com/spf13/cobra"
+	"github.com/spf13/pflag"
+)
+
+var (
+	showBuild        bool
+	renderOutputPath string
+)
+
+// NewCmdRender describes the CLI command to build artifacts render kubernetes manifests.
+func NewCmdRender() *cobra.Command {
+	return NewCmd("render").
+		WithDescription("Perform all image builds, and output rendered kubernetes manifests").
+		WithCommonFlags().
+		WithFlags(func(f *pflag.FlagSet) {
+			f.BoolVar(&showBuild, "loud", false, "Show the build logs and output")
+			f.StringVar(&renderOutputPath, "output", "", "file to write rendered manifests to")
+		}).
+		NoArgs(cancelWithCtrlC(context.Background(), doRender))
+}
+
+func doRender(ctx context.Context, out io.Writer) error {
+	buildOut := ioutil.Discard
+	if showBuild {
+		buildOut = out
+	}
+
+	return withRunner(ctx, func(r runner.Runner, config *latest.SkaffoldConfig) error {
+		bRes, err := r.BuildAndTest(ctx, buildOut, targetArtifacts(opts, config))
+
+		if err != nil {
+			return errors.Wrap(err, "executing build")
+		}
+
+		if err := r.Render(ctx, out, bRes, renderOutputPath); err != nil {
+			return errors.Wrap(err, "rendering manifests")
+		}
+		return nil
+	})
+}

deprecation-policy.md

@@ -94,11 +94,4 @@ Commands and their flags are subject to the deprecation policy based on the foll
 
 
 03/15/2019: With release v0.25.0 we mark for deprecation the `flags` field in kaniko (`KanikoArtifact.AdditionalFlags`) , instead Kaniko's additional flags will now be represented as unique fields under `kaniko` per artifact (`KanikoArtifact` type).
-This flag will will be removed earliest 06/15/2019.
-
-02/15/2019: With  release v0.23.0 we mark for deprecation the following env variables in the `envTemplate` tagger:
-- `DIGEST`
-- `DIGEST_ALGO`
-- `DIGEST_HEX`
-Currently these variables resolve to `_DEPRECATED_<envvar>_`, and the new tagging mechanism adds a digest to the image name thus it shouldn't break existing configurations.
-This backward compatibility behavior will be removed earliest 05/14/2019.
+This flag will will be removed earliest 06/15/2019.

docs/content/en/docs/references/cli/_index.md

@@ -17,6 +17,7 @@ Pipeline building blocks for CI/CD:
 * [skaffold build](#skaffold-build) - to just build and tag your image(s)
 * [skaffold deploy](#skaffold-deploy) - to deploy the given image(s)
 * [skaffold delete](#skaffold-delete) - to cleanup the deployed artifacts
+* [skaffold render](#skaffold-render) - build and tag images, and output templated kubernetes manifests
 
 Getting started with a new project:
 
@@ -71,6 +72,7 @@ Pipeline building blocks for CI/CD:
   build             Build the artifacts
   deploy            Deploy pre-built artifacts
   delete            Delete the deployed application
+  render            Perform all image builds, and output rendered kubernetes manifests
 
 Getting started with a new project:
   init              Generate configuration for deploying an application
@@ -446,6 +448,7 @@ Options:
       --no-prune-children=false: Skip removing layers reused by Skaffold
       --port-forward=false: Port-forward exposed container ports within pods
   -p, --profile=[]: Activate profiles by name
+      --render-only=false: Print rendered kubernetes manifests instead of deploying them
       --rpc-http-port=50052: tcp port to expose event REST API over HTTP
       --rpc-port=50051: tcp port to expose event API
       --skip-tests=false: Whether to skip the tests after building
@@ -480,6 +483,7 @@ Env vars:
 * `SKAFFOLD_NO_PRUNE_CHILDREN` (same as `--no-prune-children`)
 * `SKAFFOLD_PORT_FORWARD` (same as `--port-forward`)
 * `SKAFFOLD_PROFILE` (same as `--profile`)
+* `SKAFFOLD_RENDER_ONLY` (same as `--render-only`)
 * `SKAFFOLD_RPC_HTTP_PORT` (same as `--rpc-http-port`)
 * `SKAFFOLD_RPC_PORT` (same as `--rpc-port`)
 * `SKAFFOLD_SKIP_TESTS` (same as `--skip-tests`)
@@ -580,6 +584,37 @@ The following options can be passed to any command:
 
 ```
 
+### skaffold render
+
+Perform all image builds, and output rendered kubernetes manifests
+
+```
+
+
+Options:
+  -d, --default-repo='': Default repository value (overrides global config)
+  -f, --filename='skaffold.yaml': Filename or URL to the pipeline file
+      --loud=false: Show the build logs and output
+  -n, --namespace='': Run deployments in the specified namespace
+      --output='': file to write rendered manifests to
+  -p, --profile=[]: Activate profiles by name
+
+Usage:
+  skaffold render [options]
+
+Use "skaffold options" for a list of global command-line options (applies to all commands).
+
+
+```
+Env vars:
+
+* `SKAFFOLD_DEFAULT_REPO` (same as `--default-repo`)
+* `SKAFFOLD_FILENAME` (same as `--filename`)
+* `SKAFFOLD_LOUD` (same as `--loud`)
+* `SKAFFOLD_NAMESPACE` (same as `--namespace`)
+* `SKAFFOLD_OUTPUT` (same as `--output`)
+* `SKAFFOLD_PROFILE` (same as `--profile`)
+
 ### skaffold run
 
 Run a pipeline
@@ -610,6 +645,7 @@ Options:
       --no-prune=false: Skip removing images and containers built by Skaffold
       --no-prune-children=false: Skip removing layers reused by Skaffold
   -p, --profile=[]: Activate profiles by name
+      --render-only=false: Print rendered kubernetes manifests instead of deploying them
       --rpc-http-port=50052: tcp port to expose event REST API over HTTP
       --rpc-port=50051: tcp port to expose event API
       --skip-tests=false: Whether to skip the tests after building
@@ -641,6 +677,7 @@ Env vars:
 * `SKAFFOLD_NO_PRUNE` (same as `--no-prune`)
 * `SKAFFOLD_NO_PRUNE_CHILDREN` (same as `--no-prune-children`)
 * `SKAFFOLD_PROFILE` (same as `--profile`)
+* `SKAFFOLD_RENDER_ONLY` (same as `--render-only`)
 * `SKAFFOLD_RPC_HTTP_PORT` (same as `--rpc-http-port`)
 * `SKAFFOLD_RPC_PORT` (same as `--rpc-port`)
 * `SKAFFOLD_SKIP_TESTS` (same as `--skip-tests`)

docs/content/en/docs/references/cli/index_header

@@ -17,6 +17,7 @@ Pipeline building blocks for CI/CD:
 * [skaffold build](#skaffold-build) - to just build and tag your image(s)
 * [skaffold deploy](#skaffold-deploy) - to deploy the given image(s)
 * [skaffold delete](#skaffold-delete) - to cleanup the deployed artifacts
+* [skaffold render](#skaffold-render) - build and tag images, and output templated kubernetes manifests
 
 Getting started with a new project:
 

examples/bazel/skaffold.yaml

@@ -1,4 +1,4 @@
-apiVersion: skaffold/v1beta14
+apiVersion: skaffold/v1beta15
 kind: Config
 build:
   artifacts: