d8dfun/virtual-kubelet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

bug-fix (#252)

Browse Source
This commit is contained in:
Liang Mingqiang
2018-07-09 14:36:32 -04:00
committed by Robbie Zhang
parent 89921a08c1
commit 32f996ab60
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
providers/mock/mock.go
View File

@@ -3,7 +3,7 @@ package mock
import ( import (
"encoding/json" "encoding/json"
"fmt" "fmt"
"io" "io"
"io/ioutil" "io/ioutil"
"log" "log"
"time" "time"
@@ -60,11 +60,16 @@ func NewMockProvider(providerConfig, nodeName, operatingSystem string, internalI
// loadConfig loads the given json configuration files. // loadConfig loads the given json configuration files.
func loadConfig(providerConfig string) (config MockConfig, err error) { func loadConfig(providerConfig string) (config MockConfig, err error) {
data, err := ioutil.ReadFile(providerConfig) if providerConfig != "" {
if err != nil { data, err := ioutil.ReadFile(providerConfig)
return config, err if err != nil {
return config, err
}
err = json.Unmarshal(data, &config)
if err != nil {
return config, err
}
} }
err = json.Unmarshal(data, &config)
if config.CPU == "" { if config.CPU == "" {
config.CPU = defaultCPUCapacity config.CPU = defaultCPUCapacity
} }
@@ -72,7 +77,7 @@ func loadConfig(providerConfig string) (config MockConfig, err error) {
config.Memory = defaultMemoryCapacity config.Memory = defaultMemoryCapacity
} }
if config.Pods == "" { if config.Pods == "" {
config.Memory = defaultPodCapacity config.Pods = defaultPodCapacity
} }
if _, err = resource.ParseQuantity(config.CPU); err != nil { if _, err = resource.ParseQuantity(config.CPU); err != nil {