Merge branch 'master' into ko-build-core

GoogleContainerTools · Jul 20, 2021 · c3fae69 · c3fae69
2 parents b6fbadb + f89e4d8
commit c3fae69
Show file tree

Hide file tree

Showing 412 changed files with 23,283 additions and 4,079 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -1,58 +1,74 @@
 version: 2
+# dependabot ignores can be configured here or via `@dependabot ignore` rules 
+# in PRs.  See those list by searching:
+# https://github.com/GoogleContainerTools/skaffold/search?q=%22%40dependabot+ignore%22+in%3Acomments
 updates:
-  - directory: "/examples"
+  # check Skaffold dependencies
+  - directory: "/"
+    package-ecosystem: "gomod"
+    schedule:
+      interval: "daily"
+
+  # check for updates to github actions
+  - directory: "/"
+    package-ecosystem: "github-actions"
+    schedule:
+      interval: "daily"
+
+  - directory: "/integration/examples"
     package-ecosystem: "npm"
     schedule:
       interval: "daily"
-  - directory: "/examples"
+  - directory: "/integration/examples"
     package-ecosystem: "bundler"
     schedule:
       interval: "daily"
-  - directory: "/examples"
+  - directory: "/integration/examples"
     package-ecosystem: "composer"
     schedule:
       interval: "daily"
-  - directory: "/examples"
+  - directory: "/integration/examples"
     package-ecosystem: "pip"
     schedule:
       interval: "daily"
-  - directory: "/examples"
+  - directory: "/integration/examples"
     package-ecosystem: "maven"
     schedule:
       interval: "daily"
-  - directory: "/examples"
+  - directory: "/integration/examples"
     package-ecosystem: "gradle"
     schedule:
       interval: "daily"
-  - directory: "/examples"
+  - directory: "/integration/examples"
     package-ecosystem: "gomod"
     schedule:
       interval: "daily"
-  - directory: "/integration/examples"
+
+  - directory: "/examples"
     package-ecosystem: "npm"
     schedule:
       interval: "daily"
-  - directory: "/integration/examples"
+  - directory: "/examples"
     package-ecosystem: "bundler"
     schedule:
       interval: "daily"
-  - directory: "/integration/examples"
+  - directory: "/examples"
     package-ecosystem: "composer"
     schedule:
       interval: "daily"
-  - directory: "/integration/examples"
+  - directory: "/examples"
     package-ecosystem: "pip"
     schedule:
       interval: "daily"
-  - directory: "/integration/examples"
+  - directory: "/examples"
     package-ecosystem: "maven"
     schedule:
       interval: "daily"
-  - directory: "/integration/examples"
+  - directory: "/examples"
     package-ecosystem: "gradle"
     schedule:
       interval: "daily"
-  - directory: "/integration/examples"
+  - directory: "/examples"
     package-ecosystem: "gomod"
     schedule:
       interval: "daily"
diff --git a/.github/workflows/draft-release.yml b/.github/workflows/draft-release.yml
@@ -4,43 +4,54 @@ on:
   push:
     branches:
     - master
+
+permissions: read-all
+
 jobs:
   check:
     name: Check if release commit
     runs-on: ubuntu-latest
-    outputs:
-      applicable: ${{ steps.check-commit-message.outputs.applicable }}
+    if: "startsWith(github.event.head_commit.message, 'release: ')"
     steps:
-    - name: Check commit message
+    - name: Apply release-matching regexp to commit message
+      id: regex-match
+      uses: actions-ecosystem/action-regex-match@v2
+      with:
+        text: ${{ github.event.head_commit.message }}
+        # Allow optional `v` prefix and GitHub PR reference suffix on first line only
+        #   release: v1.2.3
+        #   release: 1.2.3-beta.1
+        #   release: v1.2.3-beta.1 (#9456)
+        regex: '^release: v?([0-9]+\.[0-9]+\.[0-9]+(-[a-zA-Z0-9.]+)?)(\s+\(#[0-9]+\))?$'
+        flags: m
+
+    - name: Determine if applicable
       id: check-commit-message
