Merge branch 'master' into feat/resources_dir

Author: mukundansundar

.github/workflows/kind_e2e.yaml

@@ -51,9 +51,11 @@ jobs:
     runs-on: ubuntu-latest
     env:
       GOVER: 1.19.3
-      DAPR_RUNTIME_VERSION: 1.9.4
-      DAPR_DASHBOARD_VERSION: 0.11.0
-      DAPR_TGZ: dapr-1.9.0.tgz
+      DAPR_RUNTIME_PINNED_VERSION: 1.9.4
+      DAPR_DASHBOARD_PINNED_VERSION: 0.11.0
+      DAPR_RUNTIME_LATEST_VERSION:
+      DAPR_DASHBOARD_LATEST_VERSION:
+      DAPR_TGZ: dapr-1.9.4.tgz
     strategy:
       fail-fast: false # Keep running if one leg fails.
       matrix:
@@ -130,25 +132,35 @@ jobs:
       run: |
         docker image prune -a -f
     - name: Determine latest Dapr Runtime version including Pre-releases
-      if: github.base_ref == 'master'
       run: |
         export RUNTIME_VERSION=$(curl -s -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" https://api.github.com/repos/dapr/dapr/releases | grep tag_name | awk -F':' '{print $2}' | tr -d '", ' | sed '/-/! s/$/_/' | sort -V | sed 's/_$//' | tr -d 'v' | tail -1)
         if [[ -z "$RUNTIME_VERSION" ]]; then
-            echo "Could not fetch the latest Dapr Runtime version. Using default version $DAPR_RUNTIME_VERSION"
+          echo "Could not fetch the latest Dapr Runtime version. Using default version $DAPR_RUNTIME_PINNED_VERSION"
+          echo "DAPR_RUNTIME_LATEST_VERSION=$DAPR_RUNTIME_PINNED_VERSION" >> $GITHUB_ENV
         else
-          echo "DAPR_RUNTIME_VERSION=$RUNTIME_VERSION" >> $GITHUB_ENV
           echo "Found $RUNTIME_VERSION"
+          echo "DAPR_RUNTIME_LATEST_VERSION=$RUNTIME_VERSION" >> $GITHUB_ENV
+          base_ref=${{ github.base_ref }}
+          echo "Branch $base_ref"
+          if [[ $base_ref = 'master' ]]; then
+            echo "DAPR_RUNTIME_PINNED_VERSION=$RUNTIME_VERSION" >> $GITHUB_ENV
+          fi
         fi
       shell: bash
     - name: Determine latest Dapr Dashboard version including Pre-releases
-      if: github.base_ref == 'master'
       run: |
         export DASHBOARD_VERSION=$(curl -s -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" https://api.github.com/repos/dapr/dashboard/releases | grep tag_name | awk -F':' '{print $2}' | tr -d '", ' | sed '/-/! s/$/_/' | sort -V | sed 's/_$//' | tr -d 'v' | tail -1)
         if [[ -z "$DASHBOARD_VERSION" ]]; then
-          echo "Could not fetch the latest Dapr Dashboard version. Using default version $DAPR_DASHBOARD_VERSION"
+          echo "Could not fetch the latest Dapr Dashboard version. Using default version $DAPR_DASHBOARD_PINNED_VERSION"
+          echo "DAPR_DASHBOARD_LATEST_VERSION=$DAPR_DASHBOARD_PINNED_VERSION" >> $GITHUB_ENV
         else
-          echo "DAPR_DASHBOARD_VERSION=$DASHBOARD_VERSION" >> $GITHUB_ENV
           echo "Found $DASHBOARD_VERSION"
+          echo "DAPR_DASHBOARD_LATEST_VERSION=$DASHBOARD_VERSION" >> $GITHUB_ENV
+          base_ref=${{ github.base_ref }}
+          echo "Branch $base_ref"
+          if [[ $base_ref = 'master' ]]; then
+            echo "DAPR_DASHBOARD_PINNED_VERSION=$DASHBOARD_VERSION" >> $GITHUB_ENV
+          fi
         fi
       shell: bash
     - name: Run tests with GHCR

.github/workflows/self_hosted_e2e.yaml

@@ -40,8 +40,10 @@ jobs:
       GOARCH: ${{ matrix.target_arch }}
       GOPROXY: https://proxy.golang.org
       ARCHIVE_OUTDIR: dist/archives
-      DAPR_RUNTIME_VERSION: "1.9.4"
-      DAPR_DASHBOARD_VERSION: 0.11.0
+      DAPR_RUNTIME_PINNED_VERSION: "1.9.4"
+      DAPR_DASHBOARD_PINNED_VERSION: 0.11.0
+      DAPR_RUNTIME_LATEST_VERSION:
+      DAPR_DASHBOARD_LATEST_VERSION:
     strategy:
       matrix:
         os: [macos-latest, ubuntu-latest, windows-latest]
@@ -77,25 +79,35 @@ jobs:
           podman machine start
           echo "CONTAINER_RUNTIME=podman" >> $GITHUB_ENV
       - name: Determine latest Dapr Runtime version including Pre-releases
-        if: github.base_ref == 'master'
         run: |
           export RUNTIME_VERSION=$(curl -s -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" https://api.github.com/repos/dapr/dapr/releases | grep tag_name | awk -F':' '{print $2}' | tr -d '", ' | sed '/-/! s/$/_/' | sort -V | sed 's/_$//' | tr -d 'v' | tail -1)
           if [[ -z "$RUNTIME_VERSION" ]]; then
-            echo "Could not fetch the latest Dapr Runtime version. Using default version $DAPR_RUNTIME_VERSION"
+            echo "Could not fetch the latest Dapr Runtime version. Using default version $DAPR_RUNTIME_PINNED_VERSION"
+            echo "DAPR_RUNTIME_LATEST_VERSION=$DAPR_RUNTIME_PINNED_VERSION" >> $GITHUB_ENV
           else
-            echo "DAPR_RUNTIME_VERSION=$RUNTIME_VERSION" >> $GITHUB_ENV
             echo "Found $RUNTIME_VERSION"
+            echo "DAPR_RUNTIME_LATEST_VERSION=$RUNTIME_VERSION" >> $GITHUB_ENV
+            base_ref=${{ github.base_ref }}
+            echo "Branch $base_ref"
+            if [[ $base_ref = 'master' ]]; then
+              echo "DAPR_RUNTIME_PINNED_VERSION=$RUNTIME_VERSION" >> $GITHUB_ENV
+            fi
           fi
         shell: bash
       - name: Determine latest Dapr Dashboard version including Pre-releases
-        if: github.base_ref == 'master'
         run: |
           export DASHBOARD_VERSION=$(curl -s -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" https://api.github.com/repos/dapr/dashboard/releases | grep tag_name | awk -F':' '{print $2}' | tr -d '", ' | sed '/-/! s/$/_/' | sort -V | sed 's/_$//' | tr -d 'v' | tail -1)
           if [[ -z "$DASHBOARD_VERSION" ]]; then
-            echo "Could not fetch the latest Dapr Dashboard version. Using default version $DAPR_DASHBOARD_VERSION"
+            echo "Could not fetch the latest Dapr Dashboard version. Using default version $DAPR_DASHBOARD_PINNED_VERSION"
+            echo "DAPR_DASHBOARD_LATEST_VERSION=$DAPR_DASHBOARD_PINNED_VERSION" >> $GITHUB_ENV
           else
-            echo "DAPR_DASHBOARD_VERSION=$DASHBOARD_VERSION" >> $GITHUB_ENV
             echo "Found $DASHBOARD_VERSION"
+            echo "DAPR_DASHBOARD_LATEST_VERSION=$DASHBOARD_VERSION" >> $GITHUB_ENV
+            base_ref=${{ github.base_ref }}
+            echo "Branch $base_ref"
+            if [[ $base_ref = 'master' ]]; then
+              echo "DAPR_DASHBOARD_PINNED_VERSION=$DASHBOARD_VERSION" >> $GITHUB_ENV
+            fi
           fi
         shell: bash
       - name: Run E2E tests with GHCR

tests/e2e/common/common.go

@@ -50,12 +50,13 @@ const (
 )
 
 type VersionDetails struct {
-	RuntimeVersion      string
-	DashboardVersion    string
-	ImageVariant        string
-	CustomResourceDefs  []string
-	ClusterRoles        []string
-	ClusterRoleBindings []string
+	RuntimeVersion       string
+	DashboardVersion     string
+	ImageVariant         string
+	CustomResourceDefs   []string
+	ClusterRoles         []string
+	ClusterRoleBindings  []string
+	UseDaprLatestVersion bool
 }
 
 type TestOptions struct {
@@ -71,20 +72,26 @@ type TestCase struct {
 	Callable func(*testing.T)
 }
 
-// GetVersionsFromEnv will return values from required environment variables,
+// GetVersionsFromEnv will return values from required environment variables.
+// parameter `latest` is used to determine if the latest versions of dapr & dashboard should be used.
 // if environment variables are not set it fails the test.
-func GetVersionsFromEnv(t *testing.T) (string, string) {
+func GetVersionsFromEnv(t *testing.T, latest bool) (string, string) {
 	var daprRuntimeVersion, daprDashboardVersion string
-
-	if runtimeVersion, ok := os.LookupEnv("DAPR_RUNTIME_VERSION"); ok {
+	runtimeEnvVar := "DAPR_RUNTIME_PINNED_VERSION"
+	dashboardEnvVar := "DAPR_DASHBOARD_PINNED_VERSION"
+	if latest {
+		runtimeEnvVar = "DAPR_RUNTIME_LATEST_VERSION"
+		dashboardEnvVar = "DAPR_DASHBOARD_LATEST_VERSION"
+	}
+	if runtimeVersion, ok := os.LookupEnv(runtimeEnvVar); ok {
 		daprRuntimeVersion = runtimeVersion
 	} else {
-		t.Fatalf("env var \"DAPR_RUNTIME_VERSION\" not set")
+		t.Fatalf("env var \"%s\" not set", runtimeEnvVar)
 	}
-	if dashboardVersion, ok := os.LookupEnv("DAPR_DASHBOARD_VERSION"); ok {
+	if dashboardVersion, ok := os.LookupEnv(dashboardEnvVar); ok {
 		daprDashboardVersion = dashboardVersion
 	} else {
-		t.Fatalf("env var \"DAPR_DASHBOARD_VERSION\" not set")
+		t.Fatalf("env var \"%s\" not set", dashboardEnvVar)
 	}
 	return daprRuntimeVersion, daprDashboardVersion
 }
@@ -182,6 +189,27 @@ func GetTestsOnUninstall(details VersionDetails, opts TestOptions) []TestCase {
 	}
 }
 
+func GetTestForCertRenewal(currentVersionDetails VersionDetails, installOpts TestOptions) []TestCase {
+	tests := []TestCase{}
+	tests = append(tests, []TestCase{
+		{"Renew certificate which expires in less than 30 days", GenerateNewCertAndRenew(currentVersionDetails, installOpts)},
+	}...)
+	tests = append(tests, GetTestsPostCertificateRenewal(currentVersionDetails, installOpts)...)
+	tests = append(tests, []TestCase{
+		{"Cert Expiry warning message check " + currentVersionDetails.RuntimeVersion, CheckMTLSStatus(currentVersionDetails, installOpts, true)},
+	}...)
+
+	// tests for certificate renewal with provided certificates.
+	tests = append(tests, []TestCase{
+		{"Renew certificate which expires in after 30 days", UseProvidedNewCertAndRenew(currentVersionDetails, installOpts)},
+	}...)
+	tests = append(tests, GetTestsPostCertificateRenewal(currentVersionDetails, installOpts)...)
+	tests = append(tests, []TestCase{
+		{"Cert Expiry no warning message check " + currentVersionDetails.RuntimeVersion, CheckMTLSStatus(currentVersionDetails, installOpts, false)},
+	}...)
+	return tests
+}
+
 func GetTestsPostCertificateRenewal(details VersionDetails, opts TestOptions) []TestCase {
 	return []TestCase{
 		{"crds exist " + details.RuntimeVersion, CRDTest(details, opts)},
@@ -475,6 +503,9 @@ func UseProvidedPrivateKeyAndRenewCerts(details VersionDetails, opts TestOptions
 			"--private-key", "../testdata/example-root.key",
 			"--valid-until", "20",
 		}
+		if details.ImageVariant != "" {
+			args = append(args, "--image-variant", details.ImageVariant)
+		}
 		output, err := spawn.Command(daprPath, args...)
 		t.Log(output)
 		require.NoError(t, err, "expected no error on certificate renewal")
@@ -505,6 +536,9 @@ func UseProvidedNewCertAndRenew(details VersionDetails, opts TestOptions) func(t
 			"--issuer-public-certificate", "./certs/issuer.crt",
 			"--restart",
 		}
+		if details.ImageVariant != "" {
+			args = append(args, "--image-variant", details.ImageVariant)
+		}
 		output, err := spawn.Command(daprPath, args...)
 		t.Log(output)
 		require.NoError(t, err, "expected no error on certificate renewal")
@@ -671,9 +705,11 @@ func installTest(details VersionDetails, opts TestOptions) func(t *testing.T) {
 			"init", "-k",
 			"--wait",
 			"-n", DaprTestNamespace,
-			"--runtime-version", details.RuntimeVersion,
 			"--log-as-json",
 		}
+		if !details.UseDaprLatestVersion {
+			args = append(args, "--runtime-version", details.RuntimeVersion)
+		}
 		if opts.HAEnabled {
 			args = append(args, "--enable-ha")
 		}