Update to 1.7.0 runtime (#956)

Signed-off-by: Artur Souza <[email protected]>

Author: artursouza

.github/workflows/kind_e2e.yaml

@@ -46,9 +46,9 @@ jobs:
     runs-on: ubuntu-latest
     env:
       GOVER: 1.17
-      DAPR_RUNTIME_VERSION: 1.7.0-rc.3
-      DAPR_DASHBOARD_VERSION: 0.10.0-rc.1
-      DAPR_TGZ: dapr-1.7.0-rc.3.tgz
+      DAPR_RUNTIME_VERSION: 1.7.0
+      DAPR_DASHBOARD_VERSION: 0.10.0
+      DAPR_TGZ: dapr-1.7.0.tgz
     strategy:
       fail-fast: false # Keep running if one leg fails.
       matrix:

.github/workflows/self_hosted_e2e.yaml

@@ -36,9 +36,9 @@ jobs:
       GOARCH: ${{ matrix.target_arch }}
       GOPROXY: https://proxy.golang.org
       ARCHIVE_OUTDIR: dist/archives
-      DAPR_RUNTIME_VERSION: "1.7.0-rc.3"
-      DAPR_DASHBOARD_VERSION: 0.10.0-rc.1
-      DAPR_TGZ: dapr-1.7.0-rc.3.tgz
+      DAPR_RUNTIME_VERSION: "1.7.0"
+      DAPR_DASHBOARD_VERSION: 0.10.0
+      DAPR_TGZ: dapr-1.7.0.tgz
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest]

go.mod

