Merge pull request #20 from laincloud/deployd

remove deployd dependency

Gopkg.toml

@@ -27,7 +27,11 @@
 
 [[constraint]]
   name = "github.com/coreos/etcd"
-  version = "3.1.8"
+  version = "3.3.3"
+
+[[constraint]]
+  name = "github.com/coreos/go-semver"
+  version = "0.2.0"
 
 [[constraint]]
   branch = "master"
@@ -37,9 +41,21 @@
   name = "github.com/golang/protobuf"
   version = "1.0.0"
 
+[[constraint]]
+  branch = "master"
+  name = "github.com/mijia/adoc"
+
+[[constraint]]
+  branch = "master"
+  name = "github.com/mijia/sweb"
+
+[[constraint]]
+  branch = "master"
+  name = "golang.org/x/net"
+
 [[constraint]]
   name = "google.golang.org/grpc"
-  version = "1.10.0"
+  version = "1.11.3"
 
 [prune]
   go-tests = true

VERSION.txt

@@ -1 +1 @@
-2.3.2
+2.4.1

auth/auth.go

@@ -6,9 +6,9 @@ import (
 	"path"
 	"strings"
 
-	"github.com/laincloud/deployd/engine"
 	"github.com/laincloud/lainlet/store"
 	"github.com/laincloud/lainlet/watcher"
+	"github.com/laincloud/lainlet/spec"
 	"github.com/laincloud/lainlet/watcher/depends"
 	"github.com/mijia/sweb/log"
 	"golang.org/x/net/context"
@@ -185,7 +185,7 @@ func podgroupInvertKey(key string) string {
 func podgroupConvert(pairs []*store.KVPair) (map[string]interface{}, error) {
 	ret := make(map[string]interface{})
 	for _, kv := range pairs {
-		var pg engine.PodGroupWithSpec
+		var pg spec.PodGroupWithSpec
 		if err := json.Unmarshal(kv.Value, &pg); err != nil {
 			log.Errorf("Fail to unmarshal the dependency data: %s", string(kv.Value))
 			log.Errorf("JSON unmarshal error: %s", err.Error())

spec/spec.go

@@ -0,0 +1,143 @@
+package spec
+
+import (
+	"time"
+
+	"github.com/mijia/adoc"
+)
+
+type PodGroupWithSpec struct {
+	Spec      PodGroupSpec
+	PrevState []PodPrevState
+	PodGroup
+}
+
+type PodGroupSpec struct {
+	ImSpec
+	Pod           PodSpec
+	NumInstances  int
+	RestartPolicy RestartPolicy
+}
+
+type ImSpec struct {
+	Name      string
+	Namespace string
+	Version   int
+	CreatedAt time.Time
+	UpdatedAt time.Time
+}
+
+type PodSpec struct {
+	ImSpec
+	Network      string
+	Containers   []ContainerSpec
+	Filters      []string // for cluster scheduling
+	Labels       map[string]string
+	Dependencies []Dependency
+	Annotation   string
+	Stateful     bool
+	SetupTime    int
+	KillTimeout  int
+	PrevState    PodPrevState
+	HealthConfig HealthConfig
+}
+
+type ContainerSpec struct {
+	ImSpec
+	Image         string
+	Env           []string
+	User          string
+	WorkingDir    string
+	DnsSearch     []string
+	Volumes       []string // a stateful flag
+	SystemVolumes []string // not a stateful flag, every node has system volumes
+	CloudVolumes  []CloudVolumeSpec
+	Command       []string
+	Entrypoint    []string
+	CpuLimit      int
+	MemoryLimit   int64
+	Expose        int
+	LogConfig     adoc.LogConfig
+}
+
+type CloudVolumeSpec struct {
+	Type string
+	Dirs []string
+}
+
+type Dependency struct {
+	PodName string
+	Policy  DependencyPolicy
+}
+
+type DependencyPolicy int
+
+type HealthConfig struct {
+	Cmd     string           `json:"cmd"`
+	Options HealthCnfOptions `json:"options"`
+}
+
+type HealthCnfOptions struct {
+	Interval int `json:"interval"`
+	Timeout  int `json:"timeout"`
+	Retries  int `json:"retries"`
+}
+
+type RestartPolicy int
+
+type PodPrevState struct {
+	NodeName string
+	IPs      []string
+}
+
+type PodGroup struct {
+	Pods []Pod
+	BaseRuntime
+}
+
+type Pod struct {
+	InstanceNo int
+	Containers []Container
+	ImRuntime
+}
+
+type Container struct {
+	// FIXME(mijia): multiple ports supporing, will have multiple entries of <NodePort, ContainerPort, Protocol>
+	Id            string
+	Runtime       adoc.ContainerDetail
+	NodeName      string
+	NodeIp        string
+	ContainerIp   string
+	NodePort      int
+	ContainerPort int
+	Protocol      string
+}
+
+type ImRuntime struct {
+	BaseRuntime
+	TargetState  ExpectState
+	DriftCount   int
+	RestartCount int
+	RestartAt    time.Time
+}
+
+type BaseRuntime struct {
+	Healthst  HealthState
+	State     RunState
+	OOMkilled bool
+	LastError string
+	UpdatedAt time.Time
+}
+
+type HealthState int
+
+type RunState int
+
+type ExpectState int
+
+type SharedPodWithSpec struct {
+	RefCount   int
+	VerifyTime time.Time
+	Spec       PodSpec
+	Pod        Pod
+}

watcher/container/container.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/laincloud/deployd/engine"
+	"github.com/laincloud/lainlet/spec"
 	"github.com/laincloud/lainlet/store"
 	"github.com/laincloud/lainlet/watcher"
 	"github.com/mijia/sweb/log"
@@ -18,7 +18,7 @@ const (
 )
 
 // PodGroup is actually from the deployd engine, it actually engine.PodGroupWithSpec
-type PodGroup engine.PodGroupWithSpec
+type PodGroup spec.PodGroupWithSpec
 
 // Info represents the container info, the data type returned by this container watcher
 type Info struct {
@@ -40,7 +40,7 @@ type ContainerWatcher struct {
 // New create a new watcher which used to watch container info
 func New(s store.Store, ctx context.Context) (watcher.Watcher, error) {
 	ret := &ContainerWatcher{
-		invertsTable:make(map[string]string),
+		invertsTable: make(map[string]string),
 	}
 	base, err := watcher.New(s, ctx, KEY, ret.convert, ret.invertKey)
 	if err != nil {

watcher/depends/depends.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"path"
 
-	"github.com/laincloud/deployd/engine"
+	"github.com/laincloud/lainlet/spec"
 	"github.com/laincloud/lainlet/store"
 	"github.com/laincloud/lainlet/watcher"
 	"github.com/mijia/sweb/log"
@@ -18,7 +18,7 @@ const (
 )
 
 // Depends represents the data type returned by this watcher. in fact, it's a type to represents map[nodename]map[appname]SharedPodWithSpec
-type Depends map[string]map[string]engine.SharedPodWithSpec
+type Depends map[string]map[string]spec.SharedPodWithSpec
 
 // New create a new watcher which used to watch depends data
 func New(s store.Store, ctx context.Context) (watcher.Watcher, error) {

watcher/podgroup/podgroup.go

@@ -3,11 +3,12 @@ package podgroup
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/mijia/sweb/log"
-	"golang.org/x/net/context"
-	"github.com/laincloud/deployd/engine"
+
+	"github.com/laincloud/lainlet/spec"
 	"github.com/laincloud/lainlet/store"
 	"github.com/laincloud/lainlet/watcher"
+	"github.com/mijia/sweb/log"
+	"golang.org/x/net/context"
 	"path"
 )
 
@@ -17,7 +18,7 @@ const (
 )
 
 // PodGroup represents the data type stored in backend for each pod. watcher will return data whose type is map[string]PodGroup.
-type PodGroup engine.PodGroupWithSpec
+type PodGroup spec.PodGroupWithSpec
 
 // New create a new watcher which used to watch podgroup data
 func New(s store.Store, ctx context.Context) (watcher.Watcher, error) {