Merge pull request dapr#1234 from pravinpushkar/merge_to_master

Merge to master from release 1.10 branch

Author: mukundansundar

.github/workflows/dapr_cli.yaml

@@ -163,8 +163,6 @@ jobs:
     name: Publish to winget-pkgs
     needs: publish
     if: startswith(github.ref, 'refs/tags/v')
-    env:
-      WINGETCREATE_VERSION: 1.1.2.0
     runs-on: windows-latest
     steps:
       - name: Check out code
@@ -175,7 +173,7 @@ jobs:
         shell: pwsh
         run: |
           $url = "https://github.com/dapr/cli/releases/download/v${{ env.REL_VERSION }}/dapr.msi"
-          iwr https://github.com/microsoft/winget-create/releases/download/v${{ env.WINGETCREATE_VERSION }}/wingetcreate.exe -OutFile wingetcreate.exe
+          iwr https://aka.ms/wingetcreate/latest -OutFile wingetcreate.exe
           if("${{ env.REL_VERSION }}".Contains("-rc.")){
             $PackageIdentifier="Dapr.CLI.Preview"
           } else{

.github/workflows/kind_e2e.yaml

@@ -51,11 +51,11 @@ jobs:
     runs-on: ubuntu-latest
     env:
       GOVER: 1.19.3
-      DAPR_RUNTIME_PINNED_VERSION: 1.10.0-rc.4
-      DAPR_DASHBOARD_PINNED_VERSION: 0.11.0
+      DAPR_RUNTIME_PINNED_VERSION: 1.10.0
+      DAPR_DASHBOARD_PINNED_VERSION: 0.12.0
       DAPR_RUNTIME_LATEST_STABLE_VERSION:
       DAPR_DASHBOARD_LATEST_STABLE_VERSION:
-      DAPR_TGZ: dapr-1.10.0-rc.4.tgz
+      DAPR_TGZ: dapr-1.10.0.tgz
     strategy:
       fail-fast: false # Keep running if one leg fails.
       matrix:

.github/workflows/self_hosted_e2e.yaml

@@ -40,8 +40,8 @@ jobs:
       GOARCH: ${{ matrix.target_arch }}
       GOPROXY: https://proxy.golang.org
       ARCHIVE_OUTDIR: dist/archives
-      DAPR_RUNTIME_PINNED_VERSION: "1.10.0-rc.4"
-      DAPR_DASHBOARD_PINNED_VERSION: 0.11.0
+      DAPR_RUNTIME_PINNED_VERSION: "1.10.0"
+      DAPR_DASHBOARD_PINNED_VERSION: 0.12.0
       DAPR_RUNTIME_LATEST_STABLE_VERSION:
       DAPR_DASHBOARD_LATEST_STABLE_VERSION:
     strategy:

go.mod

@@ -7,7 +7,7 @@ require (
 	github.com/Azure/go-autorest/autorest/adal v0.9.22 // indirect
 	github.com/Pallinder/sillyname-go v0.0.0-20130730142914-97aeae9e6ba1
 	github.com/briandowns/spinner v1.19.0
-	github.com/dapr/dapr v1.10.0-rc.4
+	github.com/dapr/dapr v1.10.0
 	github.com/dapr/go-sdk v1.6.0
 	github.com/docker/docker v20.10.21+incompatible
 	github.com/fatih/color v1.13.0
@@ -67,7 +67,7 @@ require (
 	github.com/containerd/containerd v1.6.15 // indirect
 	github.com/containerd/continuity v0.3.0 // indirect
 	github.com/cyphar/filepath-securejoin v0.2.3 // indirect
-	github.com/dapr/components-contrib v1.10.0-rc.4 // indirect
+	github.com/dapr/components-contrib v1.10.0-rc.9 // indirect
 	github.com/dapr/kit v0.0.4 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/docker/cli v20.10.21+incompatible // indirect

go.sum

@@ -327,10 +327,10 @@ github.com/d2g/dhcp4 v0.0.0-20170904100407-a1d1b6c41b1c/go.mod h1:Ct2BUK8SB0YC1S
 github.com/d2g/dhcp4client v1.0.0/go.mod h1:j0hNfjhrt2SxUOw55nL0ATM/z4Yt3t2Kd1mW34z5W5s=
 github.com/d2g/dhcp4server v0.0.0-20181031114812-7d4a0a7f59a5/go.mod h1:Eo87+Kg/IX2hfWJfwxMzLyuSZyxSoAug2nGa1G2QAi8=
 github.com/d2g/hardwareaddr v0.0.0-20190221164911-e7d9fbe030e4/go.mod h1:bMl4RjIciD2oAxI7DmWRx6gbeqrkoLqv3MV0vzNad+I=
-github.com/dapr/components-contrib v1.10.0-rc.4 h1:qpA9l8e7X7ZLHnhtnqRB6iwcSAn1KiViyg6fLx41R4I=
-github.com/dapr/components-contrib v1.10.0-rc.4/go.mod h1:8OvVS4m3kK/ocDqhVYKdu4j7OS4gPlbXMi+eRjlPAwc=
-github.com/dapr/dapr v1.10.0-rc.4 h1:FH3CNjhglEp3kMls5ykwtQnx+JYm2pRFsGft8XuGjWU=
-github.com/dapr/dapr v1.10.0-rc.4/go.mod h1:hHGc3P6ZXrWMlIKmXOMgZc70xCdIDUVSuJgfzOPeycs=
+github.com/dapr/components-contrib v1.10.0-rc.9 h1:iHVmtJ1Tc4Y1XaxA+LMLpKEfAanwSudXRAD+/+kgG8Q=
+github.com/dapr/components-contrib v1.10.0-rc.9/go.mod h1:JM3xDSSDVb+ot246VZndZZK1K8Ft/6Ch2FtXW1Jbbhk=
+github.com/dapr/dapr v1.10.0 h1:oQhHaQ0ryJIwcjPnlIzIGzDpbnQsbaw+7mKBGVUoS4Q=
+github.com/dapr/dapr v1.10.0/go.mod h1:FoDlQyiJm0BSgPGwxGsTvQZ5zVeE0SWNzq8PAs5c6gc=
 github.com/dapr/go-sdk v1.6.0 h1:jg5A2khSCHF8bGZsig5RWN/gD0jjitszc2V6Uq2pPdY=
 github.com/dapr/go-sdk v1.6.0/go.mod h1:KLQBltoD9K0w5hKTihdcyg9Epob9gypwL5dYcQzPro4=
 github.com/dapr/kit v0.0.4 h1:i+7TIN4crC1Mo0JFyWpIkwAE8orlliA0O6/ibvs2AaE=

tests/e2e/upgrade/upgrade_test.go

@@ -70,8 +70,8 @@ var supportedUpgradePaths = []upgradePath{
 			CustomResourceDefs:  []string{"components.dapr.io", "configurations.dapr.io", "subscriptions.dapr.io", "resiliencies.dapr.io"},
 		},
 		next: common.VersionDetails{
-			RuntimeVersion:      "1.10.0-rc.4",
-			DashboardVersion:    "0.11.0",
+			RuntimeVersion:      "1.10.0",
+			DashboardVersion:    "0.12.0",
 			ClusterRoles:        []string{"dapr-dashboard", "dapr-injector", "dapr-operator-admin", "dapr-placement", "dapr-sentry"},
 			ClusterRoleBindings: []string{"dapr-operator-admin", "dapr-dashboard", "dapr-injector", "dapr-placement", "dapr-sentry"},
 			CustomResourceDefs:  []string{"components.dapr.io", "configurations.dapr.io", "subscriptions.dapr.io", "resiliencies.dapr.io"},
@@ -80,8 +80,8 @@ var supportedUpgradePaths = []upgradePath{
 	// test downgrade.
 	{
 		previous: common.VersionDetails{
-			RuntimeVersion:      "1.10.0-rc.4",
-			DashboardVersion:    "0.11.0",
+			RuntimeVersion:      "1.10.0",
+			DashboardVersion:    "0.12.0",
 			ClusterRoles:        []string{"dapr-dashboard", "dapr-injector", "dapr-operator-admin", "dapr-placement", "dapr-sentry"},
 			ClusterRoleBindings: []string{"dapr-operator-admin", "dapr-dashboard", "dapr-injector", "dapr-placement", "dapr-sentry"},
 			CustomResourceDefs:  []string{"components.dapr.io", "configurations.dapr.io", "subscriptions.dapr.io", "resiliencies.dapr.io"},