diff --git a/cmd/cloudinit/cloudinit_test.go b/cmd/cloudinit/cloudinit_test.go index 3b5dfeed..fce2384e 100644 --- a/cmd/cloudinit/cloudinit_test.go +++ b/cmd/cloudinit/cloudinit_test.go @@ -69,8 +69,8 @@ func TestSubstituteUserDataVars(t *testing.T) { interfaces: eth1: address: $private_ipv4/16 - user_docker: - tls_args: ['-H=$public_ipv4:2376']`, + docker: + tls_args: ['-H=$public_ipv4:2376']`, `write_files: - path: /etc/environment content: | @@ -81,8 +81,8 @@ func TestSubstituteUserDataVars(t *testing.T) { interfaces: eth1: address: 192.0.2.203/16 - user_docker: - tls_args: ['-H=192.0.2.3:2376']`, + docker: + tls_args: ['-H=192.0.2.3:2376']`, }, { // no metadata diff --git a/cmd/control/tlsconf.go b/cmd/control/tlsconf.go index 7842c431..3a48fb61 100644 --- a/cmd/control/tlsconf.go +++ b/cmd/control/tlsconf.go @@ -49,7 +49,7 @@ func writeCerts(generateServer bool, hostname []string, cfg *config.CloudConfig, return machineUtil.GenerateCert([]string{""}, certPath, keyPath, caCertPath, caKeyPath, NAME, BITS) } - if cfg.Rancher.UserDocker.ServerKey == "" || cfg.Rancher.UserDocker.ServerCert == "" { + if cfg.Rancher.Docker.ServerKey == "" || cfg.Rancher.Docker.ServerCert == "" { err := machineUtil.GenerateCert(hostname, certPath, keyPath, caCertPath, caKeyPath, NAME, BITS) if err != nil { return err @@ -67,9 +67,9 @@ func writeCerts(generateServer bool, hostname []string, cfg *config.CloudConfig, return cfg.SetConfig(&config.CloudConfig{ Rancher: config.RancherConfig{ - UserDocker: config.DockerConfig{ - CAKey: cfg.Rancher.UserDocker.CAKey, - CACert: cfg.Rancher.UserDocker.CACert, + Docker: config.DockerConfig{ + CAKey: cfg.Rancher.Docker.CAKey, + CACert: cfg.Rancher.Docker.CACert, ServerCert: string(cert), ServerKey: string(key), }, @@ -77,16 +77,16 @@ func writeCerts(generateServer bool, hostname []string, cfg *config.CloudConfig, }) } - if err := ioutil.WriteFile(certPath, []byte(cfg.Rancher.UserDocker.ServerCert), 0400); err != nil { + if err := ioutil.WriteFile(certPath, []byte(cfg.Rancher.Docker.ServerCert), 0400); err != nil { return err } - return ioutil.WriteFile(keyPath, []byte(cfg.Rancher.UserDocker.ServerKey), 0400) + return ioutil.WriteFile(keyPath, []byte(cfg.Rancher.Docker.ServerKey), 0400) } func writeCaCerts(cfg *config.CloudConfig, caCertPath, caKeyPath string) error { - if cfg.Rancher.UserDocker.CACert == "" { + if cfg.Rancher.Docker.CACert == "" { if err := machineUtil.GenerateCACertificate(caCertPath, caKeyPath, NAME, BITS); err != nil { return err } @@ -103,7 +103,7 @@ func writeCaCerts(cfg *config.CloudConfig, caCertPath, caKeyPath string) error { err = cfg.SetConfig(&config.CloudConfig{ Rancher: config.RancherConfig{ - UserDocker: config.DockerConfig{ + Docker: config.DockerConfig{ CAKey: string(caKey), CACert: string(caCert), }, @@ -116,11 +116,11 @@ func writeCaCerts(cfg *config.CloudConfig, caCertPath, caKeyPath string) error { return nil } - if err := ioutil.WriteFile(caCertPath, []byte(cfg.Rancher.UserDocker.CACert), 0400); err != nil { + if err := ioutil.WriteFile(caCertPath, []byte(cfg.Rancher.Docker.CACert), 0400); err != nil { return err } - return ioutil.WriteFile(caKeyPath, []byte(cfg.Rancher.UserDocker.CAKey), 0400) + return ioutil.WriteFile(caKeyPath, []byte(cfg.Rancher.Docker.CAKey), 0400) } func tlsConfCreate(c *cli.Context) { diff --git a/cmd/userdocker/main.go b/cmd/userdocker/main.go index bcc75e55..d09f398b 100644 --- a/cmd/userdocker/main.go +++ b/cmd/userdocker/main.go @@ -46,7 +46,7 @@ func Main() { } func enter(cfg *config.CloudConfig) error { - context := cfg.Rancher.UserDocker.StorageContext + context := cfg.Rancher.Docker.StorageContext if context == "" { context = DEFAULT_STORAGE_CONTEXT } @@ -211,7 +211,7 @@ func main(cfg *config.CloudConfig) error { return err } - dockerCfg := cfg.Rancher.UserDocker + dockerCfg := cfg.Rancher.Docker args := dockerCfg.FullArgs() diff --git a/config/config.go b/config/config.go index 2867d385..1c43b6e1 100644 --- a/config/config.go +++ b/config/config.go @@ -55,8 +55,8 @@ func LoadConfig() (*CloudConfig, error) { if cfg.Rancher.Debug { log.SetLevel(log.DebugLevel) - if !util.Contains(cfg.Rancher.UserDocker.Args, "-D") { - cfg.Rancher.UserDocker.Args = append(cfg.Rancher.UserDocker.Args, "-D") + if !util.Contains(cfg.Rancher.Docker.Args, "-D") { + cfg.Rancher.Docker.Args = append(cfg.Rancher.Docker.Args, "-D") } if !util.Contains(cfg.Rancher.SystemDocker.Args, "-D") { cfg.Rancher.SystemDocker.Args = append(cfg.Rancher.SystemDocker.Args, "-D") diff --git a/config/config_test.go b/config/config_test.go index d382249e..8ef7b0dd 100644 --- a/config/config_test.go +++ b/config/config_test.go @@ -22,7 +22,7 @@ func TestFilterKey(t *testing.T) { "dsa-pub": "dsa-test2", }, }, - "user_docker": map[interface{}]interface{}{ + "docker": map[interface{}]interface{}{ "ca_key": "ca_key-test3", "ca_cert": "ca_cert-test4", "args": []string{"args_test5"}, @@ -43,7 +43,7 @@ func TestFilterKey(t *testing.T) { "ssh_authorized_keys": []string{"pubk1", "pubk2"}, "hostname": "ros-test", "rancher": map[interface{}]interface{}{ - "user_docker": map[interface{}]interface{}{ + "docker": map[interface{}]interface{}{ "ca_key": "ca_key-test3", "ca_cert": "ca_cert-test4", "args": []string{"args_test5"}, @@ -68,7 +68,7 @@ func TestFilterDottedKeys(t *testing.T) { "dsa-pub": "dsa-test2", }, }, - "user_docker": map[interface{}]interface{}{ + "docker": map[interface{}]interface{}{ "ca_key": "ca_key-test3", "ca_cert": "ca_cert-test4", "args": []string{"args_test5"}, @@ -89,7 +89,7 @@ func TestFilterDottedKeys(t *testing.T) { expectedRest := map[interface{}]interface{}{ "hostname": "ros-test", "rancher": map[interface{}]interface{}{ - "user_docker": map[interface{}]interface{}{ + "docker": map[interface{}]interface{}{ "ca_key": "ca_key-test3", "ca_cert": "ca_cert-test4", "args": []string{"args_test5"}, @@ -254,7 +254,7 @@ func TestUserDocker(t *testing.T) { config := &CloudConfig{ Rancher: RancherConfig{ - UserDocker: DockerConfig{ + Docker: DockerConfig{ TLS: true, }, }, @@ -272,7 +272,7 @@ func TestUserDocker(t *testing.T) { fmt.Println(data) - val, ok := data["rancher"]["user_docker"] + val, ok := data["rancher"]["docker"] assert.True(ok) m, ok := val.(map[interface{}]interface{}) diff --git a/config/disk.go b/config/disk.go index d6eeb24c..589494ba 100644 --- a/config/disk.go +++ b/config/disk.go @@ -20,10 +20,10 @@ func writeToFile(data interface{}, filename string) error { func saveToDisk(data map[interface{}]interface{}) error { private, config := filterDottedKeys(data, []string{ "rancher.ssh", - "rancher.user_docker.ca_key", - "rancher.user_docker.ca_cert", - "rancher.user_docker.server_key", - "rancher.user_docker.server_cert", + "rancher.docker.ca_key", + "rancher.docker.ca_cert", + "rancher.docker.server_key", + "rancher.docker.server_cert", }) err := writeToFile(config, LocalConfigFile) diff --git a/config/types.go b/config/types.go index 4435ba35..3f0cc915 100644 --- a/config/types.go +++ b/config/types.go @@ -81,7 +81,7 @@ type RancherConfig struct { State StateConfig `yaml:"state,omitempty"` SystemDocker DockerConfig `yaml:"system_docker,omitempty"` Upgrade UpgradeConfig `yaml:"upgrade,omitempty"` - UserDocker DockerConfig `yaml:"user_docker,omitempty"` + Docker DockerConfig `yaml:"docker,omitempty"` } type UpgradeConfig struct { diff --git a/os-config.yml b/os-config.yml index f4f407bd..4d21900d 100644 --- a/os-config.yml +++ b/os-config.yml @@ -298,7 +298,7 @@ rancher: upgrade: url: https://releases.rancher.com/os/releases.yml image: rancher/os - user_docker: + docker: tls_args: [--tlsverify, --tlscacert=ca.pem, --tlscert=server-cert.pem, --tlskey=server-key.pem, '-H=0.0.0.0:2376'] args: [daemon, --log-opt, max-size=25m, --log-opt, max-file=2, -s, overlay, -G, docker, -H, 'unix:///var/run/docker.sock', --userland-proxy=false]