File tree Expand file tree Collapse file tree 2 files changed +8
-3
lines changed Expand file tree Collapse file tree 2 files changed +8
-3
lines changed Original file line number Diff line number Diff line change @@ -230,8 +230,13 @@ dapr run --run-file /path/to/directory -k
230
230
output .DaprGRPCPort )
231
231
}
232
232
233
- if (daprVer .RuntimeVersion != "edge" ) && (semver .Compare (fmt .Sprintf ("v%v" , daprVer .RuntimeVersion ), "v1.14.0-rc.1" ) == - 1 ) {
233
+ if (daprVer .RuntimeVersion != "edge" ) && (daprVer . RuntimeVersion != "dev" ) && ( semver .Compare (fmt .Sprintf ("v%v" , daprVer .RuntimeVersion ), "v1.14.0-rc.1" ) == - 1 ) {
234
234
print .InfoStatusEvent (os .Stdout , "The scheduler is only compatible with dapr runtime 1.14 onwards." )
235
+ for i , arg := range output .DaprCMD .Args {
236
+ if strings .HasPrefix (arg , "--scheduler-host-address" ) {
237
+ output .DaprCMD .Args [i ] = ""
238
+ }
239
+ }
235
240
}
236
241
print .InfoStatusEvent (os .Stdout , startInfo )
237
242
@@ -665,7 +670,7 @@ func executeRunWithAppsConfigFile(runFilePath string, k8sEnabled bool) {
665
670
// populate the scheduler host address based on the dapr version.
666
671
func validateSchedulerHostAddress (version , address string ) string {
667
672
// If no SchedulerHostAddress is supplied, set it to default value.
668
- if semver .Compare (fmt .Sprintf ("v%v" , version ), "v1.15.0-rc.0" ) == 1 {
673
+ if version == "dev" || version == "edge" || semver .Compare (fmt .Sprintf ("v%v" , version ), "v1.15.0-rc.0" ) == 1 {
669
674
if address == "" {
670
675
return "localhost:50006"
671
676
}
Original file line number Diff line number Diff line change @@ -141,7 +141,7 @@ func (config *RunConfig) validatePlacementHostAddr() error {
141
141
func (config * RunConfig ) validateSchedulerHostAddr () error {
142
142
schedulerHostAddr := config .SchedulerHostAddress
143
143
if len (schedulerHostAddr ) == 0 {
144
- schedulerHostAddr = "localhost"
144
+ return nil
145
145
}
146
146
147
147
if indx := strings .Index (schedulerHostAddr , ":" ); indx == - 1 {
You can’t perform that action at this time.
0 commit comments