Skip to content

Commit d55944c

Browse files
mukundansundarmukundansundar
authored
Merge pull request #1358 from mukundansundar/merge_rel_1.12_master
Merge rel 1.12 master
2 parents bb2c3a7 + 02eec8b commit d55944c

File tree

5 files changed

+20
-20
lines changed

5 files changed

+20
-20
lines changed

‎.github/workflows/kind_e2e.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,11 @@ jobs:
5050
name: E2E tests for K8s (KinD)
5151
runs-on: ubuntu-latest
5252
env:
53-
DAPR_RUNTIME_PINNED_VERSION: 1.12.0-rc.3
54-
DAPR_DASHBOARD_PINNED_VERSION: 0.13.0
53+
DAPR_RUNTIME_PINNED_VERSION: 1.12.0
54+
DAPR_DASHBOARD_PINNED_VERSION: 0.14.0
5555
DAPR_RUNTIME_LATEST_STABLE_VERSION:
5656
DAPR_DASHBOARD_LATEST_STABLE_VERSION:
57-
DAPR_TGZ: dapr-1.12.0-rc.3.tgz
57+
DAPR_TGZ: dapr-1.12.0.tgz
5858
strategy:
5959
fail-fast: false # Keep running if one leg fails.
6060
matrix:

‎.github/workflows/self_hosted_e2e.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ jobs:
3838
GOARCH: ${{ matrix.target_arch }}
3939
GOPROXY: https://proxy.golang.org
4040
ARCHIVE_OUTDIR: dist/archives
41-
DAPR_RUNTIME_PINNED_VERSION: "1.12.0-rc.3"
42-
DAPR_DASHBOARD_PINNED_VERSION: 0.13.0
41+
DAPR_RUNTIME_PINNED_VERSION: "1.12.0"
42+
DAPR_DASHBOARD_PINNED_VERSION: 0.14.0
4343
DAPR_RUNTIME_LATEST_STABLE_VERSION:
4444
DAPR_DASHBOARD_LATEST_STABLE_VERSION:
4545
GOLANG_PROTOBUF_REGISTRATION_CONFLICT: warn

