From db1be910f750bab57688b8f5209634b79187818a Mon Sep 17 00:00:00 2001
From: Kevin Leimkuhler <kevin@kleimkuhler.com>
Date: Fri, 7 Feb 2020 15:15:35 -0800
Subject: [PATCH 1/9] Run all PRs on GH Actions VMs

Signed-off-by: Kevin Leimkuhler <kevin@kleimkuhler.com>
---
 .github/workflows/workflow.yml | 743 ++++++++++++++-------------------
 1 file changed, 316 insertions(+), 427 deletions(-)

diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
index e595201b9d108..f0d785f336605 100644
--- a/.github/workflows/workflow.yml
+++ b/.github/workflows/workflow.yml
@@ -4,36 +4,28 @@ on:
   pull_request: {}
   push:
     branches:
-    - master
+      - master
     tags:
-    - "*"
+      - "*"
 
 # Jobs by event type and dependencies:
 
 # Unit tests for every master/tag push and PR
 #
-# validate_go_deps
+# go_dependencies
 # go_unit_tests
 # go_lint
 # js_unit_tests
 
-# master/tag push and linkerd org PR: Docker build and integration tests
+# All master/tag pushes and PRs
 #
-# docker_pull
 # docker_build
-# kind_setup
-#   -> kind_integration_host
-#     -> kind_cleanup
+# -> kind_integration_tests
 
-# Forked repository PR: Docker build and integration tests
+# Docker push and cloud integration tests for every master/tag push
 #
-# docker_build
-#   -> kind_integration_github
-
-# Docker deploy and cloud integration tests for every master/tag push
-#
-#       -> docker_deploy
-#         -> cloud_integration
+#     -> docker_push
+#        -> cloud_integration_tests
 
 jobs:
 
@@ -44,30 +36,28 @@ jobs:
   # - every PR
   #
 
-  validate_go_deps:
-    name: Validate go deps
+  go_dependencies:
+    name: Go dependencies
     runs-on: ubuntu-18.04
     steps:
-    - name: Checkout code
-      uses: actions/checkout@v2
-    # for debugging
-    - name: Dump env
-      run: |
-        env | sort
-    - name: Dump GitHub context
-      env:
-        GITHUB_CONTEXT: ${{ toJson(github) }}
-      run: echo "$GITHUB_CONTEXT"
-    - name: Dump job context
-      env:
-        JOB_CONTEXT: ${{ toJson(job) }}
-      run: echo "$JOB_CONTEXT"
-    - name: Validate go deps
-      run: |
-        . bin/_tag.sh
-        for f in $( grep -lR --include=Dockerfile\* go-deps: . ) ; do
-          validate_go_deps_tag $f
-        done
+      - name: Checkout code
+        uses: actions/checkout@v2
+      - name: Dump env
+        run: env | sort
+      - name: Dump GitHub context
+        env:
+          GITHUB_CONTEXT: ${{ toJson(github) }}
+        run: echo "$GITHUB_CONTEXT"
+      - name: Dump job context
+        env:
+          JOB_CONTEXT: ${{ toJson(job) }}
+        run: echo "$JOB_CONTEXT"
+      - name: Validate go deps
+        run: |
+          . bin/_tag.sh
+          for f in $( grep -lR --include=Dockerfile\* go-deps: . ) ; do
+            validate_go_deps_tag $f
+          done
 
   go_unit_tests:
     name: Go unit tests
@@ -75,15 +65,15 @@ jobs:
     container:
       image: golang:1.13.4
     steps:
-    - name: Checkout code
-      uses: actions/checkout@v2
-    - name: Go unit tests
-      env:
-        GITCOOKIE_SH: ${{ secrets.GITCOOKIE_SH }}
-      run: |
-        echo "$GITCOOKIE_SH" | bash
-        # TODO: validate bin/protoc-go.sh does not dirty the repo
-        go test -cover -race -v -mod=readonly ./...
+      - name: Checkout code
+        uses: actions/checkout@v2
+      - name: Go unit tests
+        env:
+          GITCOOKIE_SH: ${{ secrets.GITCOOKIE_SH }}
+        run: |
+          echo "$GITCOOKIE_SH" | bash
+          # TODO: validate bin/protoc-go.sh does not dirty the repo
+          go test -cover -race -v -mod=readonly ./...
 
   go_lint:
     name: Go lint
@@ -91,31 +81,29 @@ jobs:
     container:
       image: golang:1.13.4
     steps:
-    - name: Checkout code
-      uses: actions/checkout@v2
-    - name: Go lint
-      env:
-        GITCOOKIE_SH: ${{ secrets.GITCOOKIE_SH }}
-        # prevent OOM
-        GOGC: 20
-      run: |
-        echo "$GITCOOKIE_SH" | bash
-        bin/lint --verbose
+      - name: Checkout code
+        uses: actions/checkout@v2
+      - name: Go lint
+        env:
+          GITCOOKIE_SH: ${{ secrets.GITCOOKIE_SH }}
+        run: |
+          echo "$GITCOOKIE_SH" | bash
+          bin/lint --verbose
 
-  go_fmt:
-    name: Go Format
+  go_format:
+    name: Go format
     runs-on: ubuntu-18.04
     container:
       image: golang:1.13.4
     steps:
-    - name: Checkout code
-      uses: actions/checkout@v2
-    - name: Format
-      env:
-        GITCOOKIE_SH: ${{ secrets.GITCOOKIE_SH }}
-      run: |
-        echo "$GITCOOKIE_SH" | bash
-        bin/fmt
+      - name: Checkout code
+        uses: actions/checkout@v2
+      - name: Format
+        env:
+          GITCOOKIE_SH: ${{ secrets.GITCOOKIE_SH }}
+        run: |
+          echo "$GITCOOKIE_SH" | bash
+          bin/fmt
 
   js_unit_tests:
     name: JS unit tests
@@ -123,17 +111,16 @@ jobs:
     container:
       image: node:10.16.0-stretch
     steps:
-    - name: Checkout code
-      uses: actions/checkout@v2
-    - name: Yarn setup
-      run: |
-        curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.21.1 --network-concurrency 1
-    - name: JS unit tests
-      run: |
-        export PATH="$HOME/.yarn/bin:$PATH"
-        export NODE_ENV=test
-        bin/web
-        bin/web test --reporters=jest-dot-reporter
+      - name: Checkout code
+        uses: actions/checkout@v2
+      - name: Yarn setup
+        run: curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.21.1 --network-concurrency 1
+      - name: JS unit tests
+        run: |
+          export PATH="$HOME/.yarn/bin:$PATH"
+          export NODE_ENV=test
+          bin/web
+          bin/web test --reporters=jest-dot-reporter
 
   #
   # Docker build and kind integration tests run for:
@@ -142,363 +129,265 @@ jobs:
   # - every PR
   #
 
-  docker_pull:
-    name: Docker pull
-    if: github.event_name != 'pull_request' || !github.event.pull_request.head.repo.fork
-    runs-on: ubuntu-18.04
-    steps:
-    - name: Checkout code
-      uses: actions/checkout@v2
-    - name: Docker SSH setup
-      run: |
-        mkdir -p ~/.ssh/
-        touch ~/.ssh/id && chmod 600 ~/.ssh/id
-        echo "${{ secrets.DOCKER_SSH_CONFIG }}"  > ~/.ssh/config
-        echo "${{ secrets.DOCKER_PRIVATE_KEY }}" > ~/.ssh/id
-        echo "${{ secrets.DOCKER_KNOWN_HOSTS }}" > ~/.ssh/known_hosts
-        ssh linkerd-docker docker version
-    - name: Docker pull
-      env:
-        DOCKER_HOST: ssh://linkerd-docker
-      run: |
-        bin/docker pull gcr.io/linkerd-io/proxy-init:v1.3.1
-        bin/docker pull prom/prometheus:v2.11.1
-
   docker_build:
     name: Docker build
     runs-on: ubuntu-18.04
-    env:
-      IMAGE_ARCHIVES_DIR: /home/runner/archives
     steps:
-    - name: Checkout code
-      uses: actions/checkout@v2
-    - name: Docker SSH setup
-      if: github.event_name != 'pull_request' || !github.event.pull_request.head.repo.fork
-      run: |
-        mkdir -p ~/.ssh/
-        touch ~/.ssh/id && chmod 600 ~/.ssh/id
-        echo "${{ secrets.DOCKER_SSH_CONFIG }}"  > ~/.ssh/config
-        echo "${{ secrets.DOCKER_PRIVATE_KEY }}" > ~/.ssh/id
-        echo "${{ secrets.DOCKER_KNOWN_HOSTS }}" > ~/.ssh/known_hosts
-        ssh linkerd-docker docker version
-        echo ::set-env name=DOCKER_HOST::ssh://linkerd-docker
-    - name: Build docker images
-      run: |
-        export PATH="`pwd`/bin:$PATH"
-        DOCKER_TRACE=1 bin/docker-build
-    - name: Create artifact with CLI and image archives
-      if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork
-      run: |
-        mkdir -p $IMAGE_ARCHIVES_DIR
-        cp target/cli/linux/linkerd $IMAGE_ARCHIVES_DIR/
-        TAG="$(CI_FORCE_CLEAN=1 bin/root-tag)"
-        for img in controller grafana proxy web ; do
-          docker save "gcr.io/linkerd-io/$img:$TAG" > $IMAGE_ARCHIVES_DIR/$img.tar
-        done
-    # `with.path` values do not support environment variables yet, so an
-    # absolute path is used here.
-    #
-    # https://github.com/actions/upload-artifact/issues/8
-    - name: Upload artifact
-      if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork
-      uses: actions/upload-artifact@v1
-      with:
-        name: image-archives
-        path: /home/runner/archives
+      - name: Checkout code
+        uses: actions/checkout@v2
+      - name: Set environment variables from scripts
+        run: |
+          . bin/_tag.sh
+          echo ::set-env name=TAG::$(CI_FORCE_CLEAN=1 bin/root-tag)
 
