From 747dc3f7aeeb525e1f71762e4986bd0e11f54442 Mon Sep 17 00:00:00 2001 From: Pravin Pushkar Date: Tue, 12 Jul 2022 12:06:44 +0530 Subject: [PATCH] update runtime version and dev container version (#1024) Signed-off-by: Pravin --- .devcontainer/devcontainer.json | 2 +- .github/workflows/kind_e2e.yaml | 2 +- .github/workflows/self_hosted_e2e.yaml | 2 +- go.mod | 2 +- go.sum | 2 ++ tests/e2e/upgrade/upgrade_test.go | 4 ++-- 6 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 5b2cec278..c64f8b71a 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,7 +1,7 @@ { "name": "Dapr CLI Dev Environment", // Update the container version when you publish dev-container - "image": "docker.io/daprio/dapr-dev:0.1.7", + "image": "ghcr.io/dapr/dapr-dev:0.1.8", // Replace with uncommented line below to build your own local copy of the image // "dockerFile": "../docker/Dockerfile-dev", "containerEnv": { diff --git a/.github/workflows/kind_e2e.yaml b/.github/workflows/kind_e2e.yaml index d17760193..cb2886daf 100644 --- a/.github/workflows/kind_e2e.yaml +++ b/.github/workflows/kind_e2e.yaml @@ -51,7 +51,7 @@ jobs: runs-on: ubuntu-latest env: GOVER: 1.18 - DAPR_RUNTIME_VERSION: 1.8.0-rc.5 + DAPR_RUNTIME_VERSION: 1.8.0 DAPR_DASHBOARD_VERSION: 0.10.0 DAPR_TGZ: dapr-1.7.0.tgz strategy: diff --git a/.github/workflows/self_hosted_e2e.yaml b/.github/workflows/self_hosted_e2e.yaml index 0c6d73378..e9177d971 100644 --- a/.github/workflows/self_hosted_e2e.yaml +++ b/.github/workflows/self_hosted_e2e.yaml @@ -40,7 +40,7 @@ jobs: GOARCH: ${{ matrix.target_arch }} GOPROXY: https://proxy.golang.org ARCHIVE_OUTDIR: dist/archives - DAPR_RUNTIME_VERSION: "1.8.0-rc.5" + DAPR_RUNTIME_VERSION: "1.8.0" DAPR_DASHBOARD_VERSION: 0.10.0 DAPR_TGZ: dapr-1.7.0.tgz strategy: diff --git a/go.mod b/go.mod index 3e6f8f71c..11039c9e2 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ require ( github.com/Azure/go-autorest/autorest/adal v0.9.18 // indirect github.com/Pallinder/sillyname-go v0.0.0-20130730142914-97aeae9e6ba1 github.com/briandowns/spinner v1.6.1 - github.com/dapr/dapr v1.8.0-rc.5 + github.com/dapr/dapr v1.8.0 github.com/dapr/go-sdk v1.0.0 github.com/docker/docker v20.10.12+incompatible github.com/fatih/color v1.13.0 diff --git a/go.sum b/go.sum index c8407857e..27a63bc60 100644 --- a/go.sum +++ b/go.sum @@ -353,6 +353,8 @@ github.com/d2g/hardwareaddr v0.0.0-20190221164911-e7d9fbe030e4/go.mod h1:bMl4RjI github.com/danieljoos/wincred v1.1.0/go.mod h1:XYlo+eRTsVA9aHGp7NGjFkPla4m+DCL7hqDjlFjiygg= github.com/dapr/dapr v1.8.0-rc.5 h1:1POxV98uamkcnjUvb40BGZ8brTXvdXYHjUB/mLhc4Gk= github.com/dapr/dapr v1.8.0-rc.5/go.mod h1:r4KJgC+Q/FN5/NmWuU7ffL+0ApuUBxaPT6Trbz68Oxw= +github.com/dapr/dapr v1.8.0 h1:ZAAoBe6wuFp7k4tIHB7ajZXVTtGeDeVqIPrldzo3dF0= +github.com/dapr/dapr v1.8.0/go.mod h1:yAsDiK5oecG0htw2S8JG9RFaeHJVdlTfZyOrL57AvRM= github.com/dapr/go-sdk v1.0.0 h1:3nOmFzsPaHzzgINQQD9AFofVX6LV8QYJtpogaBfwkUg= github.com/dapr/go-sdk v1.0.0/go.mod h1:zyhsocIKv4pqQ2VtvWvf2CK1UhP7Z2OAOXgEpVxMgIs= github.com/dapr/kit v0.0.2-0.20210614175626-b9074b64d233 h1:M0dWIG8kUxEFU57IqTWeqptNqlBsfosFgsA5Ov7rJ8g= diff --git a/tests/e2e/upgrade/upgrade_test.go b/tests/e2e/upgrade/upgrade_test.go index 4d19e0b22..6ae5082b9 100644 --- a/tests/e2e/upgrade/upgrade_test.go +++ b/tests/e2e/upgrade/upgrade_test.go @@ -38,7 +38,7 @@ var supportedUpgradePaths = []upgradePath{ CustomResourceDefs: []string{"components.dapr.io", "configurations.dapr.io", "subscriptions.dapr.io", "resiliencies.dapr.io"}, }, next: common.VersionDetails{ - RuntimeVersion: "1.8.0-rc.5", + RuntimeVersion: "1.8.0", DashboardVersion: "0.10.0", ClusterRoles: []string{"dapr-operator-admin", "dashboard-reader"}, ClusterRoleBindings: []string{"dapr-operator", "dapr-role-tokenreview-binding", "dashboard-reader-global"}, @@ -64,7 +64,7 @@ var supportedUpgradePaths = []upgradePath{ // test downgrade { previous: common.VersionDetails{ - RuntimeVersion: "1.8.0-rc.5", + RuntimeVersion: "1.8.0", DashboardVersion: "0.10.0", ClusterRoles: []string{"dapr-operator-admin", "dashboard-reader"}, ClusterRoleBindings: []string{"dapr-operator", "dapr-role-tokenreview-binding", "dashboard-reader-global"},