‎go.mod‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ require (
77
github.com/Azure/go-autorest/autorest/adal v0.9.22 // indirect
88
github.com/Pallinder/sillyname-go v0.0.0-20130730142914-97aeae9e6ba1
99
github.com/briandowns/spinner v1.19.0
10-
github.com/dapr/dapr v1.12.0-rc.3
11-
github.com/dapr/go-sdk v1.6.0
10+
github.com/dapr/dapr v1.12.0
11+
github.com/dapr/go-sdk v1.9.0-rc-1
1212
github.com/docker/docker v20.10.21+incompatible
1313
github.com/fatih/color v1.15.0
1414
github.com/gocarina/gocsv v0.0.0-20220927221512-ad3251f9fa25
@@ -86,7 +86,7 @@ require (
8686
github.com/containerd/containerd v1.6.18 // indirect
8787
github.com/containerd/continuity v0.3.0 // indirect
8888
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
89-
github.com/dapr/components-contrib v1.12.0-rc.3 // indirect
89+
github.com/dapr/components-contrib v1.12.0-rc.4 // indirect
9090
github.com/dapr/kit v0.12.1
9191
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
9292
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect

‎go.sum‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -335,12 +335,12 @@ github.com/d2g/dhcp4 v0.0.0-20170904100407-a1d1b6c41b1c/go.mod h1:Ct2BUK8SB0YC1S
335335
github.com/d2g/dhcp4client v1.0.0/go.mod h1:j0hNfjhrt2SxUOw55nL0ATM/z4Yt3t2Kd1mW34z5W5s=
336336
github.com/d2g/dhcp4server v0.0.0-20181031114812-7d4a0a7f59a5/go.mod h1:Eo87+Kg/IX2hfWJfwxMzLyuSZyxSoAug2nGa1G2QAi8=
337337
github.com/d2g/hardwareaddr v0.0.0-20190221164911-e7d9fbe030e4/go.mod h1:bMl4RjIciD2oAxI7DmWRx6gbeqrkoLqv3MV0vzNad+I=
338-
github.com/dapr/components-contrib v1.12.0-rc.3 h1:S1xDKvUyhxbIYR3wwtj2C0cAiVUNc8+1/efpEupaOTY=
339-
github.com/dapr/components-contrib v1.12.0-rc.3/go.mod h1:2jRaZ7FEm+u12lsmfnCFASlTMu5nUn0gtsirAtueBe4=
340-
github.com/dapr/dapr v1.12.0-rc.3 h1:xtdBUWlecYJa6vzg5tp6SYEDZN4z9fW+z1oN8+SJ61M=
341-
github.com/dapr/dapr v1.12.0-rc.3/go.mod h1:JZGZh8T0rz75DZBX3zGESi1p9IWWM0ZAGAzaGMHp+5o=
342-
github.com/dapr/go-sdk v1.6.0 h1:jg5A2khSCHF8bGZsig5RWN/gD0jjitszc2V6Uq2pPdY=
343-
github.com/dapr/go-sdk v1.6.0/go.mod h1:KLQBltoD9K0w5hKTihdcyg9Epob9gypwL5dYcQzPro4=
338+
github.com/dapr/components-contrib v1.12.0-rc.4 h1:8EH7sRjgb4uNpvEkOkUNNb1VGuecJ9Ux3QOwSq0Szwo=
339+
github.com/dapr/components-contrib v1.12.0-rc.4/go.mod h1:2jRaZ7FEm+u12lsmfnCFASlTMu5nUn0gtsirAtueBe4=
340+
github.com/dapr/dapr v1.12.0 h1:JrnzIYupSHLVK95YWlMZv+h/rfg5rGl53ml9EG4Vrqg=
341+
github.com/dapr/dapr v1.12.0/go.mod h1:LjmQepPe5+A898VHMUsmX0r0D0OTj6ijtqCIZqMvo7o=
342+
github.com/dapr/go-sdk v1.9.0-rc-1 h1:14GjWVv32ke/E86Srh0TT28K+4kxl3KU233hdUDBgck=
343+
github.com/dapr/go-sdk v1.9.0-rc-1/go.mod h1:bK9bNEsC6hY3RMKh69r0nBjLqb6njeWTEGVMOgP9g20=
344344
github.com/dapr/kit v0.12.1 h1:XT0CJQQaKRYSzIzZo15O1PAHGUrMGoAavdFRcNVZ+UE=
345345
github.com/dapr/kit v0.12.1/go.mod h1:eNYjsudq3Ij0x8CLWsPturHor56sZRNu5tk2hUiJT80=
346346
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=

‎tests/e2e/upgrade/upgrade_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -66,14 +66,14 @@ var supportedUpgradePaths = []upgradePath{
6666
{
6767
previous: common.VersionDetails{
6868
RuntimeVersion: "1.11.0",
69-
DashboardVersion: "0.13.0",
69+
DashboardVersion: "0.14.0",
7070
ClusterRoles: []string{"dapr-dashboard", "dapr-injector", "dapr-operator-admin", "dapr-placement", "dapr-sentry"},
7171
ClusterRoleBindings: []string{"dapr-operator-admin", "dapr-dashboard", "dapr-injector", "dapr-placement", "dapr-sentry"},
7272
CustomResourceDefs: []string{"components.dapr.io", "configurations.dapr.io", "subscriptions.dapr.io", "resiliencies.dapr.io", "httpendpoints.dapr.io"},
7373
},
7474
next: common.VersionDetails{
75-
RuntimeVersion: "1.12.0-rc.3",
76-
DashboardVersion: "0.13.0",
75+
RuntimeVersion: "1.12.0",
76+
DashboardVersion: "0.14.0",
7777
ClusterRoles: []string{"dapr-dashboard", "dapr-injector", "dapr-operator-admin", "dapr-placement", "dapr-sentry"},
7878
ClusterRoleBindings: []string{"dapr-operator-admin", "dapr-dashboard", "dapr-injector", "dapr-placement", "dapr-sentry"},
7979
CustomResourceDefs: []string{"components.dapr.io", "configurations.dapr.io", "subscriptions.dapr.io", "resiliencies.dapr.io", "httpendpoints.dapr.io"},
@@ -82,15 +82,15 @@ var supportedUpgradePaths = []upgradePath{
8282
// test downgrade.
8383
{
8484
previous: common.VersionDetails{
85-
RuntimeVersion: "1.12.0-rc.3",
86-
DashboardVersion: "0.13.0",
85+
RuntimeVersion: "1.12.0",
86+
DashboardVersion: "0.14.0",
8787
ClusterRoles: []string{"dapr-dashboard", "dapr-injector", "dapr-operator-admin", "dapr-placement", "dapr-sentry"},
8888
ClusterRoleBindings: []string{"dapr-operator-admin", "dapr-dashboard", "dapr-injector", "dapr-placement", "dapr-sentry"},
8989
CustomResourceDefs: []string{"components.dapr.io", "configurations.dapr.io", "subscriptions.dapr.io", "resiliencies.dapr.io", "httpendpoints.dapr.io"},
9090
},
9191
next: common.VersionDetails{
9292
RuntimeVersion: "1.11.0",
93-
DashboardVersion: "0.13.0",
93+
DashboardVersion: "0.14.0",
9494
ClusterRoles: []string{"dapr-dashboard", "dapr-injector", "dapr-operator-admin", "dapr-placement", "dapr-sentry"},
9595
ClusterRoleBindings: []string{"dapr-operator-admin", "dapr-dashboard", "dapr-injector", "dapr-placement", "dapr-sentry"},
9696
CustomResourceDefs: []string{"components.dapr.io", "configurations.dapr.io", "subscriptions.dapr.io", "resiliencies.dapr.io", "httpendpoints.dapr.io"},

0 commit comments

Comments
 (0)