Merge pull request #1358 from mukundansundar/merge_rel_1.12_master

Merge rel 1.12 master
dapr · Oct 12, 2023 · d55944c · d55944c
2 parents bb2c3a7 + 02eec8b
commit d55944c
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 20 deletions.
diff --git a/.github/workflows/kind_e2e.yaml b/.github/workflows/kind_e2e.yaml
@@ -50,11 +50,11 @@ jobs:
     name: E2E tests for K8s (KinD)
     runs-on: ubuntu-latest
     env:
-      DAPR_RUNTIME_PINNED_VERSION: 1.12.0-rc.3
-      DAPR_DASHBOARD_PINNED_VERSION: 0.13.0
+      DAPR_RUNTIME_PINNED_VERSION: 1.12.0
+      DAPR_DASHBOARD_PINNED_VERSION: 0.14.0
       DAPR_RUNTIME_LATEST_STABLE_VERSION:
       DAPR_DASHBOARD_LATEST_STABLE_VERSION:
-      DAPR_TGZ: dapr-1.12.0-rc.3.tgz
+      DAPR_TGZ: dapr-1.12.0.tgz
     strategy:
       fail-fast: false # Keep running if one leg fails.
       matrix:

diff --git a/.github/workflows/self_hosted_e2e.yaml b/.github/workflows/self_hosted_e2e.yaml
@@ -38,8 +38,8 @@ jobs:
       GOARCH: ${{ matrix.target_arch }}
       GOPROXY: https://proxy.golang.org
       ARCHIVE_OUTDIR: dist/archives
-      DAPR_RUNTIME_PINNED_VERSION: "1.12.0-rc.3"
-      DAPR_DASHBOARD_PINNED_VERSION: 0.13.0
+      DAPR_RUNTIME_PINNED_VERSION: "1.12.0"
+      DAPR_DASHBOARD_PINNED_VERSION: 0.14.0
       DAPR_RUNTIME_LATEST_STABLE_VERSION:
       DAPR_DASHBOARD_LATEST_STABLE_VERSION:
       GOLANG_PROTOBUF_REGISTRATION_CONFLICT: warn

diff --git a/go.mod b/go.mod
@@ -7,8 +7,8 @@ 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.12.0-rc.3
-	github.com/dapr/go-sdk v1.6.0
+	github.com/dapr/dapr v1.12.0
+	github.com/dapr/go-sdk v1.9.0-rc-1
 	github.com/docker/docker v20.10.21+incompatible
 	github.com/fatih/color v1.15.0
 	github.com/gocarina/gocsv v0.0.0-20220927221512-ad3251f9fa25
@@ -86,7 +86,7 @@ require (
 	github.com/containerd/containerd v1.6.18 // indirect
 	github.com/containerd/continuity v0.3.0 // indirect
 	github.com/cyphar/filepath-securejoin v0.2.4 // indirect
-	github.com/dapr/components-contrib v1.12.0-rc.3 // indirect
+	github.com/dapr/components-contrib v1.12.0-rc.4 // indirect
 	github.com/dapr/kit v0.12.1
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect

diff --git a/go.sum b/go.sum
@@ -335,12 +335,12 @@ 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.12.0-rc.3 h1:S1xDKvUyhxbIYR3wwtj2C0cAiVUNc8+1/efpEupaOTY=
-github.com/dapr/components-contrib v1.12.0-rc.3/go.mod h1:2jRaZ7FEm+u12lsmfnCFASlTMu5nUn0gtsirAtueBe4=
-github.com/dapr/dapr v1.12.0-rc.3 h1:xtdBUWlecYJa6vzg5tp6SYEDZN4z9fW+z1oN8+SJ61M=
-github.com/dapr/dapr v1.12.0-rc.3/go.mod h1:JZGZh8T0rz75DZBX3zGESi1p9IWWM0ZAGAzaGMHp+5o=
-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/components-contrib v1.12.0-rc.4 h1:8EH7sRjgb4uNpvEkOkUNNb1VGuecJ9Ux3QOwSq0Szwo=
+github.com/dapr/components-contrib v1.12.0-rc.4/go.mod h1:2jRaZ7FEm+u12lsmfnCFASlTMu5nUn0gtsirAtueBe4=
+github.com/dapr/dapr v1.12.0 h1:JrnzIYupSHLVK95YWlMZv+h/rfg5rGl53ml9EG4Vrqg=
+github.com/dapr/dapr v1.12.0/go.mod h1:LjmQepPe5+A898VHMUsmX0r0D0OTj6ijtqCIZqMvo7o=
+github.com/dapr/go-sdk v1.9.0-rc-1 h1:14GjWVv32ke/E86Srh0TT28K+4kxl3KU233hdUDBgck=
+github.com/dapr/go-sdk v1.9.0-rc-1/go.mod h1:bK9bNEsC6hY3RMKh69r0nBjLqb6njeWTEGVMOgP9g20=
 github.com/dapr/kit v0.12.1 h1:XT0CJQQaKRYSzIzZo15O1PAHGUrMGoAavdFRcNVZ+UE=
 github.com/dapr/kit v0.12.1/go.mod h1:eNYjsudq3Ij0x8CLWsPturHor56sZRNu5tk2hUiJT80=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=

diff --git a/tests/e2e/upgrade/upgrade_test.go b/tests/e2e/upgrade/upgrade_test.go
@@ -66,14 +66,14 @@ var supportedUpgradePaths = []upgradePath{
 	{
 		previous: common.VersionDetails{
 			RuntimeVersion:      "1.11.0",
-			DashboardVersion:    "0.13.0",
+			DashboardVersion:    "0.14.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", "httpendpoints.dapr.io"},
 		},
 		next: common.VersionDetails{
-			RuntimeVersion:      "1.12.0-rc.3",
-			DashboardVersion:    "0.13.0",
+			RuntimeVersion:      "1.12.0",
+			DashboardVersion:    "0.14.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", "httpendpoints.dapr.io"},
@@ -82,15 +82,15 @@ var supportedUpgradePaths = []upgradePath{
 	// test downgrade.
 	{
 		previous: common.VersionDetails{
-			RuntimeVersion:      "1.12.0-rc.3",
-			DashboardVersion:    "0.13.0",
+			RuntimeVersion:      "1.12.0",
+			DashboardVersion:    "0.14.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", "httpendpoints.dapr.io"},
 		},
 		next: common.VersionDetails{
 			RuntimeVersion:      "1.11.0",
-			DashboardVersion:    "0.13.0",
+			DashboardVersion:    "0.14.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", "httpendpoints.dapr.io"},