+      if: steps.regex-match.outputs.group1 != ''
       run: |
-        str='${{ github.event.head_commit.message }}'
-        regex="^release\s*:\s*(v[0-9]+\.[0-9]+\.[0-9]+|[0-9]+\.[0-9]+\.[0-9]+)"
-        if [[ "$str" =~ $regex ]]; then
         echo "::set-output name=applicable::true"
-        echo This is a release commit.
-        fi
+        echo "This is a release commit: ${{ steps.regex-match.outputs.group1 }}"
+    outputs:
+      applicable: ${{ steps.check-commit-message.outputs.applicable }}
+      version: ${{ steps.regex-match.outputs.group1 }}
 
   release:
+    name: Create Tag and Draft Release
     needs: check
     if: needs.check.outputs.applicable == 'true'
-    name: Create Tag and Draft Release
+    permissions:
+      contents: write
     runs-on: ubuntu-latest
     steps:
     - name: Checkout code
       uses: actions/checkout@v2
       with:
         fetch-depth: 0
 
-    - name: Calculate Tag and release names
+    - name: Calculate Tag and Release names
       run: |
-        t=$(echo ${{ github.event.head_commit.message }} | sed -ne 's/.*\([0-9]\+\.[0-9]\+\.[0-9]\+\).*/\1/p')
-        if [ -z "$t" ]; then
-        echo Malformed commit message; failed to extract semVer tag
-        return 1
-        fi
-        echo TAG_NAME="v${t}" >> $GITHUB_ENV
-        echo RELEASE_NAME="v${t} Release" >> $GITHUB_ENV
+        echo TAG_NAME="v${{ needs.check.outputs.version }}" >> $GITHUB_ENV
+        echo RELEASE_NAME="v${{ needs.check.outputs.version }} Release" >> $GITHUB_ENV
 
     - name: Create and push Tag
       run: |
@@ -57,14 +68,14 @@ jobs:
 
     - name: Download release artifacts
       run: |
-        #Wait 60m for all artifacts to be available
+        # Wait up to 60m for all artifacts to be available
         retries=20
         found=0
         while [ $found -lt 10 -a $retries -gt 0 ]
         do
