Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: bcs-helm-manager添加泳道特性 #3669

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat: bcs-helm-manager添加泳道特性 #3669

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bcs-services/bcs-helm-manager/cmd/bcs-helm-manager-migrator/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -420,7 +420,7 @@ func (r *release) toEntity() (*entity.Release, error) {

// get project code from project
func (r *release) getProjectCode() string {
p, err := project.GetProjectByCode(r.ProjectID)
p, err := project.GetProjectByCode(context.Background(), r.ProjectID)
if err != nil {
blog.Errorf("get project for %s error, %s", r.ProjectID, err.Error())
return ""
Expand Down
1 change: 1 addition & 0 deletions bcs-services/bcs-helm-manager/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ module github.com/Tencent/bk-bcs/bcs-services/bcs-helm-manager
go 1.20

replace (
github.com/Tencent/bk-bcs/bcs-common => github.com/LidolLxf/bk-bcs/bcs-common v0.0.0-20250114031541-4ba4876e5f78
// github.com/databus23/helm-diff/v3 limit by go 1.20
github.com/databus23/helm-diff/v3 => github.com/databus23/helm-diff/v3 v3.8.1
helm.sh/helm/v3 => github.com/adevjoe/helm/v3 v3.12.1-tx.5
Expand Down
2 changes: 1 addition & 1 deletion bcs-services/bcs-helm-manager/internal/actions/release/installv1.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ func (i *InstallReleaseV1Action) install() error {
return fmt.Errorf("db error, %s", err.Error())
}

cls, err := clustermanager.GetCluster(i.req.GetClusterID())
cls, err := clustermanager.GetCluster(i.ctx, i.req.GetClusterID())
if err != nil {
return err
}
Expand Down
2 changes: 1 addition & 1 deletion bcs-services/bcs-helm-manager/internal/actions/release/listv1.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ func (l *ListReleaseV1Action) list() (*helmmanager.ReleaseListData, error) {
option := l.getOption()

// if cluster is shared, return release form database only
cluster, err := clustermanager.GetCluster(clusterID)
cluster, err := clustermanager.GetCluster(l.ctx, clusterID)
if err != nil {
return nil, fmt.Errorf("get cluster info error, %s", err.Error())
}
Expand Down
2 changes: 1 addition & 1 deletion bcs-services/bcs-helm-manager/internal/actions/release/listv2.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ func (l *ListReleaseV2Action) list() (*helmmanager.ReleaseListData, error) {
option := l.getOption()

// if cluster is shared, return release form database only
cluster, err := clustermanager.GetCluster(clusterID)
cluster, err := clustermanager.GetCluster(l.ctx, clusterID)
if err != nil {
return nil, fmt.Errorf("get cluster info error, %s", err.Error())
}
Expand Down
2 changes: 1 addition & 1 deletion bcs-services/bcs-helm-manager/internal/actions/release/upgradev1.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ func (u *UpgradeReleaseV1Action) upgrade() error {
if err := u.saveDB(); err != nil {
return fmt.Errorf("db error, %s", err.Error())
}
cls, err := clustermanager.GetCluster(u.req.GetClusterID())
cls, err := clustermanager.GetCluster(u.ctx, u.req.GetClusterID())
if err != nil {
return err
}
Expand Down
19 changes: 16 additions & 3 deletions bcs-services/bcs-helm-manager/internal/app/app.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@ import (
"github.com/Tencent/bk-bcs/bcs-common/common/util"
"github.com/Tencent/bk-bcs/bcs-common/common/version"
"github.com/Tencent/bk-bcs/bcs-common/pkg/auth/iam"
bcsapihm "github.com/Tencent/bk-bcs/bcs-common/pkg/bcsapi/helmmanager"
discovery "github.com/Tencent/bk-bcs/bcs-common/pkg/discovery"
"github.com/Tencent/bk-bcs/bcs-common/pkg/header"
"github.com/Tencent/bk-bcs/bcs-common/pkg/odm/drivers/mongo"
"github.com/Tencent/bk-bcs/bcs-common/pkg/otel/trace/micro"
middleauth "github.com/Tencent/bk-bcs/bcs-services/pkg/bcs-auth/middleware"
Expand All @@ -62,7 +65,6 @@ import (
"github.com/Tencent/bk-bcs/bcs-services/bcs-helm-manager/internal/component/clustermanager"
"github.com/Tencent/bk-bcs/bcs-services/bcs-helm-manager/internal/component/project"
"github.com/Tencent/bk-bcs/bcs-services/bcs-helm-manager/internal/component/storage"
"github.com/Tencent/bk-bcs/bcs-services/bcs-helm-manager/internal/discovery"
"github.com/Tencent/bk-bcs/bcs-services/bcs-helm-manager/internal/handler"
"github.com/Tencent/bk-bcs/bcs-services/bcs-helm-manager/internal/operation"
"github.com/Tencent/bk-bcs/bcs-services/bcs-helm-manager/internal/options"
Expand Down Expand Up @@ -343,7 +345,12 @@ func (hm *HelmManager) initRegistry() error {

// initDiscovery init svc discovery
func (hm *HelmManager) initDiscovery() error {
hm.discovery = discovery.NewModuleDiscovery(common.ServiceDomain, hm.microRgt)
if !discovery.UseServiceDiscovery() {
hm.discovery = discovery.NewModuleDiscovery(common.ServiceDomain, hm.microRgt)
bcsapihm.SetClientConfig(hm.clientTLSConfig, hm.discovery)
} else {
bcsapihm.SetClientConfig(hm.clientTLSConfig, nil)
}
blog.Info("init discovery for helm manager successfully")
return nil
}
Expand Down Expand Up @@ -390,9 +397,15 @@ func (hm *HelmManager) initMicro() error { // nolint
return nil
}),
microSvc.AfterStart(func() error {
if discovery.UseServiceDiscovery() {
return nil
}
return hm.discovery.Start()
}),
microSvc.BeforeStop(func() error {
if discovery.UseServiceDiscovery() {
return nil
}
hm.discovery.Stop()
return nil
}),
Expand Down Expand Up @@ -444,7 +457,7 @@ func (hm *HelmManager) initMicro() error { // nolint
// init grpc gatewasy
func (hm *HelmManager) initHTTPService() error {
rmMux := ggRuntime.NewServeMux(
ggRuntime.WithIncomingHeaderMatcher(runtimex.CustomHeaderMatcher),
ggRuntime.WithIncomingHeaderMatcher(header.CustomHeaderMatcher),
ggRuntime.WithOutgoingHeaderMatcher(runtimex.CustomHeaderMatcher),
ggRuntime.WithMarshalerOption(ggRuntime.MIMEWildcard, &ggRuntime.HTTPBodyMarshaler{
Marshaler: &ggRuntime.JSONPb{OrigName: true, EmitDefaults: true}}),
Expand Down
49 changes: 16 additions & 33 deletions bcs-services/bcs-helm-manager/internal/component/clustermanager/clustermanager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,12 @@ import (
"fmt"
"time"

"github.com/Tencent/bk-bcs/bcs-common/common/blog"
"github.com/Tencent/bk-bcs/bcs-common/pkg/bcsapi"
"github.com/Tencent/bk-bcs/bcs-common/pkg/bcsapi/clustermanager"
"github.com/Tencent/bk-bcs/bcs-common/pkg/discovery"
"github.com/patrickmn/go-cache"
microRgt "go-micro.dev/v4/registry"

"github.com/Tencent/bk-bcs/bcs-services/bcs-helm-manager/internal/discovery"
"github.com/Tencent/bk-bcs/bcs-services/bcs-helm-manager/internal/common"
)

const (
Expand All @@ -41,54 +40,39 @@ const (

// Client xxx
type Client struct {
Discovery *discovery.ModuleDiscovery
ClientTLSConfig *tls.Config
Cache *cache.Cache
Cache *cache.Cache
}

var client *Client

// NewClient create cluster manager service client
func NewClient(tlsConfig *tls.Config, microRgt microRgt.Registry) error {
dis := discovery.NewModuleDiscovery(ClusterManagerServiceName, microRgt)
err := dis.Start()
if err != nil {
return err
if !discovery.UseServiceDiscovery() {
dis := discovery.NewModuleDiscovery(ClusterManagerServiceName, microRgt)
err := dis.Start()
if err != nil {
return err
}
clustermanager.SetClientConfig(tlsConfig, dis)
} else {
clustermanager.SetClientConfig(tlsConfig, nil)
}
client = &Client{
Discovery: dis,
ClientTLSConfig: tlsConfig,
Cache: cache.New(defaultExpiration, cache.NoExpiration),
Cache: cache.New(defaultExpiration, cache.NoExpiration),
}
return nil
}

func (p *Client) getClusterClient() (clustermanager.ClusterManagerClient, func(), error) {
node, err := p.Discovery.GetRandServiceInst()
if err != nil {
return nil, nil, err
}
blog.V(4).Infof("get random cluster-manager instance [%s] from etcd registry successful", node.Address)

cfg := bcsapi.Config{}
// discovery hosts
cfg.Hosts = discovery.GetServerEndpointsFromRegistryNode(node)
cfg.TLSConfig = p.ClientTLSConfig
cfg.InnerClientName = "bcs-helm-manager"
cli, close := clustermanager.NewClusterManager(&cfg)
return cli, close, nil
}

// GetCluster get cluster from cluster manager
func GetCluster(clusterID string) (*clustermanager.Cluster, error) {
func GetCluster(ctx context.Context, clusterID string) (*clustermanager.Cluster, error) {
key := fmt.Sprintf(cacheClusterIDKeyPrefix, clusterID)
v, ok := client.Cache.Get(key)
if ok {
if cluster, ok := v.(*clustermanager.Cluster); ok {
return cluster, nil
}
}
cli, close, err := client.getClusterClient()
cli, close, err := clustermanager.GetClient(common.ServiceDomain)
defer func() {
if close != nil {
close()
Expand All @@ -97,8 +81,7 @@ func GetCluster(clusterID string) (*clustermanager.Cluster, error) {
if err != nil {
return nil, err
}
p, err := cli.GetCluster(context.Background(),
&clustermanager.GetClusterReq{ClusterID: clusterID})
p, err := cli.GetCluster(ctx, &clustermanager.GetClusterReq{ClusterID: clusterID})
if err != nil {
return nil, fmt.Errorf("GetCluster error: %s", err)
}
Expand Down
54 changes: 19 additions & 35 deletions bcs-services/bcs-helm-manager/internal/component/project/project.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,12 @@ import (
"fmt"
"time"

"github.com/Tencent/bk-bcs/bcs-common/common/blog"
"github.com/Tencent/bk-bcs/bcs-common/pkg/bcsapi"
"github.com/Tencent/bk-bcs/bcs-common/pkg/bcsapi/bcsproject"
"github.com/Tencent/bk-bcs/bcs-common/pkg/discovery"
"github.com/patrickmn/go-cache"
microRgt "go-micro.dev/v4/registry"

"github.com/Tencent/bk-bcs/bcs-services/bcs-helm-manager/internal/discovery"
"github.com/Tencent/bk-bcs/bcs-services/bcs-helm-manager/internal/common"
)

const (
Expand All @@ -41,46 +40,31 @@ const (

// Client xxx
type Client struct {
Discovery *discovery.ModuleDiscovery
ClientTLSConfig *tls.Config
Cache *cache.Cache
Cache *cache.Cache
}

var client *Client

// NewClient create project service client
func NewClient(tlsConfig *tls.Config, microRgt microRgt.Registry) error {
dis := discovery.NewModuleDiscovery(ProjectManagerServiceName, microRgt)
err := dis.Start()
if err != nil {
return err
if !discovery.UseServiceDiscovery() {
dis := discovery.NewModuleDiscovery(ProjectManagerServiceName, microRgt)
err := dis.Start()
if err != nil {
return err
}
bcsproject.SetClientConfig(tlsConfig, dis)
} else {
bcsproject.SetClientConfig(tlsConfig, nil)
}
client = &Client{
Discovery: dis,
ClientTLSConfig: tlsConfig,
Cache: cache.New(defaultExpiration, cache.NoExpiration),
Cache: cache.New(defaultExpiration, cache.NoExpiration),
}
return nil
}

func (p *Client) getProjectClient() (*bcsproject.ProjectClient, func(), error) {
node, err := p.Discovery.GetRandServiceInst()
if err != nil {
return nil, nil, err
}
blog.V(4).Infof("get random project-manager instance [%s] from etcd registry successful", node.Address)

cfg := bcsapi.Config{}
// discovery hosts
cfg.Hosts = discovery.GetServerEndpointsFromRegistryNode(node)
cfg.TLSConfig = p.ClientTLSConfig
cfg.InnerClientName = "bcs-helm-manager"
cli, close := bcsproject.NewProjectManagerClient(&cfg)
return cli, close, nil
}

// GetProjectByCode get project from project code
func GetProjectByCode(projectCode string) (*bcsproject.Project, error) {
func GetProjectByCode(ctx context.Context, projectCode string) (*bcsproject.Project, error) {
// load project data from cache
key := fmt.Sprintf(cacheProjectKeyPrefix, projectCode)
v, ok := client.Cache.Get(key)
Expand All @@ -89,7 +73,7 @@ func GetProjectByCode(projectCode string) (*bcsproject.Project, error) {
return project, nil
}
}
cli, close, err := client.getProjectClient()
cli, close, err := bcsproject.GetClient(common.ServiceDomain)
defer func() {
if close != nil {
close()
Expand All @@ -98,7 +82,7 @@ func GetProjectByCode(projectCode string) (*bcsproject.Project, error) {
if err != nil {
return nil, err
}
p, err := cli.Project.GetProject(context.Background(),
p, err := cli.Project.GetProject(ctx,
&bcsproject.GetProjectRequest{ProjectIDOrCode: projectCode})
if err != nil {
return nil, fmt.Errorf("GetProject error: %s", err)
Expand All @@ -113,8 +97,8 @@ func GetProjectByCode(projectCode string) (*bcsproject.Project, error) {
}

// GetVariable get project from project code
func GetVariable(projectCode, clusterID, namespace string) ([]*bcsproject.VariableValue, error) {
client, close, err := client.getProjectClient()
func GetVariable(ctx context.Context, projectCode, clusterID, namespace string) ([]*bcsproject.VariableValue, error) {
client, close, err := bcsproject.GetClient(common.ServiceDomain)
defer func() {
if close != nil {
close()
Expand All @@ -123,7 +107,7 @@ func GetVariable(projectCode, clusterID, namespace string) ([]*bcsproject.Variab
if err != nil {
return nil, err
}
resp, err := client.Variable.RenderVariables(context.Background(),
resp, err := client.Variable.RenderVariables(ctx,
&bcsproject.RenderVariablesRequest{ProjectCode: projectCode, ClusterID: clusterID, Namespace: namespace})
if err != nil {
return nil, fmt.Errorf("ListNamespaceVariables error: %s", err)
Expand Down
4 changes: 2 additions & 2 deletions bcs-services/bcs-helm-manager/internal/operation/actions/install.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,14 +141,14 @@ func (r *ReleaseInstallAction) Prepare(ctx context.Context) error {
}

// Validate xxx
func (r *ReleaseInstallAction) Validate() error {
func (r *ReleaseInstallAction) Validate(ctx context.Context) error {
blog.V(5).Infof("start to validate release %s/%s install", r.namespace, r.name)
// 非真实用户无法在权限中心鉴权，跳过检测
if len(r.AuthUser) == 0 {
return nil
}
// 如果是共享集群，且集群不属于该项目，说明是用户使用共享集群，需要单独鉴权
cls, err := clustermanager.GetCluster(r.clusterID)
cls, err := clustermanager.GetCluster(ctx, r.clusterID)
if err != nil {
return err
}
Expand Down
2 changes: 1 addition & 1 deletion bcs-services/bcs-helm-manager/internal/operation/actions/rollback.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ func (r *ReleaseRollbackAction) Prepare(ctx context.Context) error {
}

// Validate xxx
func (r *ReleaseRollbackAction) Validate() error {
func (r *ReleaseRollbackAction) Validate(ctx context.Context) error {
return nil
}

Expand Down
2 changes: 1 addition & 1 deletion bcs-services/bcs-helm-manager/internal/operation/actions/uninstall.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ func (r *ReleaseUninstallAction) Prepare(ctx context.Context) error {
}

// Validate xxx
func (r *ReleaseUninstallAction) Validate() error {
func (r *ReleaseUninstallAction) Validate(ctx context.Context) error {
return nil
}

Expand Down
4 changes: 2 additions & 2 deletions bcs-services/bcs-helm-manager/internal/operation/actions/upgrade.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,14 +143,14 @@ func (r *ReleaseUpgradeAction) Prepare(ctx context.Context) error {
}

// Validate xxx
func (r *ReleaseUpgradeAction) Validate() error {
func (r *ReleaseUpgradeAction) Validate(ctx context.Context) error {
blog.V(5).Infof("start to validate release %s/%s upgrade", r.namespace, r.name)
// 非真实用户无法在权限中心鉴权，跳过检测
if len(r.AuthUser) == 0 {
return nil
}
// 如果是共享集群，且集群不属于该项目，说明是用户使用共享集群，需要单独鉴权
cls, err := clustermanager.GetCluster(r.clusterID)
cls, err := clustermanager.GetCluster(ctx, r.clusterID)
if err != nil {
return err
}
Expand Down
4 changes: 2 additions & 2 deletions bcs-services/bcs-helm-manager/internal/operation/operation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ type Operation interface {
// Name operation name
Name() string
// Validate check param is valid
Validate() error
Validate(ctx context.Context) error
// Prepare do something to prepare release execute, like download chart content
Prepare(ctx context.Context) error
// Execute execute release install/upgrade/uninstall/rollback action
Expand Down Expand Up @@ -156,7 +156,7 @@ func (o *operator) dispatch(op Operation, timeout time.Duration, done chan struc
op.Done(fmt.Errorf("prepare error, %s", err.Error()))
return
}
if err := op.Validate(); err != nil {
if err := op.Validate(ctx); err != nil {
metrics.ReportOperationMetric(op.Action(), operateFail, start)
blog.Errorf("operation %s validate error, %s", op.Name(), err.Error())
op.Done(fmt.Errorf("validate error, %s", err))
Expand Down
2 changes: 1 addition & 1 deletion bcs-services/bcs-helm-manager/internal/operation/operation_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ func (r *mockAction) Name() string {
}

// Validate xxx
func (r *mockAction) Validate() error {
func (r *mockAction) Validate(ctx context.Context) error {
if r.validateError {
return fmt.Errorf("validate error")
}
Expand Down
Loading
Loading