Merge pull request #3 from Tencent/1.19.x

1.19.x

Makefile

@@ -92,17 +92,13 @@ client:pre
 	cp -R ./install/conf/bcs-services/bcs-client ${PACKAGEPATH}/bcs-services
 	go build ${LDFLAG} -o ${PACKAGEPATH}/bcs-services/bcs-client/bcs-client ./bcs-services/bcs-client/cmd/main.go
 
-dns:pre
+dns:
 	mkdir -p ${PACKAGEPATH}/bcs-services
 	mkdir -p ${PACKAGEPATH}/bcs-mesos-master
 	cp -R ./install/conf/bcs-mesos-master/bcs-dns ${PACKAGEPATH}/bcs-mesos-master
 	cp -R ./install/conf/bcs-services/bcs-dns-service ${PACKAGEPATH}/bcs-services
-	mkdir -p vendor/github.com/coredns/coredns/
-	cp -r ${GOPATH}/pkg/mod/github.com/coredns/coredns\@v1.3.0/* vendor/github.com/coredns/coredns/
-	cp bcs-services/bcs-dns/plugin.cfg vendor/github.com/coredns/coredns/
-	cd vendor/github.com/coredns/coredns && make gen && cd -
-	go build ${LDFLAG} -o ${PACKAGEPATH}/bcs-services/bcs-dns-service/bcs-dns-service bk-bcs/vendor/github.com/coredns/coredns
-	go build ${LDFLAG} -o ${PACKAGEPATH}/bcs-mesos-master/bcs-dns/bcs-dns bk-bcs/vendor/github.com/coredns/coredns
+	cd ../coredns && go build ${LDFLAG} -o ${WORKSPACE}/${PACKAGEPATH}/bcs-services/bcs-dns-service/bcs-dns-service coredns.go
+	cd ../coredns && go build ${LDFLAG} -o ${WORKSPACE}/${PACKAGEPATH}/bcs-mesos-master/bcs-dns/bcs-dns coredns.go
 
 health:pre
 	mkdir -p ${PACKAGEPATH}/bcs-services

bcs-common/common/RegisterDiscover/zkregdiscv.go

@@ -175,34 +175,15 @@ func (zkRD *ZkRegDiscv) loopDiscover(path string, discvCtx context.Context, env
 
 // DiscoverNodes discover by specified path
 func (zkRD *ZkRegDiscv) DiscoverNodes(path string) (*DiscoverEvent, error) {
-	discvEnv := &DiscoverEvent{
-		Err: nil,
-		Key: path,
-	}
-
 	servNodes, _, err := zkRD.zkcli.WatchChildren(path)
 	if err != nil {
-		discvEnv.Err = err
-		return discvEnv, nil
-	}
-
-	discvEnv.Nodes = append(discvEnv.Nodes, servNodes...)
-	//sort server node
-	servNodes = zkRD.sortNode(servNodes)
-
-	//get server info
-	for _, node := range servNodes {
-		servPath := path + "/" + node
-		servInfo, err := zkRD.zkcli.Get(servPath)
-		if err != nil {
-			blog.V(3).Infof("fail to get server info from zookeeper by path(%s), err:%s", servPath, err.Error())
-			continue
-		}
-
-		discvEnv.Server = append(discvEnv.Server, servInfo)
+		return &DiscoverEvent{
+			Err: err,
+			Key: path,
+		}, nil
 	}
 
-	return discvEnv, nil
+	return zkRD.discoverNodes(path, servNodes)
 }
 
 func (zkRD *ZkRegDiscv) sortNode(nodes []string) []string {
@@ -236,21 +217,25 @@ func (zkRD *ZkRegDiscv) sortNode(nodes []string) []string {
 
 // DiscoverNodes discover by specified path
 func (zkRD *ZkRegDiscv) DiscoverNodesV2(path string) (*DiscoverEvent, error) {
-	discvEnv := &DiscoverEvent{
-		Err: nil,
-		Key: path,
-	}
-
 	servNodes, _, err := zkRD.zkcli.GetChildrenEx(path)
 	if err != nil {
-		discvEnv.Err = err
-		return discvEnv, nil
+		return &DiscoverEvent{
+			Err: err,
+			Key: path,
+		}, nil
 	}
 
+	return zkRD.discoverNodes(path, servNodes)
+}
+
+func (zkRD *ZkRegDiscv) discoverNodes(path string, servNodes []string) (*DiscoverEvent, error) {
+	discvEnv := &DiscoverEvent{
+		Err: nil,
+		Key: path,
+	}
 	discvEnv.Nodes = append(discvEnv.Nodes, servNodes...)
 	//sort server node
 	servNodes = zkRD.sortNode(servNodes)
-
 	//get server info
 	for _, node := range servNodes {
 		servPath := path + "/" + node

bcs-common/common/types/rc.go

@@ -15,8 +15,23 @@ package types
 
 //EnvVar represents an environment variable present in a Container
 type EnvVar struct {
-	Name  string `json:"name"`
-	Value string `json:"value,omitempty"`
+	Name      string        `json:"name"`
+	Value     string        `json:"value,omitempty"`
+	ValueFrom *EnvVarSource `json:"valueFrom,omitempty"`
+}
+
+// EnvVarSource represents a source for the value of an EnvVar.
+type EnvVarSource struct {
+	// Selects a resource of the container: only resources limits and requests
+	// (limits.cpu, limits.memory, limits.ephemeral-storage, requests.cpu, requests.memory and requests.ephemeral-storage) are currently supported.
+	// +optional
+	ResourceFieldRef *ResourceFieldSelector `json:"resourceFieldRef,omitempty" protobuf:"bytes,2,opt,name=resourceFieldRef"`
+}
+
+// ResourceFieldSelector represents container resources (cpu, memory) and their output format
+type ResourceFieldSelector struct {
+	// Required: resource to select
+	Resource string `json:"resource" protobuf:"bytes,2,opt,name=resource"`
 }
 
 //ContainerPort represents a network port in a single container