redefine labels and meta

projecteru2 · Sep 4, 2018 · 6dfcaab · 6dfcaab
1 parent 2ad7149
commit 6dfcaab
Show file tree

Hide file tree

Showing 10 changed files with 324 additions and 324 deletions.
diff --git a/cluster/calcium/create_container.go b/cluster/calcium/create_container.go
@@ -243,18 +243,17 @@ func (c *Calcium) makeContainerOptions(index int, quota types.CPUMap, opts *type
 
 	containerLogConfig := enginecontainer.LogConfig{Type: logConfig.Type, Config: logConfig.Config}
 
-	// labels
-	// basic labels, and set meta in opts to labels
+	// basic labels, bind to EruMeta
 	containerLabels := map[string]string{
 		cluster.ERUMark: "1",
-		cluster.ERUMeta: utils.EncodeMetaInLabel(&types.ContainerMeta{
+		cluster.ERUMeta: utils.EncodeMetaInLabel(&types.EruMeta{
 			Publish:     opts.Entrypoint.Publish,
 			HealthCheck: entry.HealthCheck,
 		}),
 	}
 
 	// 接下来是meta
-	for key, value := range opts.Meta {
+	for key, value := range opts.Labels {
 		containerLabels[key] = value
 	}
 

diff --git a/cluster/calcium/replace_container.go b/cluster/calcium/replace_container.go
@@ -99,7 +99,7 @@ func (c *Calcium) doReplaceContainer(
 		return nil, removeMessage, err
 	}
 
-	if !utils.FilterContainer(containerJSON.Config.Labels, opts.Labels) {
+	if !utils.FilterContainer(containerJSON.Config.Labels, opts.FilterLabels) {
 		return nil, removeMessage, types.ErrNotFitLabels
 	}
 

diff --git a/rpc/gen/core.pb.go b/rpc/gen/core.pb.go
diff --git a/rpc/gen/core.proto b/rpc/gen/core.proto
@@ -266,7 +266,7 @@ message DeployOptions {
     string user = 16;
     bool debug = 17;
     bool openStdin = 18;
-    map<string, string> meta = 19;
+    map<string, string> labels = 19;
     map<string, string> nodelabels = 20;
     string deploy_method = 21;
     map<string, bytes> data = 22;
@@ -276,7 +276,7 @@ message DeployOptions {
 message ReplaceOptions {
     DeployOptions deployOpt = 1;
     bool force = 2; 
-    map<string, string> labels = 3;
+    map<string, string> filter_labels = 3;
 }
 
 message RemoveImageOptions {

diff --git a/rpc/gen/core_pb2.py b/rpc/gen/core_pb2.py
diff --git a/rpc/rpc.go b/rpc/rpc.go
@@ -424,7 +424,7 @@ func (v *Vibranium) ReplaceContainer(opts *pb.ReplaceOptions, stream pb.CoreRPC_
 		return err
 	}
 	//这里考虑用全局 Background
-	replaceOpts := &types.ReplaceOptions{DeployOptions: *deployOpts, Force: opts.Force, Labels: opts.Labels}
+	replaceOpts := &types.ReplaceOptions{DeployOptions: *deployOpts, Force: opts.Force, FilterLabels: opts.FilterLabels}
 	ch, err := v.cluster.ReplaceContainer(context.Background(), replaceOpts)
 	if err != nil {
 		return err

diff --git a/rpc/transform.go b/rpc/transform.go
@@ -169,7 +169,7 @@ func toCoreDeployOptions(d *pb.DeployOptions) (*types.DeployOptions, error) {
 		User:         d.User,
 		Debug:        d.Debug,
 		OpenStdin:    d.OpenStdin,
-		Meta:         d.Meta,
+		Labels:       d.Labels,
 		NodeLabels:   d.Nodelabels,
 		DeployMethod: d.DeployMethod,
 		Data:         data,

diff --git a/types/container.go b/types/container.go
@@ -72,8 +72,8 @@ type DeployStatus struct {
 	ID         string
 }
 
-// ContainerMeta bind meta info store in labels
-type ContainerMeta struct {
+// EruMeta bind meta info store in labels
+type EruMeta struct {
 	Publish     []string
 	HealthCheck *HealthCheck
 }
diff --git a/types/options.go b/types/options.go
@@ -31,7 +31,7 @@ type DeployOptions struct {
 	User         string                   // User for container
 	Debug        bool                     // debug mode, use syslog as log driver
 	OpenStdin    bool                     // OpenStdin for container
-	Meta         map[string]string        // Meta for containers
+	Labels       map[string]string        // Labels for containers
 	NodeLabels   map[string]string        // NodeLabels for filter node
 	DeployMethod string                   // Deploy method
 	Data         map[string]*bytes.Buffer // For additional file data
@@ -60,6 +60,6 @@ type ListContainersOptions struct {
 // ReplaceOptions for replace container
 type ReplaceOptions struct {
 	DeployOptions
-	Force  bool
-	Labels map[string]string
+	Force        bool
+	FilterLabels map[string]string
 }
diff --git a/utils/utils.go b/utils/utils.go
@@ -216,7 +216,7 @@ func DecodePublishInfo(info map[string]string) map[string][]string {
 }
 
 // EncodeMetaInLabel encode meta to json
-func EncodeMetaInLabel(meta *types.ContainerMeta) string {
+func EncodeMetaInLabel(meta *types.EruMeta) string {
 	data, err := json.Marshal(meta)
 	if err != nil {
 		log.Errorf("[EncodeMetaInLabel] Encode meta failed %v", err)
@@ -226,8 +226,8 @@ func EncodeMetaInLabel(meta *types.ContainerMeta) string {
 }
 
 // DecodeMetaInLabel get meta from label and decode it
-func DecodeMetaInLabel(labels map[string]string) *types.ContainerMeta {
-	meta := &types.ContainerMeta{}
+func DecodeMetaInLabel(labels map[string]string) *types.EruMeta {
+	meta := &types.EruMeta{}
 	metastr, ok := labels[cluster.ERUMeta]
 	if ok {
 		if err := json.Unmarshal([]byte(metastr), meta); err != nil {