fix: fix gokong dependency, issue TencentBlueKing#427

Gopkg.toml

@@ -60,6 +60,10 @@ required = [
   "github.com/containernetworking/plugins/plugins/main/ptp",
 ]
 
+[[override]]
+  name = "github.com/DeveloperJim/gokong"
+  branch = "master"
+
 [[override]]
   name = "github.com/DataDog/dd-trace-go"
   version = "1.7.0"

Makefile

@@ -37,6 +37,7 @@ EXPORTPATH=./build/api_export
 default:api dns health client storage check executor mesos-driver mesos-watch scheduler loadbalance metricservice metriccollector exporter k8s-watch kube-agent k8s-driver api-export netservice sd-prometheus process-executor process-daemon bmsf-mesos-adapter hpacontroller kube-sche consoleproxy clb-controller gw-controller logbeat-sidecar csi-cbs bcs-webhook-server k8s-statefulsetplus network detection
 specific:api dns health client storage check executor mesos-driver mesos-watch scheduler loadbalance metricservice metriccollector exporter k8s-watch kube-agent k8s-driver api-export netservice sd-prometheus process-executor process-daemon bmsf-mesos-adapter hpacontroller kube-sche consoleproxy clb-controller gw-controller logbeat-sidecar csi-cbs bcs-webhook-server k8s-statefulsetplus network detection
 k8s:api client storage k8s-watch kube-agent k8s-driver csi-cbs kube-sche k8s-statefulsetplus
+mesos:api client storage dns mesos-driver mesos-watch scheduler loadbalance netservice hpacontroller consoleproxy clb-controller
 
 allpack: svcpack k8spack mmpack mnpack
 	cd build && tar -czf bcs.${VERSION}.tgz bcs.${VERSION}
@@ -45,7 +46,7 @@ allpack: svcpack k8spack mmpack mnpack
 inner:
 	$(MAKE) specific bcs_edition=inner_edition
 ce:
-	$(MAKE) specific bcs_edition=communication_edition
+	$(MAKE) specific bcs_edition=community_edition
 ee:
 	$(MAKE) specific bcs_edition=enterprise_edition
 
@@ -261,3 +262,6 @@ bcs-webhook-server:pre
 detection:pre
 	mkdir -p ${PACKAGEPATH}/bcs-network-detection
 	go build ${LDFLAG} -o ${PACKAGEPATH}/bcs-services/bcs-network-detection/bcs-network-detection ./bcs-services/bcs-network-detection/main.go
+
+tools:
+	go build ${LDFLAG} -o ${PACKAGEPATH}/bcs-services/cryptools ./install/cryptool/main.go

bcs-common/common/conf/types.go

@@ -57,16 +57,19 @@ type ProcessConfig struct {
 // ServiceConfig Service bind
 type ServiceConfig struct {
 	Address         string `json:"address" short:"a" value:"127.0.0.1" usage:"IP address to listen on for this service" mapstructure:"address"`
+	IPv6Address     string `json:"ipv6_address" value:"" usage:"IPv6 address to listen on for this service" mapstructure:"ipv6_address"`
 	Port            uint   `json:"port" short:"p" value:"8080" usage:"Port to listen on for this service" mapstructure:"port"`
 	InsecureAddress string `json:"insecure_address" value:"" usage:"insecure IP address to listen on for this service" mapstructure:"insecure_address"`
 	InsecurePort    uint   `json:"insecure_port" value:"" usage:"insecure port to listen on for this service" mapstructure:"insecure_port"`
 	ExternalIp      string `json:"external_ip" value:"" usage:"external IP address to listen on for this service" mapstructure:"external_ip"`
+	ExternalIPv6    string `json:"external_ipv6" value:"" usage:"external IPv6 address to listen on for this service" mapstructure:"external_ipv6"`
 	ExternalPort    uint   `json:"external_port" value:"" usage:"external port to listen on for this service" mapstructure:"external_port"`
 }
 
 // LocalConfig Local info
 type LocalConfig struct {
-	LocalIP string `json:"local_ip" value:"" usage:"IP address of this host" mapstructure:"local_ip"`
+	LocalIP   string `json:"local_ip" value:"" usage:"IP address of this host" mapstructure:"local_ip"`
+	LocalIPv6 string `json:"local_ipv6" value:"" usage:"IPv6 address of this host" mapstructure:"local_ipv6"`
 }
 
 // MetricConfig Metric info
@@ -76,7 +79,8 @@ type MetricConfig struct {
 
 // ZkConfig bcs zookeeper for service discovery
 type ZkConfig struct {
-	BCSZk string `json:"bcs_zookeeper" value:"127.0.0.1:2181" usage:"Zookeeper server for registering and discovering" mapstructure:"bcs_zookeeper" `
+	BCSZk     string `json:"bcs_zookeeper" value:"127.0.0.1:2181" usage:"Zookeeper server for registering and discovering" mapstructure:"bcs_zookeeper" `
+	BCSZKIPv6 string `json:"bcs_zookeeper_ipv6" value:"" usage:"Zookeeper server ipv6 address for registering and discovering" mapstructure:"bcs_zookeeper_ipv6" `
 }
 
 // CertConfig Server and client TLS config, can not be import with ClientCertOnlyConfig or ServerCertOnlyConfig

bcs-common/common/types/serverInfo.go

@@ -48,6 +48,11 @@ const (
 	BCS_MODULE_K8SAPISERVER     = "kubernetedriver"
 	BCS_MODULE_MESOSAPISERVER   = "mesosdriver"
 	BCS_MODULE_NETWORKDETECTION = "networkdetection"
+
+	//bcs-api-gateway refactor 2020-04-10
+	BCS_MODULE_KUBEAGENT        = "kubeagent"
+	BCS_MODULE_USERMANAGER      = "usermanager"
+	BCS_MODULE_GATEWAYDISCOVERY = "gatewaydiscovery"
 )
 
 var (
@@ -80,6 +85,7 @@ var (
 		BCS_MODULE_MESOSSLAVE,
 		BCS_MODULE_IPSERVICE,
 		BCS_MODULE_MESOSADAPTER,
+		BCS_MODULE_KUBEAGENT,
 	}
 )
 
@@ -95,6 +101,7 @@ const (
 //ServerInfo base server information
 type ServerInfo struct {
 	IP           string `json:"ip"`
+	IPv6         string `json:"ipv6"`
 	Port         uint   `json:"port"`
 	MetricPort   uint   `json:"metric_port"`
 	HostName     string `json:"hostname"`
@@ -103,6 +110,7 @@ type ServerInfo struct {
 	Cluster      string `json:"cluster"`
 	Pid          int    `json:"pid"`
 	ExternalIp   string `json:"external_ip"`
+	ExternalIPv6 string `json:"external_ipv6"`
 	ExternalPort uint   `json:"external_port"`
 }