Merge branch 'master' into feature/kaniko-env-expansion

.github/CODEOWNERS

@@ -2,14 +2,13 @@
 
 * @GoogleContainerTools/skaffold-team
 
-# Buildpacks owners
-
-**/**buildpacks** @GoogleContainerTools/skaffold-team
-
 # JIB owners
 
 **/**jib** @GoogleContainerTools/skaffold-team @loosebazooka @TadCordle @chanseokoh
 
+# kpt owners
+pkg/skaffold/deploy/**kpt** @GoogleContainerTools/skaffold-team @yuwenma
+
 # Debug owners
 
 pkg/skaffold/debug/** @GoogleContainerTools/skaffold-team @loosebazooka @quoctruong

.github/workflows/integration-darwin.yml

@@ -17,7 +17,7 @@ jobs:
         gcloud_sdk_version: [276.0.0]
         kubectl_version: [1.18.0]
         container_structure_tests_version: [1.8.0]
-        minikube_version: [1.11.0]
+        minikube_version: [1.12.1]
         integration_test_partitions: [0, 1, 2, 3]
     steps:
 
@@ -30,6 +30,10 @@ jobs:
     - name: Check out code into the Go module directory
       uses: actions/checkout@v2
 
+    - name: Skaffold binary version
+      run: |
+        echo ::set-env name=SKAFFOLD_VERSION::"$(git log --format="%H" -n 1)"
+
     - name: Install Kustomize
       run: |
         wget -O kustomize.tar.gz https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize/v${{ matrix.kustomize_version }}/kustomize_v${{ matrix.kustomize_version }}_darwin_amd64.tar.gz
@@ -72,6 +76,10 @@ jobs:
         gcloud auth configure-docker
         echo '{}' > ${HOME}/.docker/config.json
 
+    - name: Check VBoxManage installed
+      run: |
+        /usr/local/bin/VBoxManage list hostinfo
+
     - name: Install Minikube and start cluster
       run: |
         curl -Lo minikube https://storage.googleapis.com/minikube/releases/v${{ matrix.minikube_version }}/minikube-darwin-amd64
@@ -85,7 +93,7 @@ jobs:
 
     - name: Install Skaffold release binary
       run: |
-        curl -Lo skaffold https://storage.googleapis.com/skaffold/builds/latest/skaffold-darwin-amd64
+        curl -Lo skaffold https://storage.googleapis.com/skaffold/builds/${{ env.SKAFFOLD_VERSION }}/skaffold-darwin-amd64
         sudo install skaffold /usr/local/bin/skaffold
 
     - name: Run integration tests

.github/workflows/integration-linux.yml

@@ -29,6 +29,10 @@ jobs:
     - name: Check out code into the Go module directory
       uses: actions/checkout@v2
 
+    - name: Skaffold binary version
+      run: |
+        echo ::set-env name=SKAFFOLD_VERSION::"$(git log --format="%H" -n 1)"
+
     - name: Install Kustomize
       run: |
         wget -O kustomize.tar.gz https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize/v${{ matrix.kustomize_version }}/kustomize_v${{ matrix.kustomize_version }}_linux_amd64.tar.gz
@@ -76,7 +80,7 @@ jobs:
 
     - name: Install Skaffold release binary
       run: |
-        curl -Lo skaffold https://storage.googleapis.com/skaffold/builds/latest/skaffold-linux-amd64
+        curl -Lo skaffold https://storage.googleapis.com/skaffold/builds/${{ env.SKAFFOLD_VERSION }}/skaffold-linux-amd64
         sudo install skaffold /usr/local/bin/skaffold
 
     - name: Run integration tests

.travis.yml

@@ -11,6 +11,24 @@ branches:
   only:
     - master
 
+_integration_test: &integration_test
+  os: linux
+  language: minimal
+  cache:
+    directories:
+      - $HOME/.cache/go-build
+      - $HOME/.gradle
+      - $HOME/.m2
+
+# https://docs.travis-ci.com/user/docker/#installing-a-newer-docker-version
+# include in jobs where the docker version needs to be newer than what is shipped with xenial
+_upgrade_docker: &upgrade_docker
+  before_install:
+    - curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
+    - sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
+    - sudo apt-get update
+    - sudo apt-get -y -o Dpkg::Options::="--force-confnew" install docker-ce
+
 jobs:
   include:
     - os: linux
@@ -45,46 +63,42 @@ jobs:
       cache:
         directories:
           - C:\\Users\\travis\\AppData\\Local\\go-build
-    - os: linux
-      name: "integration partition 0"
-      language: minimal
+    - name: "kind integration partition 0"
+      <<: *integration_test
       script:
         - env IT_PARTITION=0 make integration-in-kind
-      cache:
-        directories:
-          - $HOME/.cache/go-build
-          - $HOME/.gradle
-          - $HOME/.m2
-    - os: linux
-      name: "integration partition 1"
-      language: minimal
+    - name: "kind integration partition 1"
+      <<: *integration_test
       script:
         - env IT_PARTITION=1 make integration-in-kind
-      cache:
-        directories:
-          - $HOME/.cache/go-build
-          - $HOME/.gradle
-          - $HOME/.m2
-    - os: linux
-      name: "integration partition 2"
-      language: minimal
+    - name: "kind integration partition 2"
+      <<: *integration_test
       script:
         - env IT_PARTITION=2 make integration-in-kind
-      cache:
-        directories:
-          - $HOME/.cache/go-build
-          - $HOME/.gradle
-          - $HOME/.m2
-    - os: linux
-      name: "integration partition 3"
-      language: minimal
+    - name: "kind integration partition 3"
+      <<: *integration_test
       script:
         - env IT_PARTITION=3 make integration-in-kind
-      cache:
-        directories:
-          - $HOME/.cache/go-build
-          - $HOME/.gradle
-          - $HOME/.m2
+    - name: "k3d integration partition 0"
+      <<: *integration_test
+      <<: *upgrade_docker
+      script:
+        - env IT_PARTITION=0 make integration-in-k3d
+    - name: "k3d integration partition 1"
+      <<: *integration_test
+      <<: *upgrade_docker
+      script:
+        - env IT_PARTITION=1 make integration-in-k3d
+    - name: "k3d integration partition 2"
+      <<: *integration_test
+      <<: *upgrade_docker
+      script:
+        - env IT_PARTITION=2 make integration-in-k3d
+    - name: "k3d integration partition 3"
+      <<: *integration_test
+      <<: *upgrade_docker
+      script:
+        - env IT_PARTITION=3 make integration-in-k3d
     - os: linux
       name: "diag/Linux unit"
       script: