File tree Expand file tree Collapse file tree 1 file changed +9
-1
lines changed
kubectl-plugin/pkg/util/generation Expand file tree Collapse file tree 1 file changed +9
-1
lines changed Original file line number Diff line number Diff line change @@ -449,12 +449,20 @@ func ParseConfigFile(filePath string) (*RayClusterConfig, error) {
449
449
if err := yaml .UnmarshalStrict (data , & overrideConfig ); err != nil {
450
450
return nil , fmt .Errorf ("failed to parse YAML: %w" , err )
451
451
}
452
+ config , err := mergeWithDefaultConfig (& overrideConfig )
453
+ if err != nil {
454
+ return nil , err
455
+ }
456
+ return config , nil
457
+ }
458
+
459
+ func mergeWithDefaultConfig (overrideConfig * RayClusterConfig ) (* RayClusterConfig , error ) {
452
460
// detach worker groups from default config
453
461
overrideConfigWG := overrideConfig .WorkerGroups
454
462
overrideConfig .WorkerGroups = nil
455
463
456
464
config := newRayClusterConfigWithDefaults ()
457
- err = mergo .Merge (config , & overrideConfig , mergo .WithOverride )
465
+ err : = mergo .Merge (config , overrideConfig , mergo .WithOverride )
458
466
if err != nil {
459
467
return nil , fmt .Errorf ("failed to merge config with defaults: %w" , err )
460
468
}
You can’t perform that action at this time.
0 commit comments