From 943264853f40ff8ed2f4090c42013a7b51889dbb Mon Sep 17 00:00:00 2001 From: Priya Wadhwa Date: Thu, 27 Sep 2018 11:02:07 -0700 Subject: [PATCH 1/2] Ran hack/release.sh to copy integration examples to examples For releasing v0.15.0, ran hack/release.sh to copy over integration examples to examples to account for config change. --- examples/annotated-skaffold.yaml | 15 +++++++++------ examples/bazel/skaffold.yaml | 2 +- examples/getting-started/skaffold.yaml | 2 +- examples/helm-deployment/README.adoc | 2 ++ examples/helm-deployment/skaffold.yaml | 5 +++-- examples/kaniko/skaffold.yaml | 5 +++-- examples/kustomize/skaffold.yaml | 2 +- examples/microservices/skaffold.yaml | 2 +- .../skaffold.yaml | 2 +- 9 files changed, 22 insertions(+), 15 deletions(-) diff --git a/examples/annotated-skaffold.yaml b/examples/annotated-skaffold.yaml index c4b829e2801..ac9399483eb 100644 --- a/examples/annotated-skaffold.yaml +++ b/examples/annotated-skaffold.yaml @@ -1,4 +1,4 @@ -apiVersion: skaffold/v1alpha2 +apiVersion: skaffold/v1alpha3 kind: Config build: # tagPolicy determines how skaffold is going to tag your images. @@ -92,7 +92,7 @@ build: # projectId: YOUR_PROJECT # diskSizeGb: 200 # machineType: "N1_HIGHCPU_8"|"N1_HIGHCPU_32" - # timeout: 10000s + # timeout: 10000S # dockerImage: gcr.io/cloud-builders/docker # Docker artifacts can be built on a Kubernetes cluster with Kaniko. @@ -101,7 +101,8 @@ build: # See https://github.com/GoogleContainerTools/kaniko#running-kaniko-in-a-kubernetes-cluster # # kaniko: - # gcsBucket: k8s-skaffold + # buildContext: + # gcsBucket: k8s-skaffold # pullSecret: /a/secret/path/serviceaccount.json # namespace: default # timeout: 20m @@ -109,7 +110,7 @@ build: # The deploy section has all the information needed to deploy. Along with build: # it is a required section. deploy: - # The type of the deployment method can be `kubectl`, `kustomize`, or `helm`. + # The type of the deployment method can be `kubectl` or `helm`. # The kubectl deployer uses a client side `kubectl apply` to apply the manifests to the cluster. # You'll need a kubectl CLI version installed that's compatible with your cluster. @@ -132,7 +133,7 @@ deploy: # - namespace:deployment/web-app2 # kustomize: - # kustomizePath: . + # kustomizePath: "kustomization.yaml" # kustomize deploys manifests with kubectl. # kubectl can be passed additional option flags either on every command (Global), # on creations (Apply) or deletions (Delete). @@ -146,7 +147,9 @@ deploy: # releases: # - name: skaffold-helm # chartPath: skaffold-helm - # valuesFilePath: helm-skaffold-values.yaml + # valuesFiles: + # - first-values-file.yaml + # - second-values-file.yaml # values: # image: skaffold-helm # namespace: skaffold diff --git a/examples/bazel/skaffold.yaml b/examples/bazel/skaffold.yaml index a29ce7b74db..6424b8091a3 100644 --- a/examples/bazel/skaffold.yaml +++ b/examples/bazel/skaffold.yaml @@ -1,4 +1,4 @@ -apiVersion: skaffold/v1alpha2 +apiVersion: skaffold/v1alpha3 kind: Config build: artifacts: diff --git a/examples/getting-started/skaffold.yaml b/examples/getting-started/skaffold.yaml index 2c5d8ef12b6..fb4d4adbc4c 100644 --- a/examples/getting-started/skaffold.yaml +++ b/examples/getting-started/skaffold.yaml @@ -1,4 +1,4 @@ -apiVersion: skaffold/v1alpha2 +apiVersion: skaffold/v1alpha3 kind: Config build: artifacts: diff --git a/examples/helm-deployment/README.adoc b/examples/helm-deployment/README.adoc index a4d94cb3afc..1fd3e17f3d8 100644 --- a/examples/helm-deployment/README.adoc +++ b/examples/helm-deployment/README.adoc @@ -30,6 +30,8 @@ deploy: namespace: skaffold values: image: skaffold-helm + valuesFiles: + - helm-values-file.yaml ``` This part tells skaffold to set the `image` parameter of the values file to the built skaffold-helm image and tag. diff --git a/examples/helm-deployment/skaffold.yaml b/examples/helm-deployment/skaffold.yaml index 6511d582764..6c5ae9febdc 100644 --- a/examples/helm-deployment/skaffold.yaml +++ b/examples/helm-deployment/skaffold.yaml @@ -1,4 +1,4 @@ -apiVersion: skaffold/v1alpha2 +apiVersion: skaffold/v1alpha3 kind: Config build: tagPolicy: @@ -11,7 +11,8 @@ deploy: - name: skaffold-helm chartPath: skaffold-helm #wait: true - #valuesFilePath: helm-skaffold-values.yaml + #valuesFiles: + #- helm-skaffold-values.yaml values: image: gcr.io/k8s-skaffold/skaffold-helm #recreatePods will pass --recreate-pods to helm upgrade diff --git a/examples/kaniko/skaffold.yaml b/examples/kaniko/skaffold.yaml index 1b81d4a523d..09271f92719 100644 --- a/examples/kaniko/skaffold.yaml +++ b/examples/kaniko/skaffold.yaml @@ -1,10 +1,11 @@ -apiVersion: skaffold/v1alpha2 +apiVersion: skaffold/v1alpha3 kind: Config build: artifacts: - imageName: gcr.io/k8s-skaffold/skaffold-example kaniko: - gcsBucket: skaffold-kaniko + buildContext: + gcsBucket: skaffold-kaniko pullSecretName: e2esecret namespace: default deploy: diff --git a/examples/kustomize/skaffold.yaml b/examples/kustomize/skaffold.yaml index 65edfabae9a..0ad12da902c 100644 --- a/examples/kustomize/skaffold.yaml +++ b/examples/kustomize/skaffold.yaml @@ -1,4 +1,4 @@ -apiVersion: skaffold/v1alpha2 +apiVersion: skaffold/v1alpha3 kind: Config deploy: kustomize: {} diff --git a/examples/microservices/skaffold.yaml b/examples/microservices/skaffold.yaml index 1cc1615e56c..09625d7e8a1 100644 --- a/examples/microservices/skaffold.yaml +++ b/examples/microservices/skaffold.yaml @@ -1,4 +1,4 @@ -apiVersion: skaffold/v1alpha2 +apiVersion: skaffold/v1alpha3 kind: Config build: artifacts: diff --git a/examples/tagging-with-environment-variables/skaffold.yaml b/examples/tagging-with-environment-variables/skaffold.yaml index 93dc15c23e5..4cb86eb796b 100644 --- a/examples/tagging-with-environment-variables/skaffold.yaml +++ b/examples/tagging-with-environment-variables/skaffold.yaml @@ -1,4 +1,4 @@ -apiVersion: skaffold/v1alpha2 +apiVersion: skaffold/v1alpha3 kind: Config build: artifacts: From b97a8c14514e5c4841f717e4e2c12020257e1db0 Mon Sep 17 00:00:00 2001 From: Priya Wadhwa Date: Thu, 27 Sep 2018 11:10:44 -0700 Subject: [PATCH 2/2] Add v0.15.0 changelog --- CHANGELOG.md | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9afdfe210fd..9350d9612e1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,38 @@ +# v0.15.0 Release - 9/27/2018 + +New Features: +* Added kustomize to deploy types [#1027](https://github.com/GoogleContainerTools/skaffold/pull/1027) +* Basic support for watching Kustomize dependencies [#1015](https://github.com/GoogleContainerTools/skaffold/pull/1015) +* Basic support for using kubectl and helm together [#586](https://github.com/GoogleContainerTools/skaffold/pull/586) +* Add support for multiple helm values files [#985](https://github.com/GoogleContainerTools/skaffold/pull/985) +* Add v1alpha3 Config [#982](https://github.com/GoogleContainerTools/skaffold/pull/982) + +Bug Fixes: +* annotated.yaml: fix gcb timeout format [#1040](https://github.com/GoogleContainerTools/skaffold/pull/1040) +* Catch a 409 when creating a bucket and continue. [#1044](https://github.com/GoogleContainerTools/skaffold/pull/1044) +* Fix typo [#1045](https://github.com/GoogleContainerTools/skaffold/pull/1045) +* Fix issues with build args replacement [#1028](https://github.com/GoogleContainerTools/skaffold/pull/1028) +* prevent watcher failure if helm valuesFilePath not set [#930](https://github.com/GoogleContainerTools/skaffold/pull/930) +* Correctly parse build tags that contain port numbers [#1001](https://github.com/GoogleContainerTools/skaffold/pull/1001) +* FIX kubectl should only redeploy updated manifests [#1014](https://github.com/GoogleContainerTools/skaffold/pull/1014) +* Fix race conditions in TestWatch [#987](https://github.com/GoogleContainerTools/skaffold/pull/987) + +Updates: +* Simpler merged PR collection for release notes [#1054](https://github.com/GoogleContainerTools/skaffold/pull/1054) +* Improve kustomize deployer [#1036](https://github.com/GoogleContainerTools/skaffold/pull/1036) +* kustomizePath is a folder that defaults to . [#1030](https://github.com/GoogleContainerTools/skaffold/pull/1030) +* Discard output in tests [#1021](https://github.com/GoogleContainerTools/skaffold/pull/1021) +* Add a test for `kubectl should only redeploy updated manifests` [#1022](https://github.com/GoogleContainerTools/skaffold/pull/1022) +* Examples versioning [#1019](https://github.com/GoogleContainerTools/skaffold/pull/1019) +* add nkubala to MAINTAINERS [#993](https://github.com/GoogleContainerTools/skaffold/pull/993) +* Debounce rapid file changes [#1005](https://github.com/GoogleContainerTools/skaffold/pull/1005) +* Print kubectl client version [#991](https://github.com/GoogleContainerTools/skaffold/pull/991) +* Auto configure authentication helper for gcr.io [#989](https://github.com/GoogleContainerTools/skaffold/pull/989) +* Tweak the Dockerfile. [#1007](https://github.com/GoogleContainerTools/skaffold/pull/1007) +* Skip kaniko-related test when running locally [#990](https://github.com/GoogleContainerTools/skaffold/pull/990) +* Extract code from GCB [#986](https://github.com/GoogleContainerTools/skaffold/pull/986) + + # v0.14.0 Release - 9/13/2018 New Features: