dapr
/
cli
mirror of https://github.com/dapr/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into typo

This commit is contained in:
Long Dai 2021-08-05 09:00:19 +08:00 committed by GitHub
parent e57f268b24 3af897f5ac
commit d00e0fec0e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CODEOWNERS
View File

@ -1,2 +1,2 @@
# These owners are the maintainers and approvers of this repo
* @maintainers-cli @approvers-cli
* @dapr/maintainers-cli @dapr/approvers-cli

4
pkg/standalone/run.go
View File

@ -136,12 +136,12 @@ func getDaprCommand(appID string, daprHTTPPort int, daprGRPCPort int, appPort in
args = append(
args,
"--enable-profiling", "true",
"--enable-profiling",
"--profile-port", strconv.Itoa(profilePort))
}
if appSSL {
args = append(args, "--app-ssl", "true")
args = append(args, "--app-ssl")
}
cmd := exec.Command(daprCMD, args...)

2
pkg/standalone/run_test.go
View File

@ -106,7 +106,7 @@ func TestRun(t *testing.T) {
assertArgumentEqual(t, "app-protocol", "http", output.DaprCMD.Args)
assertArgumentEqual(t, "app-port", "3000", output.DaprCMD.Args)
assertArgumentEqual(t, "components-path", DefaultComponentsDirPath(), output.DaprCMD.Args)
assertArgumentEqual(t, "app-ssl", "true", output.DaprCMD.Args)
assertArgumentEqual(t, "app-ssl", "", output.DaprCMD.Args)
assertArgumentEqual(t, "metrics-port", "9001", output.DaprCMD.Args)
if runtime.GOOS == "windows" {
assertArgumentEqual(t, "placement-host-address", "localhost:6050", output.DaprCMD.Args)

4
tests/e2e/kubernetes/kubernetes_test.go
View File

@ -14,8 +14,8 @@ import (
)
const (
currentRuntimeVersion = "1.2.0"
currentDashboardVersion = "0.6.0"
currentRuntimeVersion = "1.3.0"
currentDashboardVersion = "0.7.0"
)
var currentVersionDetails = common.VersionDetails{

4
tests/e2e/standalone/standalone_test.go
View File

@ -32,8 +32,8 @@ import (
)
const (
daprRuntimeVersion = "1.2.0"
daprDashboardVersion = "0.6.0"
daprRuntimeVersion = "1.3.0"
daprDashboardVersion = "0.7.0"
)
func TestStandaloneInstall(t *testing.T) {

12
tests/e2e/upgrade/upgrade_test.go
View File

@ -71,15 +71,15 @@ var (
},
{
previous: common.VersionDetails{
RuntimeVersion: "1.1.0",
RuntimeVersion: "1.2.0",
DashboardVersion: "0.6.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"},
},
next: common.VersionDetails{
RuntimeVersion: "1.2.0",
DashboardVersion: "0.6.0",
RuntimeVersion: "1.3.0",
DashboardVersion: "0.7.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"},
@ -87,15 +87,15 @@ var (
},
{
previous: common.VersionDetails{
RuntimeVersion: "1.1.1",
RuntimeVersion: "1.2.2",
DashboardVersion: "0.6.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"},
},
next: common.VersionDetails{
RuntimeVersion: "1.2.0",
DashboardVersion: "0.6.0",
RuntimeVersion: "1.3.0",
DashboardVersion: "0.7.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"},