-  kind_setup:
-    strategy:
-      max-parallel: 3
-      matrix:
-        integration_test: [deep, upgrade, helm, helm_upgrade, custom_domain, external_issuer]
-    name: Cluster setup (${{ matrix.integration_test }})
-    if: github.event_name != 'pull_request' || !github.event.pull_request.head.repo.fork
-    runs-on: ubuntu-18.04
-    steps:
-    - name: Checkout code
-      uses: actions/checkout@v2
-    - name: Docker SSH setup
-      run: |
-        mkdir -p ~/.ssh/
-        touch ~/.ssh/id && chmod 600 ~/.ssh/id
-        echo "${{ secrets.DOCKER_SSH_CONFIG }}"  > ~/.ssh/config
-        echo "${{ secrets.DOCKER_PRIVATE_KEY }}" > ~/.ssh/id
-        echo "${{ secrets.DOCKER_KNOWN_HOSTS }}" > ~/.ssh/known_hosts
-        ssh linkerd-docker docker version
-    - name: Kind cluster setup
-      env:
-        DOCKER_HOST: ssh://linkerd-docker
-      run: |
-        TAG="$(CI_FORCE_CLEAN=1 bin/root-tag)"
-        export KIND_CLUSTER=github-$TAG-${{ matrix.integration_test }}
-        export KUBECONFIG=/tmp/kind-config-$KIND_CLUSTER
-        export CUSTOM_DOMAIN_CONFIG="test/testdata/custom_cluster_domain_config.yaml"
-        # retry cluster creation once in case of port conflict or kubeadm failure
-        if [ "${{ matrix.integration_test }}" == "custom_domain" ]
-        then
-          bin/kind create cluster --name=$KIND_CLUSTER --wait=2m --verbosity 3 --config=$CUSTOM_DOMAIN_CONFIG ||
-            bin/kind create cluster --name=$KIND_CLUSTER --wait=2m --verbosity 3 --config=$CUSTOM_DOMAIN_CONFIG
-        else
-          bin/kind create cluster --name=$KIND_CLUSTER --wait=2m --verbosity 3 ||
-            bin/kind create cluster --name=$KIND_CLUSTER --wait=2m --verbosity 3
-        fi
+          . bin/_docker.sh
+          echo ::set-env name=DOCKER_REGISTRY::$DOCKER_REGISTRY
+      - name: Setup SSH config for Packet
+        if: github.event_name != 'pull_request' || !github.event.pull_request.head.repo.fork
+        run: |
+          mkdir -p ~/.ssh/
+          touch ~/.ssh/id && chmod 600 ~/.ssh/id
+          echo "${{ secrets.DOCKER_SSH_CONFIG }}"  > ~/.ssh/config
+          echo "${{ secrets.DOCKER_PRIVATE_KEY }}" > ~/.ssh/id
+          echo "${{ secrets.DOCKER_KNOWN_HOSTS }}" > ~/.ssh/known_hosts
+          ssh linkerd-docker docker version
+          echo ::set-env name=DOCKER_HOST::ssh://linkerd-docker
+      - name: Build docker images
+        env:
+          DOCKER_TRACE: 1
+        run: |
+          export PATH="`pwd`/bin:$PATH"
+          bin/docker-build
+      - name: Create artifact with CLI and image archives (Forked repositories)
+        if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork
+        env:
+          ARCHIVES: /home/runner/archives
+        run: |
+          mkdir -p $ARCHIVES
 
-  #
-  # Integration tests that run on the docker host are limited by the fact that
-  # while they all run in separate KinD clusters, they are on the same
-  # machine. The `strategy` context cannot be conditionally set, so there are
-  # separate `kind_integration_*` jobs. This allows the `kind_integration_github`
-  # job to run it's entire matrix in parallel.
-  #
+          for image in proxy controller web cni-plugin debug cli-bin grafana; do
+            docker save "$DOCKER_REGISTRY/$image:$TAG" > $ARCHIVES/$image.tar &
+            pids[${i}]=$!
+            i=$((i+1))
+          done
 
-  kind_integration_host:
-    strategy:
-      max-parallel: 3
-      matrix:
-        integration_test: [deep, upgrade, helm, helm_upgrade, custom_domain, external_issuer]
-    needs: [docker_pull, docker_build, kind_setup]
-    name: Host int. tests (${{ matrix.integration_test }})
-    if: github.event_name != 'pull_request' || !github.event.pull_request.head.repo.fork
-    runs-on: ubuntu-18.04
-    steps:
-    - name: Checkout code
-      uses: actions/checkout@v2
-    - name: Docker SSH setup
-      run: |
-        mkdir -p ~/.ssh/
-        touch ~/.ssh/id && chmod 600 ~/.ssh/id
-        echo "${{ secrets.DOCKER_SSH_CONFIG }}"  > ~/.ssh/config
-        echo "${{ secrets.DOCKER_PRIVATE_KEY }}" > ~/.ssh/id
-        echo "${{ secrets.DOCKER_KNOWN_HOSTS }}" > ~/.ssh/known_hosts
-        ssh linkerd-docker docker version
-    - name: Try to load cached Go modules
-      uses: actions/cache@v1
-      with:
-        path: ~/go/pkg/mod
-        key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
-        restore-keys: |
-          ${{ runner.os }}-go-
-    - name: Kind load docker images
-      run: |
-        TAG="$(CI_FORCE_CLEAN=1 bin/root-tag)"
-        export KIND_CLUSTER=github-$TAG-${{ matrix.integration_test }}
-        ssh -T linkerd-docker > /dev/null << EOF
-          # TODO: This is using the kind binary on the remote host.
-          # TODO: 'kind' still points to v0.5.1. When there are no more old CI branches depending on that
-          # we can replace it with v0.6.1. In the meantime we explicitly use 'kind-0.6.1'
-          kind-0.6.1 load docker-image gcr.io/linkerd-io/proxy-init:v1.3.1 --name=$KIND_CLUSTER
-          kind-0.6.1 load docker-image prom/prometheus:v2.11.1 --name=$KIND_CLUSTER
-          for IMG in controller grafana proxy web ; do
-            kind-0.6.1 load docker-image gcr.io/linkerd-io/\$IMG:$TAG --name=$KIND_CLUSTER
+          # Wait for `docker save` background processes to complete.
+          for pid in ${pids[*]}; do
+            wait $pid
           done
-        EOF
-    - name: Install linkerd CLI
-      env:
-        DOCKER_HOST: ssh://linkerd-docker
-      run: |
-        TAG="$(CI_FORCE_CLEAN=1 bin/root-tag)"
-        image="gcr.io/linkerd-io/cli-bin:$TAG"
-        id=$(bin/docker create $image)
-        bin/docker cp "$id:/out/linkerd-linux" "$HOME/.linkerd"
-        $HOME/.linkerd version --client
-        # validate CLI version matches the repo
-        [[ "$TAG" == "$($HOME/.linkerd version --short --client)" ]]
-        echo "Installed Linkerd CLI version: $TAG"
-    - name: Run integration tests
-      env:
-        DOCKER_HOST: ssh://linkerd-docker
-        GITCOOKIE_SH: ${{ secrets.GITCOOKIE_SH }}
-      run: |
-        export PATH="`pwd`/bin:$PATH"
-        echo "$GITCOOKIE_SH" | bash
-        # TODO: pin Go version
-        go version
-        TAG="$(CI_FORCE_CLEAN=1 bin/root-tag)"
-        export KIND_CLUSTER=github-$TAG-${{ matrix.integration_test }}
-        # Restore kubeconfig from remote docker host.
-        mkdir -p $HOME/.kube
-        export KUBECONFIG=$HOME/.kube/kind-config-$KIND_CLUSTER
-        bin/kind export kubeconfig --name=$KIND_CLUSTER --kubeconfig $KUBECONFIG
-        # Start ssh tunnel to allow kubectl to connect via localhost.
-        export KIND_PORT=$(bin/kubectl config view -o jsonpath="{.clusters[?(@.name=='kind-$KIND_CLUSTER')].cluster.server}" | cut -d':' -f3)
-        echo "KIND_PORT: $KIND_PORT"
-        ssh -4 -N -L $KIND_PORT:localhost:$KIND_PORT linkerd-docker &
-        sleep 2 # Wait for ssh tunnel to come up.
-        bin/kubectl version --short # Test connection to kind cluster.
-        (
-          . bin/_test-run.sh
-          init_test_run $HOME/.linkerd
-          ${{ matrix.integration_test }}_integration_tests
-        )
+      # `with.path` values do not support environment variables yet, so an
+      # absolute path is used here.
+      #
+      # https://github.com/actions/upload-artifact/issues/8
+      - name: Upload artifact (Forked repositories)
+        if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork
+        uses: actions/upload-artifact@v1
+        with:
+          name: image-archives
+          path: /home/runner/archives
 
-  kind_integration_github:
+  kind_integration_tests:
     strategy:
       matrix:
         integration_test: [deep, upgrade, helm, helm_upgrade, custom_domain, external_issuer]
     needs: [docker_build]
-    name: GitHub int. tests (${{ matrix.integration_test }})
-    if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork
+    name: Integration tests (${{ matrix.integration_test }})
     runs-on: ubuntu-18.04
     steps:
-    - name: Checkout code
-      uses: actions/checkout@v2
-    - name: Download image archives
-      uses: actions/download-artifact@v1
-      with:
-        name: image-archives
-    - name: Try to load cached Go modules
-      uses: actions/cache@v1
-      with:
-        path: ~/go/pkg/mod
-        key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
-        restore-keys: |
-          ${{ runner.os }}-go-
-    - name: Setup KinD (default)
-      if: matrix.integration_test != 'custom_domain'
-      uses: engineerd/setup-kind@v0.3.0
-      with:
-        version: "v0.6.1"
-    - name: Setup KinD (custom_domain)
-      if: matrix.integration_test == 'custom_domain'
-      uses: engineerd/setup-kind@v0.3.0
-      with:
-        config: test/testdata/custom_cluster_domain_config.yaml
-        version: "v0.6.1"
-    - name: Load image archives into KinD
-      run: |
-        for img in controller grafana proxy web; do
-          kind load image-archive image-archives/$img.tar
-        done
-    - name: Install linkerd CLI
-      run: |
-        cp image-archives/linkerd $HOME/.linkerd
-        chmod +x $HOME/.linkerd
-    - name: Run integration tests
-      run: |
-        . bin/_test-run.sh
-        init_test_run $HOME/.linkerd
-        ${{ matrix.integration_test }}_integration_tests
+      - name: Checkout code
+        uses: actions/checkout@v2
+      - name: Try to load cached Go modules
+        uses: actions/cache@v1
+        with:
+          path: ~/go/pkg/mod
+          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
+          restore-keys: |
+            ${{ runner.os }}-go-
+      - name: Set environment variables from scripts
+        run: |
+          . bin/_tag.sh
+          echo ::set-env name=TAG::$(CI_FORCE_CLEAN=1 bin/root-tag)
 