@@ -5,7 +5,7 @@ go 1.17
 require (
 	github.com/Pallinder/sillyname-go v0.0.0-20130730142914-97aeae9e6ba1
 	github.com/briandowns/spinner v1.6.1
-	github.com/dapr/dapr v1.7.0-rc.3
+	github.com/dapr/dapr v1.7.0
 	github.com/dapr/go-sdk v1.0.0
 	github.com/docker/docker v20.10.12+incompatible
 	github.com/fatih/color v1.13.0

go.sum

@@ -345,8 +345,8 @@ github.com/d2g/dhcp4client v1.0.0/go.mod h1:j0hNfjhrt2SxUOw55nL0ATM/z4Yt3t2Kd1mW
 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/danieljoos/wincred v1.1.0/go.mod h1:XYlo+eRTsVA9aHGp7NGjFkPla4m+DCL7hqDjlFjiygg=
-github.com/dapr/dapr v1.7.0-rc.3 h1:Qc1ezpsW5g2+AAi/X3zqJNxdMyifIqh8wpXRGbKaBPs=
-github.com/dapr/dapr v1.7.0-rc.3/go.mod h1:MIXtm4c4Vv1Z7GScHOgctDcjZ28W2jGYxXvr28+LGpM=
+github.com/dapr/dapr v1.7.0 h1:6D92cycMjrzxOSASfXDMfn1t3dGaDysA28ONogaOE4s=
+github.com/dapr/dapr v1.7.0/go.mod h1:MIXtm4c4Vv1Z7GScHOgctDcjZ28W2jGYxXvr28+LGpM=
 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=

pkg/standalone/bundle_test.go

@@ -22,13 +22,13 @@ import (
 
 func TestParseDetails(t *testing.T) {
 	correctDetails := `{
-		"daprd" : "1.7.0-rc.2",
-		"dashboard": "0.10.0-rc.2",
-		"cli": "1.7.0-rc.2",
+		"daprd" : "1.7.0",
+		"dashboard": "0.10.0",
+		"cli": "1.7.0",
 		"daprBinarySubDir": "dist",
 		"dockerImageSubDir": "docker",
-		"daprImageName": "daprio/dapr:1.7.2-rc.2",
-		"daprImageFileName": "daprio-dapr-1.7.2-rc.2.tar.gz"
+		"daprImageName": "daprio/dapr:1.7.2",
+		"daprImageFileName": "daprio-dapr-1.7.2.tar.gz"
 	}`
 	f, err := os.CreateTemp("", "*-details.json")
 	if err != nil {
@@ -40,21 +40,21 @@ func TestParseDetails(t *testing.T) {
 	bd := bundleDetails{}
 	err = bd.readAndParseDetails(f.Name())
 	assert.NoError(t, err, "expected no error on parsing correct details in file")
-	assert.Equal(t, "1.7.0-rc.2", *bd.RuntimeVersion, "expected versions to match")
-	assert.Equal(t, "0.10.0-rc.2", *bd.DashboardVersion, "expected versions to match")
+	assert.Equal(t, "1.7.0", *bd.RuntimeVersion, "expected versions to match")
+	assert.Equal(t, "0.10.0", *bd.DashboardVersion, "expected versions to match")
 	assert.Equal(t, "dist", *bd.BinarySubDir, "expected value to match")
 	assert.Equal(t, "docker", *bd.ImageSubDir, "expected value to match")
-	assert.Equal(t, "daprio/dapr:1.7.2-rc.2", bd.getPlacementImageName(), "expected value to match")
-	assert.Equal(t, "daprio-dapr-1.7.2-rc.2.tar.gz", bd.getPlacementImageFileName(), "expected value to match")
+	assert.Equal(t, "daprio/dapr:1.7.2", bd.getPlacementImageName(), "expected value to match")
+	assert.Equal(t, "daprio-dapr-1.7.2.tar.gz", bd.getPlacementImageFileName(), "expected value to match")
 }
 
 func TestParseDetailsMissingDetails(t *testing.T) {
 	missingDetails := `{
-		"daprd" : "1.7.0-rc.2",
-		"dashboard": "0.10.0-rc.2",
-		"cli": "1.7.0-rc.2",
-		"daprImageName": "daprio/dapr:1.7.2-rc.2"
-		"daprImageFileName": "daprio-dapr-1.7.2-rc.2.tar.gz"
+		"daprd" : "1.7.0",
+		"dashboard": "0.10.0",
+		"cli": "1.7.0",
+		"daprImageName": "daprio/dapr:1.7.2"
+		"daprImageFileName": "daprio-dapr-1.7.2.tar.gz"
 	}`
 	f, err := os.CreateTemp("", "*-details.json")
 	if err != nil {
@@ -72,11 +72,11 @@ func TestParseDetailsEmptyDetails(t *testing.T) {
 	missingDetails := `{
 		"daprd" : "",
 		"dashboard": "",
-		"cli": "1.7.0-rc.2",
+		"cli": "1.7.0",
 		"daprBinarySubDir": "dist",
 		"dockerImageSubDir": "docker",
-		"daprImageName": "daprio/dapr:1.7.2-rc.2",
-		"daprImageFileName": "daprio-dapr-1.7.2-rc.2.tar.gz"
+		"daprImageName": "daprio/dapr:1.7.2",
+		"daprImageFileName": "daprio-dapr-1.7.2.tar.gz"
 	}`
 	f, err := os.CreateTemp("", "*-details.json")
 	if err != nil {

tests/e2e/upgrade/upgrade_test.go

@@ -70,8 +70,8 @@ var supportedUpgradePaths = []upgradePath{
 			CustomResourceDefs:  []string{"components.dapr.io", "configurations.dapr.io", "subscriptions.dapr.io"},
 		},
 		next: common.VersionDetails{
-			RuntimeVersion:      "1.7.0-rc.3",
-			DashboardVersion:    "0.10.0-rc.1",
+			RuntimeVersion:      "1.7.0",
+			DashboardVersion:    "0.10.0",
 			ClusterRoles:        []string{"dapr-operator-admin", "dashboard-reader"},
 			ClusterRoleBindings: []string{"dapr-operator", "dapr-role-tokenreview-binding", "dashboard-reader-global"},
 			CustomResourceDefs:  []string{"components.dapr.io", "configurations.dapr.io", "subscriptions.dapr.io"},