config files for mock provider (#247)

providers/mock/mock.go

@@ -1,16 +1,25 @@
 package mock
 
 import (
+	"encoding/json"
+	"fmt"
+	"io/ioutil"
 	"log"
 	"time"
 
-	"fmt"
 	"github.com/virtual-kubelet/virtual-kubelet/providers"
 	"k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
+const (
+	// Provider configuration defaults.
+	defaultCPUCapacity    = "20"
+	defaultMemoryCapacity = "100Gi"
+	defaultPodCapacity    = "20"
+)
+
 // MockProvider implements the virtual-kubelet provider interface and stores pods in memory.
 type MockProvider struct {
 	nodeName           string
@@ -18,19 +27,61 @@ type MockProvider struct {
 	internalIP         string
 	daemonEndpointPort int32
 	pods               map[string]*v1.Pod
+	config             MockConfig
+}
+
+// MockConfig contains a mock virtual-kubelet's configurable parameters.
+type MockConfig struct {
+	CPU    string `json:"cpu,omitempty"`
+	Memory string `json:"memory,omitempty"`
+	Pods   string `json:"pods,omitempty"`
 }
 
 // NewMockProvider creates a new MockProvider
-func NewMockProvider(nodeName, operatingSystem string, internalIP string, daemonEndpointPort int32) (*MockProvider, error) {
+func NewMockProvider(providerConfig, nodeName, operatingSystem string, internalIP string, daemonEndpointPort int32) (*MockProvider, error) {
+	config, err := loadConfig(providerConfig)
+	if err != nil {
+		return nil, err
+	}
+
 	provider := MockProvider{
 		nodeName:           nodeName,
 		operatingSystem:    operatingSystem,
 		internalIP:         internalIP,
 		daemonEndpointPort: daemonEndpointPort,
 		pods:               make(map[string]*v1.Pod),
+		config:             config,
+	}
+	return &provider, nil
+}
+
+// loadConfig loads the given json configuration files.
+func loadConfig(providerConfig string) (config MockConfig, err error) {
+	data, err := ioutil.ReadFile(providerConfig)
+	if err != nil {
+		return config, err
+	}
+	err = json.Unmarshal(data, &config)
+	if config.CPU == "" {
+		config.CPU = defaultCPUCapacity
+	}
+	if config.Memory == "" {
+		config.Memory = defaultMemoryCapacity
+	}
+	if config.Pods == "" {
+		config.Memory = defaultPodCapacity
 	}
 
-	return &provider, nil
+	if _, err = resource.ParseQuantity(config.CPU); err != nil {
+		return config, fmt.Errorf("Invalid CPU value %v", config.CPU)
+	}
+	if _, err = resource.ParseQuantity(config.Memory); err != nil {
+		return config, fmt.Errorf("Invalid memory value %v", config.Memory)
+	}
+	if _, err = resource.ParseQuantity(config.Pods); err != nil {
+		return config, fmt.Errorf("Invalid pods value %v", config.Pods)
+	}
+	return config, nil
 }
 
 // CreatePod accepts a Pod definition and stores it in memory.
@@ -162,11 +213,10 @@ func (p *MockProvider) GetPods() ([]*v1.Pod, error) {
 
 // Capacity returns a resource list containing the capacity limits.
 func (p *MockProvider) Capacity() v1.ResourceList {
-	// TODO: These should be configurable
 	return v1.ResourceList{
-		"cpu":    resource.MustParse("20"),
+		"cpu":    resource.MustParse(p.config.CPU),
-		"memory": resource.MustParse("100Gi"),
+		"memory": resource.MustParse(p.config.Memory),
-		"pods":   resource.MustParse("20"),
+		"pods":   resource.MustParse(p.config.Pods),
 	}
 }
 

vkubelet/vkubelet.go

@@ -113,7 +113,7 @@ func New(nodeName, operatingSystem, namespace, kubeConfig, taint, provider, prov
 			return nil, err
 		}
 	case "mock":
-		p, err = mock.NewMockProvider(nodeName, operatingSystem, internalIP, daemonEndpointPort)
+		p, err = mock.NewMockProvider(providerConfig, nodeName, operatingSystem, internalIP, daemonEndpointPort)
 		if err != nil {
 			return nil, err
 		}