-        sleep 3m
-        found=$(gsutil du  gs://skaffold/releases/${{ env.TAG_NAME }}/ | wc -l)
-        retries=$((retries-1))
+          sleep 3m
+          found=$(gsutil du  gs://skaffold/releases/${{ env.TAG_NAME }}/ | wc -l)
+          retries=$((retries-1))
         done
         gsutil -m cp -r gs://skaffold/releases/${{ env.TAG_NAME }}/ $HOME
 
@@ -75,7 +86,7 @@ jobs:
         body=$(git log -p --follow -1 CHANGELOG.md | grep '^\+' | cut -c 2- | tail -n +2)
         assets=()
         for asset in $HOME/${{ env.TAG_NAME }}/*; do
-        assets+=("-a" "$asset")
+          assets+=("-a" "$asset")
         done
         bin/hub release create "${assets[@]}" -m "${{ env.RELEASE_NAME }}" -m "$body" --draft ${{ env.TAG_NAME }}
       env:

diff --git a/.github/workflows/integration-darwin.yml b/.github/workflows/integration-darwin.yml
@@ -3,6 +3,8 @@ name: per-pr (darwin)
 # Triggers the workflow on push or pull request events
 on: [push, pull_request]
 
+permissions: read-all
+
 jobs:
 
   build:

diff --git a/.github/workflows/integration-linux.yml b/.github/workflows/integration-linux.yml
@@ -1,8 +1,10 @@
-name: PR (linux)
+name: per-pr (linux)
 
 # Triggers the workflow on push or pull request events
 on: [push, pull_request]
 
+permissions: read-all
+
 jobs:
 
   build:

diff --git a/.travis.yml b/.travis.yml
@@ -113,30 +113,30 @@ jobs:
       <<: *registry_mirror
       script:
         - env IT_PARTITION=3 make integration-in-kind
-    - name: "k3d integration partition 0"
-      <<: *integration_test
-      <<: *upgrade_docker
-      <<: *registry_mirror
-      script:
-        - env IT_PARTITION=0 make integration-in-k3d
-    - name: "k3d integration partition 1"
-      <<: *integration_test
-      <<: *upgrade_docker
-      <<: *registry_mirror
-      script:
-        - env IT_PARTITION=1 make integration-in-k3d
-    - name: "k3d integration partition 2"
-      <<: *integration_test
-      <<: *upgrade_docker
-      <<: *registry_mirror
-      script:
-        - env IT_PARTITION=2 make integration-in-k3d
-    - name: "k3d integration partition 3"
-      <<: *integration_test
-      <<: *upgrade_docker
-      <<: *registry_mirror
-      script:
-        - env IT_PARTITION=3 make integration-in-k3d
+    # - name: "k3d integration partition 0"
+    #   <<: *integration_test
+    #   <<: *upgrade_docker
+    #   <<: *registry_mirror
+    #   script:
+    #     - env IT_PARTITION=0 make integration-in-k3d
+    # - name: "k3d integration partition 1"
+    #   <<: *integration_test
+    #   <<: *upgrade_docker
+    #   <<: *registry_mirror
+    #   script:
+    #     - env IT_PARTITION=1 make integration-in-k3d
+    # - name: "k3d integration partition 2"
+    #   <<: *integration_test
+    #   <<: *upgrade_docker
+    #   <<: *registry_mirror
+    #   script:
+    #     - env IT_PARTITION=2 make integration-in-k3d
+    # - name: "k3d integration partition 3"
+    #   <<: *integration_test
+    #   <<: *upgrade_docker
+    #   <<: *registry_mirror
+    #   script:
+    #     - env IT_PARTITION=3 make integration-in-k3d
     - os: linux
       name: "diag/Linux unit"
       <<: *registry_mirror

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,120 @@
+# v1.28.0 Release - 07/14/2021
+Note: This release comes with a new config version, `v2beta19`. To upgrade your skaffold.yaml, use `skaffold fix`. If you choose not to upgrade, skaffold will auto-upgrade as best as it can.
+
+Highlights:
+* Skaffold healthchecks can now be run per deployer using the `--iterative-status-check=true` flag (fixes [5774](https://github.com/GoogleContainerTools/skaffold/issues/5774)). See docs [here](https://skaffold.dev/docs/workflows/ci-cd/#waiting-for-skaffold-deployments-using-healthcheck).
+* If you use `helm` with `skaffold` you might see a new survey asking for feedback on an upcoming redesign of that integration. 
+
+New Features:
+* Allow iterative status checks [#6115](https://github.com/GoogleContainerTools/skaffold/pull/6115)
+* Add survey config and framework to show feature surveys to skaffold users. [#6185](https://github.com/GoogleContainerTools/skaffold/pull/6185)
+
+Fixes:
+* Make completion work again [#6138](https://github.com/GoogleContainerTools/skaffold/pull/6138)
+* Propagate kaniko environment to GCB [#6181](https://github.com/GoogleContainerTools/skaffold/pull/6181)
+* Fix couldn't start notify trigger in multi-config projects [#6114](https://github.com/GoogleContainerTools/skaffold/pull/6114)
+* Fetch namespaces at time of sync [#6135](https://github.com/GoogleContainerTools/skaffold/pull/6135)
+* Replace missing template values with empty string [#6136](https://github.com/GoogleContainerTools/skaffold/pull/6136)
+* Fix survey active logic [#6194](https://github.com/GoogleContainerTools/skaffold/pull/6194)
+* Don't update survey prompt if survey prompt is not shown to stdout [#6192](https://github.com/GoogleContainerTools/skaffold/pull/6192)
+* change ptypes call to timestamppb to fix linters [#6164](https://github.com/GoogleContainerTools/skaffold/pull/6164)
+
+Updates and Refactors:
+* Update Skaffold dependencies [#6155](https://github.com/GoogleContainerTools/skaffold/pull/6155)
+* Simplify `--timestamps` output [#6146](https://github.com/GoogleContainerTools/skaffold/pull/6146)
+* Update Jib build plugin versions after 3.1.2 release [#6168](https://github.com/GoogleContainerTools/skaffold/pull/6168)
+* Update feature maturities [#6202](https://github.com/GoogleContainerTools/skaffold/pull/6202)
+* Add logic to show user survey in DisplaySurveyPrompt flow. [#6196](https://github.com/GoogleContainerTools/skaffold/pull/6196)
+* refactor: Read globalConfig instead of kubecontext config for survey config [#6191](https://github.com/GoogleContainerTools/skaffold/pull/6191)
+* Add information about workspace and dockerfile to artifact metadata [#6111](https://github.com/GoogleContainerTools/skaffold/pull/6111)
+* Added template expansion for helm chart version (#5709) [#6157](https://github.com/GoogleContainerTools/skaffold/pull/6157)
+* add set command for survey ids [#6197](https://github.com/GoogleContainerTools/skaffold/pull/6197)
+* Bump schema version to v2beta19 [#6116](https://github.com/GoogleContainerTools/skaffold/pull/6116)
+
+Docs, Test, and Release Updates:
+* Create SECURITY.md [#6140](https://github.com/GoogleContainerTools/skaffold/pull/6140)
+* Update Jib docs with some advanced usage examples [#6169](https://github.com/GoogleContainerTools/skaffold/pull/6169)
+* Disable k3d integration tests [#6171](https://github.com/GoogleContainerTools/skaffold/pull/6171)
+* Check release workflow [#6188](https://github.com/GoogleContainerTools/skaffold/pull/6188)
+* design proposal to show user survey other than Hats [#6186](https://github.com/GoogleContainerTools/skaffold/pull/6186)
+* Doc tweaks [#6176](https://github.com/GoogleContainerTools/skaffold/pull/6176)
+* working cloud profiler export for skaffold [#6066](https://github.com/GoogleContainerTools/skaffold/pull/6066)
+* Set specific permissions for workflows [#6139](https://github.com/GoogleContainerTools/skaffold/pull/6139)
+
+Huge thanks goes out to all of our contributors for this release:
+
+- Aaron Prindle
+- Brian de Alwis
+- Chanseok Oh
+- Gaurav
+- Hidenori Sugiyama
+- Marlon Gamez
+- Nick Kubala
+- Pablo Caderno
+- Tejal Desai
+- Yuwen Ma
+
+# v1.27.0 Release - 06/29/2021
+Note: This release comes with a new config version, `v2beta18`. To upgrade your skaffold.yaml, use `skaffold fix`. If you choose not to upgrade, skaffold will auto-upgrade as best as it can.
+
+Highlights:
+* Skaffold CLI respects `--kube-context` & `--kubeconfig` command line flags and uses it instead of active kubernetes context.
+* Status-Check now runs per deployer sequentially. For `skaffold.yaml` with multiple deployers, the next deploy will start after previous deployed resources stabilize. Docs coming soon! 
+
+New Features:
+* Configure nodes for running cluster builds (e.g. kaniko) by using the node selector config option `cluster.nodeSelector`. [#6083](https://github.com/GoogleContainerTools/skaffold/pull/6083)
+* Better defaults for GCB project when using Artifact Registry images [#6093](https://github.com/GoogleContainerTools/skaffold/pull/6093)
+* Skaffold init now supports Jib and Buildpacks artifacts by default [#6063](https://github.com/GoogleContainerTools/skaffold/pull/6063)
+* Structured tests configuration supports custom parameters [#6055](https://github.com/GoogleContainerTools/skaffold/pull/6055)
+
+Fixes:
+* log metrics upload failure and write to file instead. [#6108](https://github.com/GoogleContainerTools/skaffold/pull/6108)
+* Skaffold Render now validates manifests [#6043](https://github.com/GoogleContainerTools/skaffold/pull/6043)
+* Port-forwarding improvements for multi-config projects [#6090](https://github.com/GoogleContainerTools/skaffold/pull/6090)
+* Fix helm deploy error when configuring helm arg list and skaffold overrides[#6080](https://github.com/GoogleContainerTools/skaffold/pull/6080)
+* Use non alpine image and protoc 3.17.3 in proto generation [#6073](https://github.com/GoogleContainerTools/skaffold/pull/6073)
+* Fix setting `kubeContext` in skaffold [#6024](https://github.com/GoogleContainerTools/skaffold/pull/6024)
+* Use StdEncoding for git hash directory name [#6071](https://github.com/GoogleContainerTools/skaffold/pull/6071)
+* fix status-check to return success only on exact success criteria match [#6010](https://github.com/GoogleContainerTools/skaffold/pull/6010)
+* fix: gcb api throttling retry backoff not implemented correctly [#6023](https://github.com/GoogleContainerTools/skaffold/pull/6023)
+* Ensure events are serialized [#6064](https://github.com/GoogleContainerTools/skaffold/pull/6064)
+
+Updates and Refactors:
+* add source file and module to config parsing error description [#6087](https://github.com/GoogleContainerTools/skaffold/pull/6087)
+* Refactor to move podSelector, Syncer, StatusCheck, Debugger, Port-forwarder under Deployer [#6076](https://github.com/GoogleContainerTools/skaffold/pull/6076), 
+  [#6053](https://github.com/GoogleContainerTools/skaffold/pull/6053), [#6026](https://github.com/GoogleContainerTools/skaffold/pull/6026),
+  [#6021](https://github.com/GoogleContainerTools/skaffold/pull/6021),
+  [#6044](https://github.com/GoogleContainerTools/skaffold/pull/6044)
+* fix v3alpha version [#6084](https://github.com/GoogleContainerTools/skaffold/pull/6084),
+* [v2] Update v2 with new UX [#6086](https://github.com/GoogleContainerTools/skaffold/pull/6086)
+* Update to github.com/gogo/protobuf v1.3.2 (GO-2021-0053) [#6022](https://github.com/GoogleContainerTools/skaffold/pull/6022)
+
+Docs, Test, and Release Updates:
+* Document Helm image reference strategies [#6017](https://github.com/GoogleContainerTools/skaffold/pull/6017)
+* Optimize k8s-skaffold/skaffold image [#6106](https://github.com/GoogleContainerTools/skaffold/pull/6106)
+* Fix typo in executed file name [#6105](https://github.com/GoogleContainerTools/skaffold/pull/6105)
+* Escape parentheses in shJoin [#6101](https://github.com/GoogleContainerTools/skaffold/pull/6101)
+* Fix instructions to add actionable error codes. [#6094](https://github.com/GoogleContainerTools/skaffold/pull/6094)
+* Updates to ko builder design proposal to add implementation approach [#6046](https://github.com/GoogleContainerTools/skaffold/pull/6046)
+* fix invalid config version links in DEVELOPMENT.md [#6058](https://github.com/GoogleContainerTools/skaffold/pull/6058)
+
+
+Huge thanks goes out to all of our contributors for this release:
+
+- Aaron Prindle
+- Brian de Alwis
+- Chanseok Oh
+- Daniel Petró
+- Gaurav
+- Halvard Skogsrud
+- Jack
+- Kaan Karakaya
+- Marlon Gamez
+- Mridula
+- Nick Kubala
+- Tejal Desai
+- Yuwen Ma
+
 # v1.26.0 Release - 06/08/2021
 
 Highlights:
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,6 +3,8 @@ name: per-pr (darwin) @@
     # Triggers the workflow on push or pull request events
     on: [push, pull_request]
+    permissions: read-all
     jobs:
       build:
@@ Expand Down @@