bcs-cluster-manager支持腾讯公有云CA (TencentBlueKing#1850)

* feature: bcs-cluster-manager支持腾讯公有云CA
testwill · Jun 2, 2022 · 42fa975 · 42fa975
1 parent 3099c9c
commit 42fa975
Show file tree

Hide file tree

Showing 82 changed files with 22,466 additions and 7,209 deletions.
diff --git a/bcs-common/common/metric/api.go b/bcs-common/common/metric/api.go
@@ -13,6 +13,7 @@
 
 package metric
 
+// NewMetricController metric controller
 func NewMetricController(conf Config, healthFunc HealthFunc, metrics ...*MetricContructor) error {
 	return newMetricHandler(conf, healthFunc, metrics...)
 }
@@ -30,6 +31,7 @@ const (
 	UnknownRole        RoleType    = "unknown"
 )
 
+// Config xxx
 type Config struct {
 	// name of your module
 	ModuleName string
@@ -54,8 +56,10 @@ type Config struct {
 	SvrKeyPwd   string
 }
 
+// HealthFunc xxx
 type HealthFunc func() HealthMeta
 
+// HealthMeta xxx
 type HealthMeta struct {
 	// the running role of your module when you are running with Master_Slave_Mode.
 	// must be not empty. if you set with an empty value, an error will be occurred.
@@ -68,6 +72,7 @@ type HealthMeta struct {
 	Message string `json:"message"`
 }
 
+// MetricMeta xxx
 type MetricMeta struct {
 	// metric's name
 	Name string
@@ -77,13 +82,19 @@ type MetricMeta struct {
 	ConstLables map[string]string
 }
 
+// GetMetaFunc xxx
 type GetMetaFunc func() *MetricMeta
+
+// GetResultFunc xxx
 type GetResultFunc func() (*MetricResult, error)
+
+// MetricContructor xxx
 type MetricContructor struct {
 	GetMeta   GetMetaFunc
 	GetResult GetResultFunc
 }
 
+// MetricResult xxx
 type MetricResult struct {
 	Value *FloatOrString
 	// variable labels means that this labels value can be changed with each call.

diff --git a/bcs-common/common/metric/fake/main.go b/bcs-common/common/metric/fake/main.go
@@ -69,8 +69,10 @@ func main() {
 	select {}
 }
 
+// DemoMetric xxx
 type DemoMetric struct{}
 
+// GetNumericMeta xxx
 func (DemoMetric) GetNumericMeta() *metric.MetricMeta {
 	return &metric.MetricMeta{
 		Name: "timenow_seconds",
@@ -81,6 +83,7 @@ func (DemoMetric) GetNumericMeta() *metric.MetricMeta {
 	}
 }
 
+// GetNumericResult xxx
 func (DemoMetric) GetNumericResult() (*metric.MetricResult, error) {
 	v, err := metric.FormFloatOrString(time.Now().Unix())
 	if err != nil {
@@ -94,6 +97,7 @@ func (DemoMetric) GetNumericResult() (*metric.MetricResult, error) {
 	}, nil
 }
 
+// GetStringMeta xxx
 func (DemoMetric) GetStringMeta() *metric.MetricMeta {
 	return &metric.MetricMeta{
 		Name: "birthday_string",
@@ -104,6 +108,7 @@ func (DemoMetric) GetStringMeta() *metric.MetricMeta {
 	}
 }
 
+// GetStringResult xxx
 func (DemoMetric) GetStringResult() (*metric.MetricResult, error) {
 	v, err := metric.FormFloatOrString(time.Now().String())
 	if err != nil {

diff --git a/bcs-common/common/metric/floatOrStr.go b/bcs-common/common/metric/floatOrStr.go
@@ -20,6 +20,7 @@ import (
 	"strconv"
 )
 
+// FormFloatOrString xxx
 func FormFloatOrString(val interface{}) (*FloatOrString, error) {
 	valueof := reflect.ValueOf(val)
 	switch valueof.Kind() {
@@ -38,19 +39,22 @@ func FormFloatOrString(val interface{}) (*FloatOrString, error) {
 	}
 }
 
+// ValueType xxx
 type ValueType string
 
 const (
 	Float  ValueType = "Float"
 	String ValueType = "String"
 )
 
+// FloatOrString xxx
 type FloatOrString struct {
 	Type   ValueType
 	Float  float64
 	String string
 }
 
+// MarshalJSON marshalJson
 func (fs FloatOrString) MarshalJSON() ([]byte, error) {
 	switch fs.Type {
 	case Float:
@@ -62,6 +66,7 @@ func (fs FloatOrString) MarshalJSON() ([]byte, error) {
 	}
 }
 
+// UnmarshalJSON unmarshalJSON
 func (fs *FloatOrString) UnmarshalJSON(b []byte) error {
 	f, err := strconv.ParseFloat(string(b), 10)
 	if nil == err {

diff --git a/bcs-common/common/metric/metric.go b/bcs-common/common/metric/metric.go
@@ -50,6 +50,7 @@ type MetricController struct {
 	Metrics []*MetricContructor
 }
 
+// Describe xxx
 func (m MetricController) Describe(ch chan<- *prometheus.Desc) {
 	for _, metric := range m.Metrics {
 		blog.V(5).Infof("describe metric name- > %s\n", metric.GetMeta().Name)
@@ -61,6 +62,7 @@ func (m MetricController) Describe(ch chan<- *prometheus.Desc) {
 	newRuntimeMetric(m.Meta).Describe(ch)
 }
 
+// Collect xxx
 func (m MetricController) Collect(ch chan<- prometheus.Metric) {
 	for _, metric := range m.Metrics {
 		blog.V(5).Infof("collect metric - > %s\n", metric.GetMeta().Name)

diff --git a/bcs-common/common/metric/type.go b/bcs-common/common/metric/type.go
@@ -18,6 +18,7 @@ import (
 	"fmt"
 )
 
+// MetaData struct
 type MetaData struct {
 	Module     string            `json:"module"`
 	IP         string            `json:"ip"`
@@ -26,6 +27,7 @@ type MetaData struct {
 	Labels     map[string]string `json:"label"`
 }
 
+// Valid xxx
 func (m MetaData) Valid() error {
 	var errs []error
 	if len(m.Module) == 0 {
@@ -47,6 +49,7 @@ func (m MetaData) Valid() error {
 	return nil
 }
 
+// HealthInfo health info
 type HealthInfo struct {
 	RunMode    RunModeType `json:"runMode"`
 	Module     string      `json:"module"`

diff --git a/bcs-services/bcs-cluster-manager/api/clustermanager/Makefile b/bcs-services/bcs-cluster-manager/api/clustermanager/Makefile
@@ -18,7 +18,7 @@ $(SWAGGEROBJ):$(PROTO)
 
 %.pb.go: %.proto
 	protoc -I../../third_party --proto_path=. --go_out=plugins=grpc:. --validate_out=lang=go:. $<
-	sed -i '' 's/json:"-"/json:"-" bson:"-"/g' clustermanager.pb.go
+	sed -i "" 's/json:"-"/json:"-" bson:"-"/g' clustermanager.pb.go
 
 %.pb.gw.go: %.proto
 	protoc -I../../third_party --proto_path=. --micro_out=. \