Merge branch 'master' into feat/dashboard-supports-random-port

dapr · Apr 8, 2022 · f619819 · f619819
2 parents ce1e81d + 9ab798d
commit f619819
Show file tree

Hide file tree

Showing 45 changed files with 3,245 additions and 1,397 deletions.
diff --git a/.github/workflows/dapr_cli.yaml b/.github/workflows/dapr_cli.yaml
@@ -62,7 +62,7 @@ jobs:
         uses: actions/checkout@v2
       - name: Run golangci-lint
         if: matrix.target_arch == 'amd64' && matrix.target_os == 'linux'
-        uses: golangci/golangci-lint-action@v2
+        uses: golangci/golangci-lint-action@v3.1.0
         with:
           version: ${{ env.GOLANG_CI_LINT_VER }}
           only-new-issues: true

diff --git a/.github/workflows/fossa.yml b/.github/workflows/fossa.yml
@@ -0,0 +1,48 @@
+#
+# Copyright 2021 The Dapr Authors
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#     http://www.apache.org/licenses/LICENSE-2.0
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+name: fossa
+on:
+  push:
+    branches:
+      - master
+      - release-*
+      - feature/*
+    tags:
+      - v*
+  pull_request:
+    branches:
+      - master
+      - release-*
+      - feature/*
+  workflow_dispatch: {}
+jobs:
+  fossa-scan:
+    if: github.repository_owner == 'dapr' # FOSSA is not intended to run on forks.
+    runs-on: ubuntu-latest
+    env:
+      FOSSA_API_KEY: b88e1f4287c3108c8751bf106fb46db6 # This is a push-only token that is safe to be exposed.
+    steps:
+      - name: "Checkout code"
+        uses: actions/checkout@v2
+
+      - name: "Run FOSSA Scan"
+        uses: fossas/fossa-action@main # Use a specific version if locking is preferred
+        with:
+          api-key: ${{ env.FOSSA_API_KEY }}
+
+      - name: "Run FOSSA Test"
+        uses: fossas/fossa-action@main # Use a specific version if locking is preferred
+        with:
+          api-key: ${{ env.FOSSA_API_KEY }}
+          run-tests: true
diff --git a/.github/workflows/kind_e2e.yaml b/.github/workflows/kind_e2e.yaml
@@ -46,36 +46,43 @@ jobs:
     runs-on: ubuntu-latest
     env:
       GOVER: 1.17
-      DAPR_RUNTIME_VERSION: 1.6.0
-      DAPR_DASHBOARD_VERSION: 0.9.0
+      DAPR_RUNTIME_VERSION: 1.7.0
+      DAPR_DASHBOARD_VERSION: 0.10.0
+      DAPR_TGZ: dapr-1.7.0.tgz
     strategy:
       fail-fast: false # Keep running if one leg fails.
       matrix:
         k8s-version:
-        - v1.19.11
-        - v1.20.7
-        - v1.21.1
+        - v1.20.15
+        - v1.21.10
+        - v1.22.7
+        - v1.23.4
         mode:
         - ha
         - non-ha
         # Map between K8s and KinD versions.
         # This is attempting to make it a bit clearer what's being tested.
-        # See: https://github.com/kubernetes-sigs/kind/releases/tag/v0.11.0
+        # See: https://github.com/kubernetes-sigs/kind/releases/tag/v0.12.0
         include:
-        - k8s-version: v1.19.11
-          kind-version: v0.11.0
-          kind-image-sha: sha256:07db187ae84b4b7de440a73886f008cf903fcf5764ba8106a9fd5243d6f32729
-        - k8s-version: v1.20.7
-          kind-version: v0.11.0
-          kind-image-sha: sha256:cbeaf907fc78ac97ce7b625e4bf0de16e3ea725daf6b04f930bd14c67c671ff9
-        - k8s-version: v1.21.1
-          kind-version: v0.11.0
-          kind-image-sha: sha256:69860bda5563ac81e3c0057d654b5253219618a22ec3a346306239bba8cfa1a6
+        - k8s-version: v1.20.15
+          kind-version: v0.12.0
+          kind-image-sha: sha256:393bb9096c6c4d723bb17bceb0896407d7db581532d11ea2839c80b28e5d8deb
+        - k8s-version: v1.21.10
+          kind-version: v0.12.0
+          kind-image-sha: sha256:84709f09756ba4f863769bdcabe5edafc2ada72d3c8c44d6515fc581b66b029c
+        - k8s-version: v1.22.7
+          kind-version: v0.12.0
+          kind-image-sha: sha256:1dfd72d193bf7da64765fd2f2898f78663b9ba366c2aa74be1fd7498a1873166
+        - k8s-version: v1.23.4
+          kind-version: v0.12.0
+          kind-image-sha: sha256:0e34f0d0fd448aa2f2819cfd74e99fe5793a6e4938b328f657c8e3f81ee0dfb9
         exclude:
-        - k8s-version: v1.19.11
+        - k8s-version: v1.20.15
           mode: non-ha
-        - k8s-version: v1.20.7
+        - k8s-version: v1.21.10
           mode: non-ha
+        - k8s-version: v1.22.7
+          mode: non-ha  
     steps:
     - name: Set up Go ${{ env.GOVER }}
       uses: actions/setup-go@v2
@@ -109,10 +116,8 @@ jobs:
         - role: worker
           image: kindest/node:${{ matrix.k8s-version }}@${{ matrix.kind-image-sha }}
         EOF
-
         # Log the generated kind.yaml for easy reference.
         cat kind.yaml
-
     - name: Create KinD Cluster
       uses: helm/kind-action@v1.0.0
       with:
@@ -127,7 +132,6 @@ jobs:
                   -lkubernetes.io/hostname!=kind-control-plane \
                   -ojsonpath='{.items[0].status.addresses[?(@.type=="InternalIP")].address}')
         echo "MINIKUBE_NODE_IP=$NODE_IP" >> $GITHUB_ENV
-
     - name: Free up some diskspace
       run: |
         docker image prune -a -f
@@ -141,7 +145,7 @@ jobs:
     - name: Determine latest Dapr Dashboard version including Pre-releases
       if: github.base_ref == 'master'
       run: |
-        helm pull dapr/dapr --untar && export DASHBOARD_VERSION=$(cat ./dapr/charts/dapr_dashboard/Chart.yaml | grep version | awk '{ print $2; exit }') && rm -rf dapr
+        curl -L -o dapr.tgz https://github.com/dapr/helm-charts/raw/master/$DAPR_TGZ && tar -xzf dapr.tgz && export DASHBOARD_VERSION=$(cat ./dapr/charts/dapr_dashboard/Chart.yaml | grep version | awk '{ print $2; exit }') && rm -rf dapr
         echo "DAPR_DASHBOARD_VERSION=$DASHBOARD_VERSION" >> $GITHUB_ENV
         echo "Found $DASHBOARD_VERSION"
       shell: bash

diff --git a/.github/workflows/self_hosted_e2e.yaml b/.github/workflows/self_hosted_e2e.yaml
@@ -20,6 +20,7 @@ on:
       - release-*
   schedule:
     - cron: '0 */3 * * *'
