Merge branch 'clean_agent' into 'master'

remove agent macvlan support

See merge request !124

cluster/calcium/build_image.go

@@ -8,7 +8,6 @@ import (
 	"os"
 	"path/filepath"
 	"strings"
-	"text/template"
 
 	log "github.com/Sirupsen/logrus"
 	enginetypes "github.com/docker/docker/api/types"
@@ -19,28 +18,6 @@ import (
 	"gopkg.in/yaml.v2"
 )
 
-const launcherScript = `#! /bin/sh
-echo 32768 > /writable-proc/sys/net/core/somaxconn
-echo 1 > /writable-proc/sys/vm/overcommit_memory
-chmod 777 /dev/stdout
-chmod 777 /dev/stderr
-
-neednetwork=$1
-if [ $neednetwork = "network" ]; then
-    # wait for macvlan
-    while ( ! ip addr show | grep 'UP' | grep 'vnbe'); do
-        echo -n o
-        sleep .5
-    done
-fi
-
-sleep 1
-
-shift
-
-{{.Command}}
-`
-
 const dockerFile = `ARG Base
 FROM ${Base}
 ARG Appdir
@@ -53,8 +30,6 @@ ENV Appname ${Appname}
 ENV Appdir ${Appdir}
 ENV ERU 1
 ADD ${Reponame} ${Appdir}/${Appname}
-ADD launcher /usr/local/bin/launcher
-ADD launcheroot /usr/local/bin/launcheroot
 WORKDIR ${Appdir}/${Appname}
 RUN useradd -u ${UID} -d /nonexistent -s /sbin/nologin -U ${Appname}
 RUN chown -R ${UID} ${Appdir}/${Appname}
@@ -106,8 +81,6 @@ func getRandomNode(c *calcium, podname string) (*types.Node, error) {
 //
 //    buildDir ├─ :appname ├─ code
 //             ├─ Dockerfile
-//             ├─ launcher
-//             ├─ launcheroot
 func (c *calcium) BuildImage(repository, version, uid, artifact string) (chan *types.BuildImageMessage, error) {
 	ch := make(chan *types.BuildImageMessage)
 
@@ -169,11 +142,8 @@ func (c *calcium) BuildImage(repository, version, uid, artifact string) (chan *t
 		}
 	}
 
-	// create launcher scripts and dockerfile
+	// create dockerfile
 	rs := richSpecs{specs, "", strings.TrimRight(c.config.AppDir, "/"), uid}
-	if err := createLauncher(buildDir, rs); err != nil {
-		return ch, err
-	}
 	if err := createDockerfile(buildDir); err != nil {
 		return ch, err
 	}
@@ -277,44 +247,6 @@ func createTarStream(path string) (io.ReadCloser, error) {
 	return archive.TarWithOptions(path, tarOpts)
 }
 
-// launcher scripts
-func createLauncher(buildDir string, rs richSpecs) error {
-	launcherScriptTemplate, _ := template.New("launcher script").Parse(launcherScript)
-
-	entryCommand := fmt.Sprintf("exec sudo -E -u %s $@", rs.Appname)
-	entryRootCommand := "exec $@"
-
-	f, err := os.Create(filepath.Join(buildDir, "launcher"))
-	if err != nil {
-		return err
-	}
-	defer f.Close()
-	rs.Command = entryCommand
-	launcherScriptTemplate.Execute(f, rs)
-	if err := f.Sync(); err != nil {
-		return err
-	}
-	if err := f.Chmod(0755); err != nil {
-		return err
-	}
-
-	fr, err := os.Create(filepath.Join(buildDir, "launcheroot"))
-	if err != nil {
-		return err
-	}
-	defer fr.Close()
-	rs.Command = entryRootCommand
-	launcherScriptTemplate.Execute(fr, rs)
-	if err := fr.Sync(); err != nil {
-		return err
-	}
-	if err := fr.Chmod(0755); err != nil {
-		return err
-	}
-
-	return nil
-}
-
 // Dockerfile
 func createDockerfile(buildDir string) error {
 	f, err := os.Create(filepath.Join(buildDir, "Dockerfile"))

cluster/calcium/create_container.go

@@ -388,21 +388,6 @@ func (c *calcium) makeContainerOptions(index int, quota map[string]int, specs ty
 	}
 	// command and user
 	slices := utils.MakeCommandLineArgs(entry.Command + " " + opts.ExtraArgs)
-
-	// if not use raw to deploy, or use agent as network manager
-	// we need to use our own script to start command
-	if !opts.Raw && c.network.Type() == "agent" {
-		starter, needNetwork := "launcher", "network"
-		if entry.Privileged != "" {
-			starter = "launcheroot"
-		}
-		if len(opts.Networks) == 0 {
-			needNetwork = "nonetwork"
-		}
-		slices = append([]string{fmt.Sprintf("/usr/local/bin/%s", starter), needNetwork}, slices...)
-		// use default empty value, as root
-		user = "root"
-	}
 	cmd := engineslice.StrSlice(slices)
 
 	// calculate CPUShares and CPUSet

core.yaml.sample

@@ -1,5 +1,4 @@
 bind: ":5001"
-agent_port: "12345"
 appdir: "/home"
 permdir: "/mnt/mfs/permdirs"
 backupdir: "/mnt/mfs/backupdirs"

network/calico/plugin.go

@@ -16,7 +16,6 @@ type titanium struct{}
 
 // type of the network manager
 // if set to "plugin", then it will act like a plugin
-// if set to "agent", then it will act like an agent
 // main difference is the order of connect/disconnect
 func (t *titanium) Type() string {
 	return "plugin"

rpc/rpc_test.go

@@ -188,7 +188,6 @@ func initConfig(mStore *mockstore.MockStore) (types.Config, *vibranium) {
 
 	config := types.Config{
 		Bind:              ":5001",           // HTTP API address
-		AgentPort:         ":12345",          // Agent HTTP port, may not be used
 		AppDir:            "/tmp",            // App directory inside container
 		PermDir:           "/tmp",            // Permanent dir on host
 		BackupDir:         "/tmp",            // Backup dir on host

types/config.go

@@ -3,7 +3,6 @@ package types
 // Config holds eru-core config
 type Config struct {
 	Bind              string   `yaml:"bind"`                 // HTTP API address
-	AgentPort         string   `yaml:"agent_port"`           // Agent HTTP port, may not be used
 	AppDir            string   `yaml:"appdir"`               // App directory inside container
 	PermDir           string   `yaml:"permdir"`              // Permanent dir on host
 	BackupDir         string   `yaml:"backupdir"`            // Backup dir on host

types/options.go

@@ -15,7 +15,7 @@ type DeployOptions struct {
 	Memory     int64             // Memory for container, in bytes
 	Env        []string          // Env for container
 	Networks   map[string]string // Network names and specified IPs
-	Raw        bool              // If use raw, launcher won't be used
+	Raw        bool              // Raw mode, use docker image online
 	Debug      bool              // debug mode, use syslog as log driver
 	OpenStdin  bool              // OpenStdin for container
 }