-  kind_cleanup:
-    strategy:
-      fail-fast: false # always attempt to cleanup all clusters
-      matrix:
-        integration_test: [deep, upgrade, helm, helm_upgrade, custom_domain, external_issuer]
-    needs: [kind_integration_host]
-    name: Cluster cleanup (${{ matrix.integration_test }})
-    if: always() && (github.event_name != 'pull_request' || !github.event.pull_request.head.repo.fork)
-    runs-on: ubuntu-18.04
-    steps:
-    - name: Checkout code
-      uses: actions/checkout@v2
-    # for debugging
-    - name: Dump env
-      run: |
-        env | sort
-    - name: Dump GitHub context
-      env:
-        GITHUB_CONTEXT: ${{ toJson(github) }}
-      run: echo "$GITHUB_CONTEXT"
-    - name: Dump job context
-      env:
-        JOB_CONTEXT: ${{ toJson(job) }}
-      run: echo "$JOB_CONTEXT"
-    - name: Docker SSH setup
-      run: |
-        mkdir -p ~/.ssh/
-        touch ~/.ssh/id && chmod 600 ~/.ssh/id
-        echo "${{ secrets.DOCKER_SSH_CONFIG }}"  > ~/.ssh/config
-        echo "${{ secrets.DOCKER_PRIVATE_KEY }}" > ~/.ssh/id
-        echo "${{ secrets.DOCKER_KNOWN_HOSTS }}" > ~/.ssh/known_hosts
-        ssh linkerd-docker docker version
-    - name: Kind cluster cleanup
-      env:
-        DOCKER_HOST: ssh://linkerd-docker
-      run: |
-        TAG="$(CI_FORCE_CLEAN=1 bin/root-tag)"
-        export KIND_CLUSTER=github-$TAG-${{ matrix.integration_test }}
-        bin/kind delete cluster --name=$KIND_CLUSTER
+          . bin/_docker.sh
+          echo ::set-env name=DOCKER_REGISTRY::$DOCKER_REGISTRY
+      - name: Setup SSH config for Packet
+        if: github.event_name != 'pull_request' || !github.event.pull_request.head.repo.fork
+        run: |
+          mkdir -p ~/.ssh/
+          touch ~/.ssh/id && chmod 600 ~/.ssh/id
+          echo "${{ secrets.DOCKER_SSH_CONFIG }}"  > ~/.ssh/config
+          echo "${{ secrets.DOCKER_PRIVATE_KEY }}" > ~/.ssh/id
+          echo "${{ secrets.DOCKER_KNOWN_HOSTS }}" > ~/.ssh/known_hosts
+      - name: Download image archives (Forked repositories)
+        if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork
+        uses: actions/download-artifact@v1
+        with:
+          name: image-archives
+      - name: Load cli-bin image into local docker images
+        if: github.event_name != 'pull_request' || !github.event.pull_request.head.repo.fork
+        run: |
+          # `docker load` only accepts input from STDIN, so pipe the image
+          # archive into the command.
+          #
+          # In order to pipe the image archive, set `DOCKER_HOST` for a single
+          # command and `docker save` the CLI image from the Packet host.
+          DOCKER_HOST=ssh://linkerd-docker docker save "$DOCKER_REGISTRY/cli-bin:$TAG" | docker load
+      - name: Load cli-bin image into local docker images (Forked repositories)
+        if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork
+        run: docker load < image-archives/cli-bin.tar
+      - name: Install CLI
+        run: |
+          # Copy the CLI out of the local cli-bin container.
+          container_id=$(docker create "$DOCKER_REGISTRY/cli-bin:$TAG")
+          docker cp $container_id:/out/linkerd-linux $HOME/.linkerd
+
+          # Validate the CLI version matches the current build tag.
+          [[ "$TAG" == "$($HOME/.linkerd version --short --client)" ]]
+      - name: Setup default KinD cluster
+        if: matrix.integration_test != 'custom_domain'
+        uses: engineerd/setup-kind@v0.3.0
+        with:
+          version: "v0.6.1"
+      - name: Setup custom_domain KinD cluster
+        if: matrix.integration_test == 'custom_domain'
+        uses: engineerd/setup-kind@v0.3.0
+        with:
+          config: test/testdata/custom_cluster_domain_config.yaml
+          version: "v0.6.1"
+      - name: Load image archives into the local KinD cluster
+        if: github.event_name != 'pull_request' || !github.event.pull_request.head.repo.fork
+        env:
+          PROXY_INIT_IMAGE_NAME: gcr.io/linkerd-io/proxy-init:v1.3.1
+          PROMETHEUS_IMAGE_NAME: prom/prometheus:v2.11.1
+        run: |
+          # For each container, load the image archive into the KinD cluster.
+          #
+          # `kind load` cannot take input from STDIN, so `<(command)` syntax is
+          # used to load the output into the KinD cluster. Set `DOCKER_HOST` for
+          # a single command, and `docker save` the container from the Packet
+          # host.
+          i=0
+          for image in proxy controller web cni-plugin debug grafana; do
+            kind load image-archive <(DOCKER_HOST=ssh://linkerd-docker docker save "$DOCKER_REGISTRY/$image:$TAG") &
+            pids[${i}]=$!
+            i=$((i+1))
+          done
+
+          # Wait for `kind load` background processes to complete.
+          for pid in ${pids[*]}; do
+            wait $pid
+          done
+
+          # Load proxy-init and prometheus images into KinD while it is
+          # available.
+          kind load image-archive <(DOCKER_HOST=ssh://linkerd-docker docker save $PROXY_INIT_IMAGE_NAME)
+          kind load image-archive <(DOCKER_HOST=ssh://linkerd-docker docker save $PROMETHEUS_IMAGE_NAME)
+      - name: Load image archives into the local KinD cluster (Forked repositories)
+        if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork
+        run: |
+          for image in proxy controller web cni-plugin debug grafana; do
+            kind load image-archive image-archives/$image.tar &
+            pids[${i}]=$!
+            i=$((i+1))
+          done
+
+          # Wait for `kind load` background processes to complete.
+          for pid in ${pids[*]}; do
+            wait $pid
+          done
+      - name: Run integration tests
+        run: |
+          # Export `init_test_run` and `*_integration_tests` into the
+          # environment.
+          . bin/_test-run.sh
+
+          init_test_run $HOME/.linkerd
+          ${{ matrix.integration_test }}_integration_tests
 
   #
-  # Docker deploy and cloud integration tests run for:
+  # Docker push and cloud integration tests run for:
   # - every master push
   # - every tag push
   #
 
-  docker_deploy:
-    name: Docker deploy
+  docker_push:
+    name: Docker push
     if: github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags')
     runs-on: ubuntu-18.04
-    needs: [validate_go_deps, go_unit_tests, go_lint, js_unit_tests, kind_integration_host, kind_cleanup]
+    needs: [go_dependencies, go_unit_tests, go_lint, js_unit_tests, kind_integration_tests]
     steps:
-    - name: Checkout code
-      uses: actions/checkout@v2
-    - name: Configure gcloud
-      uses: linkerd/linkerd2-action-gcloud@v1.0.0
-      with:
-        cloud_sdk_service_account_key: ${{ secrets.CLOUD_SDK_SERVICE_ACCOUNT_KEY }}
-        gcp_project: ${{ secrets.GCP_PROJECT }}
-        gcp_zone: ${{ secrets.GCP_ZONE }}
-    - name: Docker SSH setup
-      run: |
-        mkdir -p ~/.ssh/
-        touch ~/.ssh/id && chmod 600 ~/.ssh/id
-        echo "${{ secrets.DOCKER_SSH_CONFIG }}"  > ~/.ssh/config
-        echo "${{ secrets.DOCKER_PRIVATE_KEY }}" > ~/.ssh/id
-        echo "${{ secrets.DOCKER_KNOWN_HOSTS }}" > ~/.ssh/known_hosts
-        ssh linkerd-docker docker version
-    - name: Docker push
-      env:
-        DOCKER_HOST: ssh://linkerd-docker
-      run: |
-        export PATH="`pwd`/bin:$PATH"
-        TAG="$(CI_FORCE_CLEAN=1 bin/root-tag)"
-        bin/docker-push-deps
-        bin/docker-push $TAG
-        bin/docker-retag-all $TAG master
-        bin/docker-push master
+      - name: Checkout code
+        uses: actions/checkout@v2
+      - name: Set environment variables from scripts
+        run: |
+          . bin/_tag.sh
+          echo ::set-env name=TAG::$(CI_FORCE_CLEAN=1 bin/root-tag)
+      - name: Configure gcloud
+        uses: linkerd/linkerd2-action-gcloud@v1.0.0
+        with:
+          cloud_sdk_service_account_key: ${{ secrets.CLOUD_SDK_SERVICE_ACCOUNT_KEY }}
+          gcp_project: ${{ secrets.GCP_PROJECT }}
+          gcp_zone: ${{ secrets.GCP_ZONE }}
+      - name: Docker SSH setup
+        run: |
+          mkdir -p ~/.ssh/
+          touch ~/.ssh/id && chmod 600 ~/.ssh/id
+          echo "${{ secrets.DOCKER_SSH_CONFIG }}"  > ~/.ssh/config
+          echo "${{ secrets.DOCKER_PRIVATE_KEY }}" > ~/.ssh/id
+          echo "${{ secrets.DOCKER_KNOWN_HOSTS }}" > ~/.ssh/known_hosts
+          ssh linkerd-docker docker version
+      - name: Push docker images to registry
+        env:
+          DOCKER_HOST: ssh://linkerd-docker
+        run: |
+          export PATH="`pwd`/bin:$PATH"
+          bin/docker-push-deps
+          bin/docker-push $TAG
+          bin/docker-retag-all $TAG master
+          bin/docker-push master
 
-  cloud_integration:
+  cloud_integration_tests:
     name: Cloud integration tests
     if: github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags')
     runs-on: ubuntu-18.04
-    needs: [docker_deploy]
+    needs: [docker_push]
     steps:
-    - name: Checkout code
-      uses: actions/checkout@v2
-    - name: Install linkerd CLI
-      id: install_cli
-      run: |
-        TAG="$(CI_FORCE_CLEAN=1 bin/root-tag)"
-        image="gcr.io/linkerd-io/cli-bin:$TAG"
-        id=$(bin/docker create $image)
-        bin/docker cp "$id:/out/linkerd-linux" "$HOME/.linkerd"
-        $HOME/.linkerd version --client
-        # validate CLI version matches the repo
-        [[ "$TAG" == "$($HOME/.linkerd version --short --client)" ]]
-        echo "Installed Linkerd CLI version: $TAG"
-        echo "::set-output name=tag::$TAG"
-    - name: Create GKE cluster
-      uses: linkerd/linkerd2-action-gcloud@v1.0.0
-      with:
-        cloud_sdk_service_account_key: ${{ secrets.CLOUD_SDK_SERVICE_ACCOUNT_KEY }}
-        gcp_project: ${{ secrets.GCP_PROJECT }}
-        gcp_zone: ${{ secrets.GCP_ZONE }}
-        create: true
-        name: testing-${{ steps.install_cli.outputs.tag }}-${{ github.run_id }}
-    - name: Run integration tests
-      env:
-        GITCOOKIE_SH: ${{ secrets.GITCOOKIE_SH }}
-      run: |
-        export PATH="`pwd`/bin:$PATH"
-        echo "$GITCOOKIE_SH" | bash
-        version="$($HOME/.linkerd version --client --short | tr -cd '[:alnum:]-')"
-        bin/test-run $HOME/.linkerd linkerd-$version
-    - name: CNI tests
-      run: |
-        export TAG="$($HOME/.linkerd version --client --short)"
-        go test -cover -race -v -mod=readonly ./cni-plugin/test -integration-tests
+      - name: Checkout code
+        uses: actions/checkout@v2
+      - name: Install linkerd CLI
+        id: install_cli
+        run: |
+          TAG="$(CI_FORCE_CLEAN=1 bin/root-tag)"
+          image="gcr.io/linkerd-io/cli-bin:$TAG"
+          id=$(bin/docker create $image)
+          bin/docker cp "$id:/out/linkerd-linux" "$HOME/.linkerd"
+          $HOME/.linkerd version --client
+          # validate CLI version matches the repo
+          [[ "$TAG" == "$($HOME/.linkerd version --short --client)" ]]
+          echo "Installed Linkerd CLI version: $TAG"
+          echo "::set-output name=tag::$TAG"
+      - name: Create GKE cluster
+        uses: linkerd/linkerd2-action-gcloud@v1.0.0
+        with:
+          cloud_sdk_service_account_key: ${{ secrets.CLOUD_SDK_SERVICE_ACCOUNT_KEY }}
+          gcp_project: ${{ secrets.GCP_PROJECT }}
+          gcp_zone: ${{ secrets.GCP_ZONE }}
+          create: true
+          name: testing-${{ steps.install_cli.outputs.tag }}-${{ github.run_id }}
+      - name: Run integration tests
+        env:
+          GITCOOKIE_SH: ${{ secrets.GITCOOKIE_SH }}
+        run: |
+          export PATH="`pwd`/bin:$PATH"
+          echo "$GITCOOKIE_SH" | bash
+          version="$($HOME/.linkerd version --client --short | tr -cd '[:alnum:]-')"
+          bin/test-run $HOME/.linkerd linkerd-$version
+      - name: CNI tests
+        run: |
+          export TAG="$($HOME/.linkerd version --client --short)"
+          go test -cover -race -v -mod=readonly ./cni-plugin/test -integration-tests
 
+  #
   # Helm chart artifact deploy run for:
   # - every tag push
   #
@@ -507,27 +396,27 @@ jobs:
     name: Helm chart deploy
     if: startsWith(github.ref, 'refs/tags')
     runs-on: ubuntu-18.04
-    needs: [cloud_integration]
+    needs: [cloud_integration_tests]
     steps:
-    - name: Checkout code
-      uses: actions/checkout@v2
-    - name: Configure gsutils
-      uses: linkerd/linkerd2-action-gcloud@v1.0.0
-      with:
-        cloud_sdk_service_account_key: ${{ secrets.CLOUD_SDK_SERVICE_ACCOUNT_KEY }}
-        gcp_project: ${{ secrets.GCP_PROJECT }}
-        gcp_zone: ${{ secrets.GCP_ZONE }}
-    - name: Edge Helm chart creation and upload
-      if: startsWith(github.ref, 'refs/tags/edge')
-      run: |
-        mkdir -p target/helm
-        gsutil cp gs://helm.linkerd.io/edge/index.yaml target/helm/index-pre.yaml
-        bin/helm-build package
-        gsutil rsync target/helm gs://helm.linkerd.io/edge
-    - name: Stable Helm chart creation and upload
-      if: startsWith(github.ref, 'refs/tags/stable')
-      run: |
-        mkdir -p target/helm
-        gsutil cp gs://helm.linkerd.io/stable/index.yaml target/helm/index-pre.yaml
-        bin/helm-build package
-        gsutil rsync target/helm gs://helm.linkerd.io/stable
+      - name: Checkout code
+        uses: actions/checkout@v2
+      - name: Configure gsutils
+        uses: linkerd/linkerd2-action-gcloud@v1.0.0
+        with:
+          cloud_sdk_service_account_key: ${{ secrets.CLOUD_SDK_SERVICE_ACCOUNT_KEY }}
+          gcp_project: ${{ secrets.GCP_PROJECT }}
+          gcp_zone: ${{ secrets.GCP_ZONE }}
+      - name: Edge Helm chart creation and upload
+        if: startsWith(github.ref, 'refs/tags/edge')
+        run: |
+          mkdir -p target/helm
+          gsutil cp gs://helm.linkerd.io/edge/index.yaml target/helm/index-pre.yaml
+          bin/helm-build package
+          gsutil rsync target/helm gs://helm.linkerd.io/edge
+      - name: Stable Helm chart creation and upload
+        if: startsWith(github.ref, 'refs/tags/stable')
+        run: |
+          mkdir -p target/helm
+          gsutil cp gs://helm.linkerd.io/stable/index.yaml target/helm/index-pre.yaml
+          bin/helm-build package
+          gsutil rsync target/helm gs://helm.linkerd.io/stable

From 85e77986ba0e904846f6a64177c0f4319408f1d9 Mon Sep 17 00:00:00 2001
From: Kevin Leimkuhler <kevin@kleimkuhler.com>
Date: Mon, 10 Feb 2020 12:44:43 -0800
Subject: [PATCH 2/9] Remove indentation

Signed-off-by: Kevin Leimkuhler <kevin@kleimkuhler.com>
---
 .github/workflows/workflow.yml | 580 ++++++++++++++++-----------------
 1 file changed, 290 insertions(+), 290 deletions(-)

diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
index f0d785f336605..b88b40b3db58e 100644
--- a/.github/workflows/workflow.yml
+++ b/.github/workflows/workflow.yml
@@ -40,24 +40,24 @@ jobs:
     name: Go dependencies
     runs-on: ubuntu-18.04
     steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
-      - name: Dump env
-        run: env | sort
-      - name: Dump GitHub context
-        env:
-          GITHUB_CONTEXT: ${{ toJson(github) }}
-        run: echo "$GITHUB_CONTEXT"
-      - name: Dump job context
-        env:
-          JOB_CONTEXT: ${{ toJson(job) }}
-        run: echo "$JOB_CONTEXT"
-      - name: Validate go deps
-        run: |
-          . bin/_tag.sh
-          for f in $( grep -lR --include=Dockerfile\* go-deps: . ) ; do
-            validate_go_deps_tag $f
-          done
+    - name: Checkout code
+      uses: actions/checkout@v2
+    - name: Dump env
+      run: env | sort
+    - name: Dump GitHub context
+      env:
+        GITHUB_CONTEXT: ${{ toJson(github) }}
+      run: echo "$GITHUB_CONTEXT"
+    - name: Dump job context
+      env:
+        JOB_CONTEXT: ${{ toJson(job) }}
+      run: echo "$JOB_CONTEXT"
+    - name: Validate go deps
+      run: |
+        . bin/_tag.sh
+        for f in $( grep -lR --include=Dockerfile\* go-deps: . ) ; do
+          validate_go_deps_tag $f
+        done
 
   go_unit_tests:
     name: Go unit tests
@@ -65,15 +65,15 @@ jobs:
     container:
       image: golang:1.13.4
     steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
-      - name: Go unit tests
-        env:
-          GITCOOKIE_SH: ${{ secrets.GITCOOKIE_SH }}
-        run: |
-          echo "$GITCOOKIE_SH" | bash
-          # TODO: validate bin/protoc-go.sh does not dirty the repo
-          go test -cover -race -v -mod=readonly ./...
+    - name: Checkout code
+      uses: actions/checkout@v2
+    - name: Go unit tests
+      env:
+        GITCOOKIE_SH: ${{ secrets.GITCOOKIE_SH }}
+      run: |
+        echo "$GITCOOKIE_SH" | bash
+        # TODO: validate bin/protoc-go.sh does not dirty the repo
+        go test -cover -race -v -mod=readonly ./...
 
   go_lint:
     name: Go lint
@@ -81,14 +81,14 @@ jobs:
     container:
       image: golang:1.13.4
     steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
-      - name: Go lint
-        env:
-          GITCOOKIE_SH: ${{ secrets.GITCOOKIE_SH }}
-        run: |
-          echo "$GITCOOKIE_SH" | bash
-          bin/lint --verbose
+    - name: Checkout code
+      uses: actions/checkout@v2
+    - name: Go lint
+      env:
+        GITCOOKIE_SH: ${{ secrets.GITCOOKIE_SH }}
+      run: |
+        echo "$GITCOOKIE_SH" | bash
+        bin/lint --verbose
 
   go_format:
     name: Go format
@@ -96,14 +96,14 @@ jobs:
     container:
       image: golang:1.13.4
     steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
-      - name: Format
-        env:
-          GITCOOKIE_SH: ${{ secrets.GITCOOKIE_SH }}
-        run: |
-          echo "$GITCOOKIE_SH" | bash
-          bin/fmt
+    - name: Checkout code
+      uses: actions/checkout@v2
+    - name: Format
+      env:
+        GITCOOKIE_SH: ${{ secrets.GITCOOKIE_SH }}
+      run: |
+        echo "$GITCOOKIE_SH" | bash
+        bin/fmt
 
   js_unit_tests:
     name: JS unit tests
@@ -111,16 +111,16 @@ jobs:
     container:
       image: node:10.16.0-stretch
     steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
-      - name: Yarn setup
-        run: curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.21.1 --network-concurrency 1
-      - name: JS unit tests
-        run: |
-          export PATH="$HOME/.yarn/bin:$PATH"
-          export NODE_ENV=test
-          bin/web
-          bin/web test --reporters=jest-dot-reporter
+    - name: Checkout code
+      uses: actions/checkout@v2
+    - name: Yarn setup
+      run: curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.21.1 --network-concurrency 1
+    - name: JS unit tests
+      run: |
+        export PATH="$HOME/.yarn/bin:$PATH"
+        export NODE_ENV=test
+        bin/web
+        bin/web test --reporters=jest-dot-reporter
 
   #
   # Docker build and kind integration tests run for:
@@ -133,58 +133,58 @@ jobs:
     name: Docker build
     runs-on: ubuntu-18.04
     steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
-      - name: Set environment variables from scripts
-        run: |
-          . bin/_tag.sh
-          echo ::set-env name=TAG::$(CI_FORCE_CLEAN=1 bin/root-tag)
+    - name: Checkout code
+      uses: actions/checkout@v2
+    - name: Set environment variables from scripts
+      run: |
+        . bin/_tag.sh
+        echo ::set-env name=TAG::$(CI_FORCE_CLEAN=1 bin/root-tag)
 
-          . bin/_docker.sh
-          echo ::set-env name=DOCKER_REGISTRY::$DOCKER_REGISTRY
-      - name: Setup SSH config for Packet
-        if: github.event_name != 'pull_request' || !github.event.pull_request.head.repo.fork
-        run: |
-          mkdir -p ~/.ssh/
-          touch ~/.ssh/id && chmod 600 ~/.ssh/id
-          echo "${{ secrets.DOCKER_SSH_CONFIG }}"  > ~/.ssh/config
-          echo "${{ secrets.DOCKER_PRIVATE_KEY }}" > ~/.ssh/id
-          echo "${{ secrets.DOCKER_KNOWN_HOSTS }}" > ~/.ssh/known_hosts
-          ssh linkerd-docker docker version
-          echo ::set-env name=DOCKER_HOST::ssh://linkerd-docker
-      - name: Build docker images
-        env:
-          DOCKER_TRACE: 1
-        run: |
-          export PATH="`pwd`/bin:$PATH"
-          bin/docker-build
-      - name: Create artifact with CLI and image archives (Forked repositories)
-        if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork
-        env:
-          ARCHIVES: /home/runner/archives
-        run: |
-          mkdir -p $ARCHIVES
+        . bin/_docker.sh
+        echo ::set-env name=DOCKER_REGISTRY::$DOCKER_REGISTRY
+    - name: Setup SSH config for Packet
+      if: github.event_name != 'pull_request' || !github.event.pull_request.head.repo.fork
+      run: |
+        mkdir -p ~/.ssh/
+        touch ~/.ssh/id && chmod 600 ~/.ssh/id
+        echo "${{ secrets.DOCKER_SSH_CONFIG }}"  > ~/.ssh/config
+        echo "${{ secrets.DOCKER_PRIVATE_KEY }}" > ~/.ssh/id
+        echo "${{ secrets.DOCKER_KNOWN_HOSTS }}" > ~/.ssh/known_hosts
+        ssh linkerd-docker docker version
+        echo ::set-env name=DOCKER_HOST::ssh://linkerd-docker
+    - name: Build docker images
+      env:
+        DOCKER_TRACE: 1
+      run: |
+        export PATH="`pwd`/bin:$PATH"
+        bin/docker-build
+    - name: Create artifact with CLI and image archives (Forked repositories)
+      if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork
+      env:
+        ARCHIVES: /home/runner/archives
+      run: |
+        mkdir -p $ARCHIVES
 
-          for image in proxy controller web cni-plugin debug cli-bin grafana; do
-            docker save "$DOCKER_REGISTRY/$image:$TAG" > $ARCHIVES/$image.tar &
-            pids[${i}]=$!
-            i=$((i+1))
-          done
+        for image in proxy controller web cni-plugin debug cli-bin grafana; do
+          docker save "$DOCKER_REGISTRY/$image:$TAG" > $ARCHIVES/$image.tar &
+          pids[${i}]=$!
+          i=$((i+1))
+        done
 
-          # Wait for `docker save` background processes to complete.
-          for pid in ${pids[*]}; do
-            wait $pid
-          done
-      # `with.path` values do not support environment variables yet, so an
-      # absolute path is used here.
-      #
-      # https://github.com/actions/upload-artifact/issues/8
-      - name: Upload artifact (Forked repositories)
-        if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork
-        uses: actions/upload-artifact@v1
-        with:
-          name: image-archives
-          path: /home/runner/archives
+        # Wait for `docker save` background processes to complete.
+        for pid in ${pids[*]}; do
+          wait $pid
+        done
+    # `with.path` values do not support environment variables yet, so an
+    # absolute path is used here.
+    #
+    # https://github.com/actions/upload-artifact/issues/8
+    - name: Upload artifact (Forked repositories)
+      if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork
+      uses: actions/upload-artifact@v1
+      with:
+        name: image-archives
+        path: /home/runner/archives
 
   kind_integration_tests:
     strategy:
@@ -194,115 +194,115 @@ jobs:
     name: Integration tests (${{ matrix.integration_test }})
     runs-on: ubuntu-18.04
     steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
-      - name: Try to load cached Go modules
-        uses: actions/cache@v1
-        with:
-          path: ~/go/pkg/mod
-          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
-          restore-keys: |
-            ${{ runner.os }}-go-
-      - name: Set environment variables from scripts
-        run: |
-          . bin/_tag.sh
-          echo ::set-env name=TAG::$(CI_FORCE_CLEAN=1 bin/root-tag)
+    - name: Checkout code
+      uses: actions/checkout@v2
+    - name: Try to load cached Go modules
+      uses: actions/cache@v1
+      with:
+        path: ~/go/pkg/mod
+        key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
+        restore-keys: |
+          ${{ runner.os }}-go-
+    - name: Set environment variables from scripts
+      run: |
+        . bin/_tag.sh
+        echo ::set-env name=TAG::$(CI_FORCE_CLEAN=1 bin/root-tag)
 
-          . bin/_docker.sh
-          echo ::set-env name=DOCKER_REGISTRY::$DOCKER_REGISTRY
-      - name: Setup SSH config for Packet
-        if: github.event_name != 'pull_request' || !github.event.pull_request.head.repo.fork
-        run: |
-          mkdir -p ~/.ssh/
-          touch ~/.ssh/id && chmod 600 ~/.ssh/id
-          echo "${{ secrets.DOCKER_SSH_CONFIG }}"  > ~/.ssh/config
-          echo "${{ secrets.DOCKER_PRIVATE_KEY }}" > ~/.ssh/id
-          echo "${{ secrets.DOCKER_KNOWN_HOSTS }}" > ~/.ssh/known_hosts
-      - name: Download image archives (Forked repositories)
-        if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork
-        uses: actions/download-artifact@v1
-        with:
-          name: image-archives
-      - name: Load cli-bin image into local docker images
-        if: github.event_name != 'pull_request' || !github.event.pull_request.head.repo.fork
-        run: |
-          # `docker load` only accepts input from STDIN, so pipe the image
-          # archive into the command.
-          #
-          # In order to pipe the image archive, set `DOCKER_HOST` for a single
-          # command and `docker save` the CLI image from the Packet host.
-          DOCKER_HOST=ssh://linkerd-docker docker save "$DOCKER_REGISTRY/cli-bin:$TAG" | docker load
-      - name: Load cli-bin image into local docker images (Forked repositories)
-        if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork
-        run: docker load < image-archives/cli-bin.tar
-      - name: Install CLI
-        run: |
-          # Copy the CLI out of the local cli-bin container.
-          container_id=$(docker create "$DOCKER_REGISTRY/cli-bin:$TAG")
-          docker cp $container_id:/out/linkerd-linux $HOME/.linkerd
+        . bin/_docker.sh
+        echo ::set-env name=DOCKER_REGISTRY::$DOCKER_REGISTRY
+    - name: Setup SSH config for Packet
+      if: github.event_name != 'pull_request' || !github.event.pull_request.head.repo.fork
+      run: |
+        mkdir -p ~/.ssh/
+        touch ~/.ssh/id && chmod 600 ~/.ssh/id
+        echo "${{ secrets.DOCKER_SSH_CONFIG }}"  > ~/.ssh/config
+        echo "${{ secrets.DOCKER_PRIVATE_KEY }}" > ~/.ssh/id
+        echo "${{ secrets.DOCKER_KNOWN_HOSTS }}" > ~/.ssh/known_hosts
+    - name: Download image archives (Forked repositories)
+      if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork
+      uses: actions/download-artifact@v1
+      with:
+        name: image-archives
+    - name: Load cli-bin image into local docker images
+      if: github.event_name != 'pull_request' || !github.event.pull_request.head.repo.fork
+      run: |
+        # `docker load` only accepts input from STDIN, so pipe the image
+        # archive into the command.
+        #
+        # In order to pipe the image archive, set `DOCKER_HOST` for a single
+        # command and `docker save` the CLI image from the Packet host.
+        DOCKER_HOST=ssh://linkerd-docker docker save "$DOCKER_REGISTRY/cli-bin:$TAG" | docker load
+    - name: Load cli-bin image into local docker images (Forked repositories)
+      if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork
+      run: docker load < image-archives/cli-bin.tar
+    - name: Install CLI
+      run: |
+        # Copy the CLI out of the local cli-bin container.
+        container_id=$(docker create "$DOCKER_REGISTRY/cli-bin:$TAG")
+        docker cp $container_id:/out/linkerd-linux $HOME/.linkerd
 
-          # Validate the CLI version matches the current build tag.
-          [[ "$TAG" == "$($HOME/.linkerd version --short --client)" ]]
-      - name: Setup default KinD cluster
-        if: matrix.integration_test != 'custom_domain'
-        uses: engineerd/setup-kind@v0.3.0
-        with:
-          version: "v0.6.1"
-      - name: Setup custom_domain KinD cluster
-        if: matrix.integration_test == 'custom_domain'
-        uses: engineerd/setup-kind@v0.3.0
-        with:
-          config: test/testdata/custom_cluster_domain_config.yaml
-          version: "v0.6.1"
-      - name: Load image archives into the local KinD cluster
-        if: github.event_name != 'pull_request' || !github.event.pull_request.head.repo.fork
-        env:
-          PROXY_INIT_IMAGE_NAME: gcr.io/linkerd-io/proxy-init:v1.3.1
-          PROMETHEUS_IMAGE_NAME: prom/prometheus:v2.11.1
-        run: |
-          # For each container, load the image archive into the KinD cluster.
-          #
-          # `kind load` cannot take input from STDIN, so `<(command)` syntax is
-          # used to load the output into the KinD cluster. Set `DOCKER_HOST` for
-          # a single command, and `docker save` the container from the Packet
-          # host.
-          i=0
-          for image in proxy controller web cni-plugin debug grafana; do
-            kind load image-archive <(DOCKER_HOST=ssh://linkerd-docker docker save "$DOCKER_REGISTRY/$image:$TAG") &
-            pids[${i}]=$!
-            i=$((i+1))
-          done
+        # Validate the CLI version matches the current build tag.
+        [[ "$TAG" == "$($HOME/.linkerd version --short --client)" ]]
+    - name: Setup default KinD cluster
+      if: matrix.integration_test != 'custom_domain'
+      uses: engineerd/setup-kind@v0.3.0
+      with:
+        version: "v0.6.1"
+    - name: Setup custom_domain KinD cluster
+      if: matrix.integration_test == 'custom_domain'
+      uses: engineerd/setup-kind@v0.3.0
+      with:
+        config: test/testdata/custom_cluster_domain_config.yaml
+        version: "v0.6.1"
+    - name: Load image archives into the local KinD cluster
+      if: github.event_name != 'pull_request' || !github.event.pull_request.head.repo.fork
+      env:
+        PROXY_INIT_IMAGE_NAME: gcr.io/linkerd-io/proxy-init:v1.3.1
+        PROMETHEUS_IMAGE_NAME: prom/prometheus:v2.11.1
+      run: |
+        # For each container, load the image archive into the KinD cluster.
+        #
+        # `kind load` cannot take input from STDIN, so `<(command)` syntax is
+        # used to load the output into the KinD cluster. Set `DOCKER_HOST` for
+        # a single command, and `docker save` the container from the Packet
+        # host.
+        i=0
+        for image in proxy controller web cni-plugin debug grafana; do
+          kind load image-archive <(DOCKER_HOST=ssh://linkerd-docker docker save "$DOCKER_REGISTRY/$image:$TAG") &
+          pids[${i}]=$!
+          i=$((i+1))
+        done
 
-          # Wait for `kind load` background processes to complete.
-          for pid in ${pids[*]}; do
-            wait $pid
-          done
+        # Wait for `kind load` background processes to complete.
+        for pid in ${pids[*]}; do
+          wait $pid
+        done
 
-          # Load proxy-init and prometheus images into KinD while it is
-          # available.
-          kind load image-archive <(DOCKER_HOST=ssh://linkerd-docker docker save $PROXY_INIT_IMAGE_NAME)
-          kind load image-archive <(DOCKER_HOST=ssh://linkerd-docker docker save $PROMETHEUS_IMAGE_NAME)
-      - name: Load image archives into the local KinD cluster (Forked repositories)
-        if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork
-        run: |
-          for image in proxy controller web cni-plugin debug grafana; do
-            kind load image-archive image-archives/$image.tar &
-            pids[${i}]=$!
-            i=$((i+1))
-          done
+        # Load proxy-init and prometheus images into KinD while it is
+        # available.
+        kind load image-archive <(DOCKER_HOST=ssh://linkerd-docker docker save $PROXY_INIT_IMAGE_NAME)
+        kind load image-archive <(DOCKER_HOST=ssh://linkerd-docker docker save $PROMETHEUS_IMAGE_NAME)
+    - name: Load image archives into the local KinD cluster (Forked repositories)
+      if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork
+      run: |
+        for image in proxy controller web cni-plugin debug grafana; do
+          kind load image-archive image-archives/$image.tar &
+          pids[${i}]=$!
+          i=$((i+1))
+        done
 
-          # Wait for `kind load` background processes to complete.
-          for pid in ${pids[*]}; do
-            wait $pid
-          done
-      - name: Run integration tests
-        run: |
-          # Export `init_test_run` and `*_integration_tests` into the
-          # environment.
-          . bin/_test-run.sh
+        # Wait for `kind load` background processes to complete.
+        for pid in ${pids[*]}; do
+          wait $pid
+        done
+    - name: Run integration tests
+      run: |
+        # Export `init_test_run` and `*_integration_tests` into the
+        # environment.
+        . bin/_test-run.sh
 
-          init_test_run $HOME/.linkerd
-          ${{ matrix.integration_test }}_integration_tests
+        init_test_run $HOME/.linkerd
+        ${{ matrix.integration_test }}_integration_tests
 
   #
   # Docker push and cloud integration tests run for:
@@ -316,35 +316,35 @@ jobs:
     runs-on: ubuntu-18.04
     needs: [go_dependencies, go_unit_tests, go_lint, js_unit_tests, kind_integration_tests]
     steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
-      - name: Set environment variables from scripts
-        run: |
-          . bin/_tag.sh
-          echo ::set-env name=TAG::$(CI_FORCE_CLEAN=1 bin/root-tag)
-      - name: Configure gcloud
-        uses: linkerd/linkerd2-action-gcloud@v1.0.0
-        with:
-          cloud_sdk_service_account_key: ${{ secrets.CLOUD_SDK_SERVICE_ACCOUNT_KEY }}
-          gcp_project: ${{ secrets.GCP_PROJECT }}
-          gcp_zone: ${{ secrets.GCP_ZONE }}
-      - name: Docker SSH setup
-        run: |
-          mkdir -p ~/.ssh/
-          touch ~/.ssh/id && chmod 600 ~/.ssh/id
-          echo "${{ secrets.DOCKER_SSH_CONFIG }}"  > ~/.ssh/config
-          echo "${{ secrets.DOCKER_PRIVATE_KEY }}" > ~/.ssh/id
-          echo "${{ secrets.DOCKER_KNOWN_HOSTS }}" > ~/.ssh/known_hosts
-          ssh linkerd-docker docker version
-      - name: Push docker images to registry
-        env:
-          DOCKER_HOST: ssh://linkerd-docker
-        run: |
-          export PATH="`pwd`/bin:$PATH"
-          bin/docker-push-deps
-          bin/docker-push $TAG
-          bin/docker-retag-all $TAG master
-          bin/docker-push master
+    - name: Checkout code
+      uses: actions/checkout@v2
+    - name: Set environment variables from scripts
+      run: |
+        . bin/_tag.sh
+        echo ::set-env name=TAG::$(CI_FORCE_CLEAN=1 bin/root-tag)
+    - name: Configure gcloud
+      uses: linkerd/linkerd2-action-gcloud@v1.0.0
+      with:
+        cloud_sdk_service_account_key: ${{ secrets.CLOUD_SDK_SERVICE_ACCOUNT_KEY }}
+        gcp_project: ${{ secrets.GCP_PROJECT }}
+        gcp_zone: ${{ secrets.GCP_ZONE }}
+    - name: Docker SSH setup
+      run: |
+        mkdir -p ~/.ssh/
+        touch ~/.ssh/id && chmod 600 ~/.ssh/id
+        echo "${{ secrets.DOCKER_SSH_CONFIG }}"  > ~/.ssh/config
+        echo "${{ secrets.DOCKER_PRIVATE_KEY }}" > ~/.ssh/id
+        echo "${{ secrets.DOCKER_KNOWN_HOSTS }}" > ~/.ssh/known_hosts
+        ssh linkerd-docker docker version
+    - name: Push docker images to registry
+      env:
+        DOCKER_HOST: ssh://linkerd-docker
+      run: |
+        export PATH="`pwd`/bin:$PATH"
+        bin/docker-push-deps
+        bin/docker-push $TAG
+        bin/docker-retag-all $TAG master
+        bin/docker-push master
 
   cloud_integration_tests:
     name: Cloud integration tests
@@ -352,40 +352,40 @@ jobs:
     runs-on: ubuntu-18.04
     needs: [docker_push]
     steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
-      - name: Install linkerd CLI
-        id: install_cli
-        run: |
-          TAG="$(CI_FORCE_CLEAN=1 bin/root-tag)"
-          image="gcr.io/linkerd-io/cli-bin:$TAG"
-          id=$(bin/docker create $image)
-          bin/docker cp "$id:/out/linkerd-linux" "$HOME/.linkerd"
-          $HOME/.linkerd version --client
-          # validate CLI version matches the repo
-          [[ "$TAG" == "$($HOME/.linkerd version --short --client)" ]]
-          echo "Installed Linkerd CLI version: $TAG"
-          echo "::set-output name=tag::$TAG"
-      - name: Create GKE cluster
-        uses: linkerd/linkerd2-action-gcloud@v1.0.0
-        with:
-          cloud_sdk_service_account_key: ${{ secrets.CLOUD_SDK_SERVICE_ACCOUNT_KEY }}
-          gcp_project: ${{ secrets.GCP_PROJECT }}
-          gcp_zone: ${{ secrets.GCP_ZONE }}
-          create: true
-          name: testing-${{ steps.install_cli.outputs.tag }}-${{ github.run_id }}
-      - name: Run integration tests
-        env:
-          GITCOOKIE_SH: ${{ secrets.GITCOOKIE_SH }}
-        run: |
-          export PATH="`pwd`/bin:$PATH"
-          echo "$GITCOOKIE_SH" | bash
-          version="$($HOME/.linkerd version --client --short | tr -cd '[:alnum:]-')"
-          bin/test-run $HOME/.linkerd linkerd-$version
-      - name: CNI tests
-        run: |
-          export TAG="$($HOME/.linkerd version --client --short)"
-          go test -cover -race -v -mod=readonly ./cni-plugin/test -integration-tests
+    - name: Checkout code
+      uses: actions/checkout@v2
+    - name: Install linkerd CLI
+      id: install_cli
+      run: |
+        TAG="$(CI_FORCE_CLEAN=1 bin/root-tag)"
+        image="gcr.io/linkerd-io/cli-bin:$TAG"
+        id=$(bin/docker create $image)
+        bin/docker cp "$id:/out/linkerd-linux" "$HOME/.linkerd"
+        $HOME/.linkerd version --client
+        # validate CLI version matches the repo
+        [[ "$TAG" == "$($HOME/.linkerd version --short --client)" ]]
+        echo "Installed Linkerd CLI version: $TAG"
+        echo "::set-output name=tag::$TAG"
+    - name: Create GKE cluster
+      uses: linkerd/linkerd2-action-gcloud@v1.0.0
+      with:
+        cloud_sdk_service_account_key: ${{ secrets.CLOUD_SDK_SERVICE_ACCOUNT_KEY }}
+        gcp_project: ${{ secrets.GCP_PROJECT }}
+        gcp_zone: ${{ secrets.GCP_ZONE }}
+        create: true
+        name: testing-${{ steps.install_cli.outputs.tag }}-${{ github.run_id }}
+    - name: Run integration tests
+      env:
+        GITCOOKIE_SH: ${{ secrets.GITCOOKIE_SH }}
+      run: |
+        export PATH="`pwd`/bin:$PATH"
+        echo "$GITCOOKIE_SH" | bash
+        version="$($HOME/.linkerd version --client --short | tr -cd '[:alnum:]-')"
+        bin/test-run $HOME/.linkerd linkerd-$version
+    - name: CNI tests
+      run: |
+        export TAG="$($HOME/.linkerd version --client --short)"
+        go test -cover -race -v -mod=readonly ./cni-plugin/test -integration-tests
 
   #
   # Helm chart artifact deploy run for:
@@ -398,25 +398,25 @@ jobs:
     runs-on: ubuntu-18.04
     needs: [cloud_integration_tests]
     steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
-      - name: Configure gsutils
-        uses: linkerd/linkerd2-action-gcloud@v1.0.0
-        with:
-          cloud_sdk_service_account_key: ${{ secrets.CLOUD_SDK_SERVICE_ACCOUNT_KEY }}
-          gcp_project: ${{ secrets.GCP_PROJECT }}
-          gcp_zone: ${{ secrets.GCP_ZONE }}
-      - name: Edge Helm chart creation and upload
-        if: startsWith(github.ref, 'refs/tags/edge')
-        run: |
-          mkdir -p target/helm
-          gsutil cp gs://helm.linkerd.io/edge/index.yaml target/helm/index-pre.yaml
-          bin/helm-build package
-          gsutil rsync target/helm gs://helm.linkerd.io/edge
-      - name: Stable Helm chart creation and upload
-        if: startsWith(github.ref, 'refs/tags/stable')
-        run: |
-          mkdir -p target/helm
-          gsutil cp gs://helm.linkerd.io/stable/index.yaml target/helm/index-pre.yaml
-          bin/helm-build package
-          gsutil rsync target/helm gs://helm.linkerd.io/stable
+    - name: Checkout code
+      uses: actions/checkout@v2
+    - name: Configure gsutils
+      uses: linkerd/linkerd2-action-gcloud@v1.0.0
+      with:
+        cloud_sdk_service_account_key: ${{ secrets.CLOUD_SDK_SERVICE_ACCOUNT_KEY }}
+        gcp_project: ${{ secrets.GCP_PROJECT }}
+        gcp_zone: ${{ secrets.GCP_ZONE }}
+    - name: Edge Helm chart creation and upload
+      if: startsWith(github.ref, 'refs/tags/edge')
+      run: |
+        mkdir -p target/helm
+        gsutil cp gs://helm.linkerd.io/edge/index.yaml target/helm/index-pre.yaml
+        bin/helm-build package
+        gsutil rsync target/helm gs://helm.linkerd.io/edge
+    - name: Stable Helm chart creation and upload
+      if: startsWith(github.ref, 'refs/tags/stable')
+      run: |
+        mkdir -p target/helm
+        gsutil cp gs://helm.linkerd.io/stable/index.yaml target/helm/index-pre.yaml
+        bin/helm-build package
+        gsutil rsync target/helm gs://helm.linkerd.io/stable

From be260f77f6c4946dae8eedacd3be9bebb2a4ba74 Mon Sep 17 00:00:00 2001
From: Kevin Leimkuhler <kevin@kleimkuhler.com>
Date: Mon, 10 Feb 2020 16:32:02 -0800
Subject: [PATCH 3/9] Fail script early if bg jobs fail

Signed-off-by: Kevin Leimkuhler <kevin@kleimkuhler.com>
---
 .github/workflows/workflow.yml | 36 ++++++++++++++--------------------
 1 file changed, 15 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
index b88b40b3db58e..86fd300ed2114 100644
--- a/.github/workflows/workflow.yml
+++ b/.github/workflows/workflow.yml
@@ -166,15 +166,13 @@ jobs:
         mkdir -p $ARCHIVES
 
         for image in proxy controller web cni-plugin debug cli-bin grafana; do
-          docker save "$DOCKER_REGISTRY/$image:$TAG" > $ARCHIVES/$image.tar &
-          pids[${i}]=$!
-          i=$((i+1))
+          docker save "$DOCKER_REGISTRY/$image:$TAG" > $ARCHIVES/$image.tar || tee save_fail &
         done
 
-        # Wait for `docker save` background processes to complete.
-        for pid in ${pids[*]}; do
-          wait $pid
-        done
+        # Wait for `docker save` background processes to complete. Exit early
+        # if any job failed.
+        wait < <(jobs -p)
+        test -f save_fail && exit 1
     # `with.path` values do not support environment variables yet, so an
     # absolute path is used here.
     #
@@ -268,15 +266,13 @@ jobs:
         # host.
         i=0
         for image in proxy controller web cni-plugin debug grafana; do
-          kind load image-archive <(DOCKER_HOST=ssh://linkerd-docker docker save "$DOCKER_REGISTRY/$image:$TAG") &
-          pids[${i}]=$!
-          i=$((i+1))
+          kind load image-archive <(DOCKER_HOST=ssh://linkerd-docker docker save "$DOCKER_REGISTRY/$image:$TAG") || tee load_fail &
         done
 
-        # Wait for `kind load` background processes to complete.
-        for pid in ${pids[*]}; do
-          wait $pid
-        done
+        # Wait for `kind load` background processes to complete. Exit early if
+        # any job failed.
+        wait < <(jobs -p)
+        test -f load_fail && exit 1
 
         # Load proxy-init and prometheus images into KinD while it is
         # available.
@@ -286,15 +282,13 @@ jobs:
       if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork
       run: |
         for image in proxy controller web cni-plugin debug grafana; do
-          kind load image-archive image-archives/$image.tar &
-          pids[${i}]=$!
-          i=$((i+1))
+          kind load image-archive image-archives/$image.tar || tee load_fail &
         done
 
-        # Wait for `kind load` background processes to complete.
-        for pid in ${pids[*]}; do
-          wait $pid
-        done
+        # Wait for `kind load` background processes to complete. Exit early if
+        # any job failed.
+        wait < <(jobs -p)
+        test -f load_fail && exit 1
     - name: Run integration tests
       run: |
         # Export `init_test_run` and `*_integration_tests` into the

From c2dd5c74363256dc2017f19f0296b3c76b0fed79 Mon Sep 17 00:00:00 2001
From: Kevin Leimkuhler <kevin@kleimkuhler.com>
Date: Mon, 10 Feb 2020 17:08:59 -0800
Subject: [PATCH 4/9] Remove unused variable

Signed-off-by: Kevin Leimkuhler <kevin@kleimkuhler.com>
---
 .github/workflows/workflow.yml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
index 86fd300ed2114..0cf0e77e1bfdd 100644
--- a/.github/workflows/workflow.yml
+++ b/.github/workflows/workflow.yml
@@ -166,12 +166,18 @@ jobs:
         mkdir -p $ARCHIVES
 
         for image in proxy controller web cni-plugin debug cli-bin grafana; do
-          docker save "$DOCKER_REGISTRY/$image:$TAG" > $ARCHIVES/$image.tar || tee save_fail &
+          docker save "$DOCKER_REGISTRY/$image:$TAG" > $ARCHIVES/$image.tar || echo "failed 'docker save'" && tee save_fail &
         done
 
+        ls
+
         # Wait for `docker save` background processes to complete. Exit early
         # if any job failed.
         wait < <(jobs -p)
+
+        echo "finished waiting.."
+        ls
+
         test -f save_fail && exit 1
     # `with.path` values do not support environment variables yet, so an
     # absolute path is used here.
@@ -264,7 +270,6 @@ jobs:
         # used to load the output into the KinD cluster. Set `DOCKER_HOST` for
         # a single command, and `docker save` the container from the Packet
         # host.
-        i=0
         for image in proxy controller web cni-plugin debug grafana; do
           kind load image-archive <(DOCKER_HOST=ssh://linkerd-docker docker save "$DOCKER_REGISTRY/$image:$TAG") || tee load_fail &
         done

From 01d6889e2ebac8453b4f4555315075b39b4784eb Mon Sep 17 00:00:00 2001
From: Kevin Leimkuhler <kevin@kleimkuhler.com>
Date: Mon, 10 Feb 2020 21:11:16 -0800
Subject: [PATCH 5/9] Fix script exit

Signed-off-by: Kevin Leimkuhler <kevin@kleimkuhler.com>
---
 .github/workflows/workflow.yml | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
index 0cf0e77e1bfdd..55f71963e1007 100644
--- a/.github/workflows/workflow.yml
+++ b/.github/workflows/workflow.yml
@@ -166,19 +166,14 @@ jobs:
         mkdir -p $ARCHIVES
 
         for image in proxy controller web cni-plugin debug cli-bin grafana; do
-          docker save "$DOCKER_REGISTRY/$image:$TAG" > $ARCHIVES/$image.tar || echo "failed 'docker save'" && tee save_fail &
+          docker save "$DOCKER_REGISTRY/$image:$TAG" > $ARCHIVES/$image.tar || tee save_fail &
         done
 
-        ls
-
         # Wait for `docker save` background processes to complete. Exit early
         # if any job failed.
         wait < <(jobs -p)
 
-        echo "finished waiting.."
-        ls
-
-        test -f save_fail && exit 1
+        test -f save_fail && exit 1 || true
     # `with.path` values do not support environment variables yet, so an
     # absolute path is used here.
     #
@@ -277,7 +272,7 @@ jobs:
         # Wait for `kind load` background processes to complete. Exit early if
         # any job failed.
         wait < <(jobs -p)
-        test -f load_fail && exit 1
+        test -f load_fail && exit 1 || true
 
         # Load proxy-init and prometheus images into KinD while it is
         # available.
@@ -293,7 +288,7 @@ jobs:
         # Wait for `kind load` background processes to complete. Exit early if
         # any job failed.
         wait < <(jobs -p)
-        test -f load_fail && exit 1
+        test -f load_fail && exit 1 || true
     - name: Run integration tests
       run: |
         # Export `init_test_run` and `*_integration_tests` into the

From ccf98ca43c064fe08d455bf59925b96846a0a5ba Mon Sep 17 00:00:00 2001
From: Kevin Leimkuhler <kevin@kleimkuhler.com>
Date: Tue, 11 Feb 2020 18:04:35 -0800
Subject: [PATCH 6/9] Address reviews

Signed-off-by: Kevin Leimkuhler <kevin@kleimkuhler.com>
---
 .github/workflows/workflow.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
index 55f71963e1007..68d66a5827174 100644
--- a/.github/workflows/workflow.yml
+++ b/.github/workflows/workflow.yml
@@ -4,9 +4,9 @@ on:
   pull_request: {}
   push:
     branches:
-      - master
+    - master
     tags:
-      - "*"
+    - "*"
 
 # Jobs by event type and dependencies:
 
@@ -257,7 +257,7 @@ jobs:
       if: github.event_name != 'pull_request' || !github.event.pull_request.head.repo.fork
       env:
         PROXY_INIT_IMAGE_NAME: gcr.io/linkerd-io/proxy-init:v1.3.1
-        PROMETHEUS_IMAGE_NAME: prom/prometheus:v2.11.1
+        PROMETHEUS_IMAGE_NAME: prom/prometheus:v2.15.2
       run: |
         # For each container, load the image archive into the KinD cluster.
         #

From a9ca35af86178bc7cc23e5b7c2a52ea2d63114ee Mon Sep 17 00:00:00 2001
From: Kevin Leimkuhler <kevin@kleimkuhler.com>
Date: Tue, 11 Feb 2020 21:09:53 -0800
Subject: [PATCH 7/9] Ensure packet host has correct proxy-init and prometheus
 image versions

Signed-off-by: Kevin Leimkuhler <kevin@kleimkuhler.com>
---
 .github/workflows/workflow.yml | 34 +++++++++++++++++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
index 68d66a5827174..0cdd66170cb21 100644
--- a/.github/workflows/workflow.yml
+++ b/.github/workflows/workflow.yml
@@ -19,6 +19,7 @@ on:
 
 # All master/tag pushes and PRs
 #
+# docker_pull
 # docker_build
 # -> kind_integration_tests
 
@@ -122,6 +123,37 @@ jobs:
         bin/web
         bin/web test --reporters=jest-dot-reporter
 
+  #
+  # Docker pull run for:
+  # - every master push
+  # - every tag push
+  # - internal PRs
+  #
+
+  docker_pull:
+    name: Docker pull
+    if: github.event_name != 'pull_request' || !github.event.pull_request.head.repo.fork
+    runs-on: ubuntu-18.04
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v2
+    - name: Setup SSH config for Packet
+      run: |
+        mkdir -p ~/.ssh/
+        touch ~/.ssh/id && chmod 600 ~/.ssh/id
+        echo "${{ secrets.DOCKER_SSH_CONFIG }}"  > ~/.ssh/config
+        echo "${{ secrets.DOCKER_PRIVATE_KEY }}" > ~/.ssh/id
+        echo "${{ secrets.DOCKER_KNOWN_HOSTS }}" > ~/.ssh/known_hosts
+        ssh linkerd-docker docker version
+    - name: Ensure Packet has the correct proxy-init and prometheus versions
+      env:
+        DOCKER_HOST: ssh://linkerd-docker
+        PROXY_INIT_IMAGE_NAME: gcr.io/linkerd-io/proxy-init:v1.3.1
+        PROMETHEUS_IMAGE_NAME: prom/prometheus:v2.15.2
+      run: |
+        bin/docker pull "gcr.io/linkerd-io/proxy-init:$PROXY_INIT_IMAGE_NAME"
+        bin/docker pull "prom/prometheus:$PROMETHEUS_IMAGE_NAME"
+
   #
   # Docker build and kind integration tests run for:
   # - every master push
@@ -189,7 +221,7 @@ jobs:
     strategy:
       matrix:
         integration_test: [deep, upgrade, helm, helm_upgrade, custom_domain, external_issuer]
-    needs: [docker_build]
+    needs: [docker_build, docker_pull]
     name: Integration tests (${{ matrix.integration_test }})
     runs-on: ubuntu-18.04
     steps:

From b7acc2f1cf6592df391cc47ae32fcaeb08140117 Mon Sep 17 00:00:00 2001
From: Kevin Leimkuhler <kevin@kleimkuhler.com>
Date: Tue, 11 Feb 2020 21:16:06 -0800
Subject: [PATCH 8/9] Fix reference format

Signed-off-by: Kevin Leimkuhler <kevin@kleimkuhler.com>
---
 .github/workflows/workflow.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
index 0cdd66170cb21..8bac668e8f771 100644
--- a/.github/workflows/workflow.yml
+++ b/.github/workflows/workflow.yml
@@ -151,8 +151,8 @@ jobs:
         PROXY_INIT_IMAGE_NAME: gcr.io/linkerd-io/proxy-init:v1.3.1
         PROMETHEUS_IMAGE_NAME: prom/prometheus:v2.15.2
       run: |
-        bin/docker pull "gcr.io/linkerd-io/proxy-init:$PROXY_INIT_IMAGE_NAME"
-        bin/docker pull "prom/prometheus:$PROMETHEUS_IMAGE_NAME"
+        bin/docker pull $PROXY_INIT_IMAGE_NAME
+        bin/docker pull $PROMETHEUS_IMAGE_NAME
 
   #
   # Docker build and kind integration tests run for:

From d5e393dbc6dbaa5d01ecabc794155f2467486d8d Mon Sep 17 00:00:00 2001
From: Kevin Leimkuhler <kevin@kleimkuhler.com>
Date: Wed, 12 Feb 2020 09:48:11 -0800
Subject: [PATCH 9/9] Allow loading proxy-init and prometheus image loads to
 fail

Signed-off-by: Kevin Leimkuhler <kevin@kleimkuhler.com>
---
 .github/workflows/workflow.yml | 41 +++++-----------------------------
 1 file changed, 5 insertions(+), 36 deletions(-)

diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
index 8bac668e8f771..3374cb5c54418 100644
--- a/.github/workflows/workflow.yml
+++ b/.github/workflows/workflow.yml
@@ -19,7 +19,6 @@ on:
 
 # All master/tag pushes and PRs
 #
-# docker_pull
 # docker_build
 # -> kind_integration_tests
 
@@ -123,37 +122,6 @@ jobs:
         bin/web
         bin/web test --reporters=jest-dot-reporter
 
-  #
-  # Docker pull run for:
-  # - every master push
-  # - every tag push
-  # - internal PRs
-  #
-
-  docker_pull:
-    name: Docker pull
-    if: github.event_name != 'pull_request' || !github.event.pull_request.head.repo.fork
-    runs-on: ubuntu-18.04
-    steps:
-    - name: Checkout code
-      uses: actions/checkout@v2
-    - name: Setup SSH config for Packet
-      run: |
-        mkdir -p ~/.ssh/
-        touch ~/.ssh/id && chmod 600 ~/.ssh/id
-        echo "${{ secrets.DOCKER_SSH_CONFIG }}"  > ~/.ssh/config
-        echo "${{ secrets.DOCKER_PRIVATE_KEY }}" > ~/.ssh/id
-        echo "${{ secrets.DOCKER_KNOWN_HOSTS }}" > ~/.ssh/known_hosts
-        ssh linkerd-docker docker version
-    - name: Ensure Packet has the correct proxy-init and prometheus versions
-      env:
-        DOCKER_HOST: ssh://linkerd-docker
-        PROXY_INIT_IMAGE_NAME: gcr.io/linkerd-io/proxy-init:v1.3.1
-        PROMETHEUS_IMAGE_NAME: prom/prometheus:v2.15.2
-      run: |
-        bin/docker pull $PROXY_INIT_IMAGE_NAME
-        bin/docker pull $PROMETHEUS_IMAGE_NAME
-
   #
   # Docker build and kind integration tests run for:
   # - every master push
@@ -221,7 +189,7 @@ jobs:
     strategy:
       matrix:
         integration_test: [deep, upgrade, helm, helm_upgrade, custom_domain, external_issuer]
-    needs: [docker_build, docker_pull]
+    needs: [docker_build]
     name: Integration tests (${{ matrix.integration_test }})
     runs-on: ubuntu-18.04
     steps:
@@ -307,9 +275,10 @@ jobs:
         test -f load_fail && exit 1 || true
 
         # Load proxy-init and prometheus images into KinD while it is
-        # available.
-        kind load image-archive <(DOCKER_HOST=ssh://linkerd-docker docker save $PROXY_INIT_IMAGE_NAME)
-        kind load image-archive <(DOCKER_HOST=ssh://linkerd-docker docker save $PROMETHEUS_IMAGE_NAME)
+        # available. Allow these commands to fail since they will be cached
+        # for the next run.
+        kind load image-archive <(DOCKER_HOST=ssh://linkerd-docker docker save $PROXY_INIT_IMAGE_NAME) 2>&1 || true
+        kind load image-archive <(DOCKER_HOST=ssh://linkerd-docker docker save $PROMETHEUS_IMAGE_NAME) 2>&1 || true
     - name: Load image archives into the local KinD cluster (Forked repositories)
       if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork
       run: |