+    - cron: '0 0 * * *'
   pull_request:
     branches:
       - master
@@ -35,9 +36,9 @@ jobs:
       GOARCH: ${{ matrix.target_arch }}
       GOPROXY: https://proxy.golang.org
       ARCHIVE_OUTDIR: dist/archives
-      DAPR_RUNTIME_VERSION: "1.6.0"
-      DAPR_DASHBOARD_VERSION: 0.9.0
-      CUSTOM_IMAGE_REGISTRY: docker.io
+      DAPR_RUNTIME_VERSION: "1.7.0"
+      DAPR_DASHBOARD_VERSION: 0.10.0
+      DAPR_TGZ: dapr-1.7.0.tgz
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest]
@@ -72,11 +73,23 @@ jobs:
       - name: Determine latest Dapr Dashboard version including Pre-releases
         if: github.base_ref == 'master'
         run: |
-          helm pull dapr/dapr --untar && export DASHBOARD_VERSION=$(cat ./dapr/charts/dapr_dashboard/Chart.yaml | grep version | awk '{ print $2; exit }') && rm -rf dapr
+          curl -L -o dapr.tgz https://github.com/dapr/helm-charts/raw/master/$DAPR_TGZ && tar -xzf dapr.tgz && export DASHBOARD_VERSION=$(cat ./dapr/charts/dapr_dashboard/Chart.yaml | grep version | awk '{ print $2; exit }') && rm -rf dapr
           echo "DAPR_DASHBOARD_VERSION=$DASHBOARD_VERSION" >> $GITHUB_ENV
           echo "Found $DASHBOARD_VERSION"
         shell: bash
