* Add Virtual Kubelet provider for VIC Initial virtual kubelet provider for VMware VIC. This provider currently handles creating and starting of a pod VM via the VIC portlayer and persona server. Image store handling via the VIC persona server. This provider currently requires the feature/wolfpack branch of VIC. * Added pod stop and delete. Also added node capacity. Added the ability to stop and delete pod VMs via VIC. Also retrieve node capacity information from the VCH. * Cleanup and readme file Some file clean up and added a Readme.md markdown file for the VIC provider. * Cleaned up errors, added function comments, moved operation code 1. Cleaned up error handling. Set standard for creating errors. 2. Added method prototype comments for all interface functions. 3. Moved PodCreator, PodStarter, PodStopper, and PodDeleter to a new folder. * Add mocking code and unit tests for podcache, podcreator, and podstarter Used the unit test framework used in VIC to handle assertions in the provider's unit test. Mocking code generated using OSS project mockery, which is compatible with the testify assertion framework. * Vendored packages for the VIC provider Requires feature/wolfpack branch of VIC and a few specific commit sha of projects used within VIC. * Implementation of POD Stopper and Deleter unit tests (#4) * Updated files for initial PR
228 lines
6.6 KiB
Go
228 lines
6.6 KiB
Go
package config
|
|
|
|
import (
|
|
"strings"
|
|
|
|
"github.com/BurntSushi/toml"
|
|
log "github.com/Sirupsen/logrus"
|
|
"github.com/docker/docker/pkg/discovery"
|
|
"github.com/docker/docker/pkg/tlsconfig"
|
|
"github.com/docker/libkv/store"
|
|
"github.com/docker/libnetwork/datastore"
|
|
"github.com/docker/libnetwork/netlabel"
|
|
)
|
|
|
|
// Config encapsulates configurations of various Libnetwork components
|
|
type Config struct {
|
|
Daemon DaemonCfg
|
|
Cluster ClusterCfg
|
|
Scopes map[string]*datastore.ScopeCfg
|
|
}
|
|
|
|
// DaemonCfg represents libnetwork core configuration
|
|
type DaemonCfg struct {
|
|
Debug bool
|
|
DataDir string
|
|
DefaultNetwork string
|
|
DefaultDriver string
|
|
Labels []string
|
|
DriverCfg map[string]interface{}
|
|
}
|
|
|
|
// ClusterCfg represents cluster configuration
|
|
type ClusterCfg struct {
|
|
Watcher discovery.Watcher
|
|
Address string
|
|
Discovery string
|
|
Heartbeat uint64
|
|
}
|
|
|
|
// LoadDefaultScopes loads default scope configs for scopes which
|
|
// doesn't have explicit user specified configs.
|
|
func (c *Config) LoadDefaultScopes(dataDir string) {
|
|
for k, v := range datastore.DefaultScopes(dataDir) {
|
|
if _, ok := c.Scopes[k]; !ok {
|
|
c.Scopes[k] = v
|
|
}
|
|
}
|
|
}
|
|
|
|
// ParseConfig parses the libnetwork configuration file
|
|
func ParseConfig(tomlCfgFile string) (*Config, error) {
|
|
cfg := &Config{
|
|
Scopes: map[string]*datastore.ScopeCfg{},
|
|
}
|
|
|
|
if _, err := toml.DecodeFile(tomlCfgFile, cfg); err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
cfg.LoadDefaultScopes(cfg.Daemon.DataDir)
|
|
return cfg, nil
|
|
}
|
|
|
|
// Option is a option setter function type used to pass varios configurations
|
|
// to the controller
|
|
type Option func(c *Config)
|
|
|
|
// OptionDefaultNetwork function returns an option setter for a default network
|
|
func OptionDefaultNetwork(dn string) Option {
|
|
return func(c *Config) {
|
|
log.Debugf("Option DefaultNetwork: %s", dn)
|
|
c.Daemon.DefaultNetwork = strings.TrimSpace(dn)
|
|
}
|
|
}
|
|
|
|
// OptionDefaultDriver function returns an option setter for default driver
|
|
func OptionDefaultDriver(dd string) Option {
|
|
return func(c *Config) {
|
|
log.Debugf("Option DefaultDriver: %s", dd)
|
|
c.Daemon.DefaultDriver = strings.TrimSpace(dd)
|
|
}
|
|
}
|
|
|
|
// OptionDriverConfig returns an option setter for driver configuration.
|
|
func OptionDriverConfig(networkType string, config map[string]interface{}) Option {
|
|
return func(c *Config) {
|
|
c.Daemon.DriverCfg[networkType] = config
|
|
}
|
|
}
|
|
|
|
// OptionLabels function returns an option setter for labels
|
|
func OptionLabels(labels []string) Option {
|
|
return func(c *Config) {
|
|
for _, label := range labels {
|
|
if strings.HasPrefix(label, netlabel.Prefix) {
|
|
c.Daemon.Labels = append(c.Daemon.Labels, label)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
// OptionKVProvider function returns an option setter for kvstore provider
|
|
func OptionKVProvider(provider string) Option {
|
|
return func(c *Config) {
|
|
log.Debugf("Option OptionKVProvider: %s", provider)
|
|
if _, ok := c.Scopes[datastore.GlobalScope]; !ok {
|
|
c.Scopes[datastore.GlobalScope] = &datastore.ScopeCfg{}
|
|
}
|
|
c.Scopes[datastore.GlobalScope].Client.Provider = strings.TrimSpace(provider)
|
|
}
|
|
}
|
|
|
|
// OptionKVProviderURL function returns an option setter for kvstore url
|
|
func OptionKVProviderURL(url string) Option {
|
|
return func(c *Config) {
|
|
log.Debugf("Option OptionKVProviderURL: %s", url)
|
|
if _, ok := c.Scopes[datastore.GlobalScope]; !ok {
|
|
c.Scopes[datastore.GlobalScope] = &datastore.ScopeCfg{}
|
|
}
|
|
c.Scopes[datastore.GlobalScope].Client.Address = strings.TrimSpace(url)
|
|
}
|
|
}
|
|
|
|
// OptionKVOpts function returns an option setter for kvstore options
|
|
func OptionKVOpts(opts map[string]string) Option {
|
|
return func(c *Config) {
|
|
if opts["kv.cacertfile"] != "" && opts["kv.certfile"] != "" && opts["kv.keyfile"] != "" {
|
|
log.Info("Option Initializing KV with TLS")
|
|
tlsConfig, err := tlsconfig.Client(tlsconfig.Options{
|
|
CAFile: opts["kv.cacertfile"],
|
|
CertFile: opts["kv.certfile"],
|
|
KeyFile: opts["kv.keyfile"],
|
|
})
|
|
if err != nil {
|
|
log.Errorf("Unable to set up TLS: %s", err)
|
|
return
|
|
}
|
|
if _, ok := c.Scopes[datastore.GlobalScope]; !ok {
|
|
c.Scopes[datastore.GlobalScope] = &datastore.ScopeCfg{}
|
|
}
|
|
if c.Scopes[datastore.GlobalScope].Client.Config == nil {
|
|
c.Scopes[datastore.GlobalScope].Client.Config = &store.Config{TLS: tlsConfig}
|
|
} else {
|
|
c.Scopes[datastore.GlobalScope].Client.Config.TLS = tlsConfig
|
|
}
|
|
// Workaround libkv/etcd bug for https
|
|
c.Scopes[datastore.GlobalScope].Client.Config.ClientTLS = &store.ClientTLSConfig{
|
|
CACertFile: opts["kv.cacertfile"],
|
|
CertFile: opts["kv.certfile"],
|
|
KeyFile: opts["kv.keyfile"],
|
|
}
|
|
} else {
|
|
log.Info("Option Initializing KV without TLS")
|
|
}
|
|
}
|
|
}
|
|
|
|
// OptionDiscoveryWatcher function returns an option setter for discovery watcher
|
|
func OptionDiscoveryWatcher(watcher discovery.Watcher) Option {
|
|
return func(c *Config) {
|
|
c.Cluster.Watcher = watcher
|
|
}
|
|
}
|
|
|
|
// OptionDiscoveryAddress function returns an option setter for self discovery address
|
|
func OptionDiscoveryAddress(address string) Option {
|
|
return func(c *Config) {
|
|
c.Cluster.Address = address
|
|
}
|
|
}
|
|
|
|
// OptionDataDir function returns an option setter for data folder
|
|
func OptionDataDir(dataDir string) Option {
|
|
return func(c *Config) {
|
|
c.Daemon.DataDir = dataDir
|
|
}
|
|
}
|
|
|
|
// ProcessOptions processes options and stores it in config
|
|
func (c *Config) ProcessOptions(options ...Option) {
|
|
for _, opt := range options {
|
|
if opt != nil {
|
|
opt(c)
|
|
}
|
|
}
|
|
}
|
|
|
|
// IsValidName validates configuration objects supported by libnetwork
|
|
func IsValidName(name string) bool {
|
|
if strings.TrimSpace(name) == "" {
|
|
return false
|
|
}
|
|
return true
|
|
}
|
|
|
|
// OptionLocalKVProvider function returns an option setter for kvstore provider
|
|
func OptionLocalKVProvider(provider string) Option {
|
|
return func(c *Config) {
|
|
log.Debugf("Option OptionLocalKVProvider: %s", provider)
|
|
if _, ok := c.Scopes[datastore.LocalScope]; !ok {
|
|
c.Scopes[datastore.LocalScope] = &datastore.ScopeCfg{}
|
|
}
|
|
c.Scopes[datastore.LocalScope].Client.Provider = strings.TrimSpace(provider)
|
|
}
|
|
}
|
|
|
|
// OptionLocalKVProviderURL function returns an option setter for kvstore url
|
|
func OptionLocalKVProviderURL(url string) Option {
|
|
return func(c *Config) {
|
|
log.Debugf("Option OptionLocalKVProviderURL: %s", url)
|
|
if _, ok := c.Scopes[datastore.LocalScope]; !ok {
|
|
c.Scopes[datastore.LocalScope] = &datastore.ScopeCfg{}
|
|
}
|
|
c.Scopes[datastore.LocalScope].Client.Address = strings.TrimSpace(url)
|
|
}
|
|
}
|
|
|
|
// OptionLocalKVProviderConfig function returns an option setter for kvstore config
|
|
func OptionLocalKVProviderConfig(config *store.Config) Option {
|
|
return func(c *Config) {
|
|
log.Debugf("Option OptionLocalKVProviderConfig: %v", config)
|
|
if _, ok := c.Scopes[datastore.LocalScope]; !ok {
|
|
c.Scopes[datastore.LocalScope] = &datastore.ScopeCfg{}
|
|
}
|
|
c.Scopes[datastore.LocalScope].Client.Config = config
|
|
}
|
|
}
|