-      - name: Run E2E tests 
+      - name: Run E2E tests with GHCR
+        # only runs once in a day
+        if: github.event.schedule == '0 0 * * *'
+        env:
+          DAPR_DEFAULT_IMAGE_REGISTRY: ghcr
+        run: |
+          export TEST_OUTPUT_FILE=$GITHUB_WORKSPACE/test-e2e-standalone.json
+          echo "TEST_OUTPUT_FILE=$TEST_OUTPUT_FILE" >> $GITHUB_ENV
+          export GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }}
+          make e2e-build-run-sh
+        shell: bash
+      - name: Run E2E tests with Docker hub
+        if: github.event.schedule != '0 0 * * *'
         run: |
           export TEST_OUTPUT_FILE=$GITHUB_WORKSPACE/test-e2e-standalone.json
           echo "TEST_OUTPUT_FILE=$TEST_OUTPUT_FILE" >> $GITHUB_ENV

diff --git a/.github/workflows/upgrade_e2e.yaml b/.github/workflows/upgrade_e2e.yaml
@@ -50,29 +50,35 @@ jobs:
       fail-fast: false # Keep running if one leg fails.
       matrix:
         k8s-version:
-        - v1.19.11
-        - v1.20.7
-        - v1.21.1
+        - v1.20.15
+        - v1.21.10
+        - v1.22.7
+        - v1.23.4
         mode:
         - ha
         - non-ha
         # Map between K8s and KinD versions.
         # This is attempting to make it a bit clearer what's being tested.
-        # See: https://github.com/kubernetes-sigs/kind/releases/tag/v0.11.0
+        # See: https://github.com/kubernetes-sigs/kind/releases/tag/v0.12.0
         include:
-        - k8s-version: v1.19.11
-          kind-version: v0.11.0
-          kind-image-sha: sha256:07db187ae84b4b7de440a73886f008cf903fcf5764ba8106a9fd5243d6f32729
-        - k8s-version: v1.20.7
-          kind-version: v0.11.0
-          kind-image-sha: sha256:cbeaf907fc78ac97ce7b625e4bf0de16e3ea725daf6b04f930bd14c67c671ff9
-        - k8s-version: v1.21.1
-          kind-version: v0.11.0
-          kind-image-sha: sha256:69860bda5563ac81e3c0057d654b5253219618a22ec3a346306239bba8cfa1a6
+        - k8s-version: v1.20.15
+          kind-version: v0.12.0
+          kind-image-sha: sha256:393bb9096c6c4d723bb17bceb0896407d7db581532d11ea2839c80b28e5d8deb
+        - k8s-version: v1.21.10
+          kind-version: v0.12.0
+          kind-image-sha: sha256:84709f09756ba4f863769bdcabe5edafc2ada72d3c8c44d6515fc581b66b029c
+        - k8s-version: v1.22.7
+          kind-version: v0.12.0
+          kind-image-sha: sha256:1dfd72d193bf7da64765fd2f2898f78663b9ba366c2aa74be1fd7498a1873166
+        - k8s-version: v1.23.4
+          kind-version: v0.12.0
+          kind-image-sha: sha256:0e34f0d0fd448aa2f2819cfd74e99fe5793a6e4938b328f657c8e3f81ee0dfb9
         exclude:
-        - k8s-version: v1.19.11
+        - k8s-version: v1.20.15
           mode: non-ha
-        - k8s-version: v1.20.7
+        - k8s-version: v1.21.10
+          mode: non-ha
+        - k8s-version: v1.22.7
           mode: non-ha
     steps:
     - name: Set up Go ${{ env.GOVER }}

diff --git a/Makefile b/Makefile
@@ -188,7 +188,7 @@ e2e-build-run-sh: build test-e2e-sh
 ################################################################################
 .PHONY: go.mod
 go.mod:
-	go mod tidy
+	go mod tidy -compat=1.17
 
 ################################################################################
 # Target: check-diff                                                           #