Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ import (
microRgt "go-micro.dev/v4/registry"
"gorm.io/driver/mysql"
"gorm.io/gorm"
helmrelease "helm.sh/helm/v3/pkg/release"
releaseCom "helm.sh/helm/v4/pkg/release/common"

"github.com/Tencent/bk-bcs/bcs-services/bcs-helm-manager/internal/common"
"github.com/Tencent/bk-bcs/bcs-services/bcs-helm-manager/internal/component/project"
Expand Down Expand Up @@ -389,12 +389,12 @@ func (r *release) toEntity() (*entity.Release, error) {
}
}

status := helmrelease.StatusDeployed
status := releaseCom.StatusDeployed
if r.Status != 1 {
status = helmrelease.StatusFailed
status = releaseCom.StatusFailed
}
if r.StringStatus != "" {
status = helmrelease.Status(r.StringStatus)
status = releaseCom.Status(r.StringStatus)
}
// init release struct
return &entity.Release{
Expand Down
246 changes: 116 additions & 130 deletions bcs-services/bcs-helm-manager/go.mod

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (

"github.com/Tencent/bk-bcs/bcs-common/common/blog"
"github.com/Tencent/bk-bcs/bcs-common/pkg/odm/drivers"
"helm.sh/helm/v3/pkg/storage/driver"
"helm.sh/helm/v4/pkg/storage/driver"

"github.com/Tencent/bk-bcs/bcs-services/bcs-helm-manager/internal/common"
"github.com/Tencent/bk-bcs/bcs-services/bcs-helm-manager/internal/release"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
"fmt"

"github.com/Tencent/bk-bcs/bcs-common/common/blog"
helmrelease "helm.sh/helm/v3/pkg/release"
releaseCom "helm.sh/helm/v4/pkg/release/common"

"github.com/Tencent/bk-bcs/bcs-services/bcs-helm-manager/internal/auth"
"github.com/Tencent/bk-bcs/bcs-services/bcs-helm-manager/internal/common"
Expand Down Expand Up @@ -116,10 +116,10 @@ func (i *InstallAddonsAction) saveDB(ctx context.Context, ns, chartName, release
return err
}
createBy := auth.GetUserFromCtx(ctx)
status := helmrelease.StatusPendingInstall.String()
status := releaseCom.StatusPendingInstall.String()
// 对于非 chart 类型的 addons,直接返回成功
if isFakeChart(chartName) {
status = helmrelease.StatusDeployed.String()
status = releaseCom.StatusDeployed.String()
}
if err := i.model.CreateRelease(ctx, &entity.Release{
Name: releaseName,
Expand Down
8 changes: 4 additions & 4 deletions bcs-services/bcs-helm-manager/internal/actions/addons/list.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import (
"github.com/Tencent/bk-bcs/bcs-common/common/blog"
"github.com/Tencent/bk-bcs/bcs-common/pkg/odm/drivers"
"golang.org/x/sync/errgroup"
helmrelease "helm.sh/helm/v3/pkg/release"
"helm.sh/helm/v3/pkg/storage/driver"
releaseCom "helm.sh/helm/v4/pkg/release/common"
"helm.sh/helm/v4/pkg/storage/driver"

"github.com/Tencent/bk-bcs/bcs-services/bcs-helm-manager/internal/common"
"github.com/Tencent/bk-bcs/bcs-services/bcs-helm-manager/internal/release"
Expand Down Expand Up @@ -112,9 +112,9 @@ func (l *ListAddonsAction) Handle(ctx context.Context,
mux.Lock()
if err != nil {
if errors.Is(err, driver.ErrReleaseNotFound) &&
*addons[i].Status == helmrelease.StatusDeployed.String() && *addons[i].ChartName != "" {
*addons[i].Status == releaseCom.StatusDeployed.String() && *addons[i].ChartName != "" {
// 如果集群中没有改 release,则置为未安装状态
if *addons[i].Status == helmrelease.StatusDeployed.String() && *addons[i].ChartName != "" {
if *addons[i].Status == releaseCom.StatusDeployed.String() && *addons[i].ChartName != "" {
addons[i].Status = common.GetStringP("")
addons[i].Message = common.GetStringP("")
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"fmt"

"github.com/Tencent/bk-bcs/bcs-common/common/blog"
"helm.sh/helm/v3/pkg/storage/driver"
"helm.sh/helm/v4/pkg/storage/driver"

actionsrelease "github.com/Tencent/bk-bcs/bcs-services/bcs-helm-manager/internal/actions/release"
"github.com/Tencent/bk-bcs/bcs-services/bcs-helm-manager/internal/auth"
Expand Down
4 changes: 2 additions & 2 deletions bcs-services/bcs-helm-manager/internal/actions/addons/stop.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
"fmt"

"github.com/Tencent/bk-bcs/bcs-common/common/blog"
helmrelease "helm.sh/helm/v3/pkg/release"
releaseCom "helm.sh/helm/v4/pkg/release/common"

"github.com/Tencent/bk-bcs/bcs-services/bcs-helm-manager/internal/auth"
"github.com/Tencent/bk-bcs/bcs-services/bcs-helm-manager/internal/common"
Expand Down Expand Up @@ -124,7 +124,7 @@ func (s *StopAddonsAction) saveDB(ctx context.Context, ns, chartName, releaseNam
s.version = old.ChartVersion
rl := entity.M{
entity.FieldKeyUpdateBy: s.updateBy,
entity.FieldKeyStatus: helmrelease.StatusPendingUpgrade.String(),
entity.FieldKeyStatus: releaseCom.StatusPendingUpgrade.String(),
entity.FieldKeyMessage: "",
}
if err := s.model.UpdateRelease(ctx, s.req.GetClusterID(), ns, releaseName, rl); err != nil {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (

"github.com/Tencent/bk-bcs/bcs-common/common/blog"
"github.com/Tencent/bk-bcs/bcs-common/pkg/odm/drivers"
helmrelease "helm.sh/helm/v3/pkg/release"
releaseCom "helm.sh/helm/v4/pkg/release/common"

"github.com/Tencent/bk-bcs/bcs-services/bcs-helm-manager/internal/auth"
"github.com/Tencent/bk-bcs/bcs-services/bcs-helm-manager/internal/common"
Expand Down Expand Up @@ -132,7 +132,7 @@ func (u *UninstallAddonsAction) saveDB(ctx context.Context, ns, chartName, relea
username := auth.GetUserFromCtx(ctx)
rl := entity.M{
entity.FieldKeyUpdateBy: username,
entity.FieldKeyStatus: helmrelease.StatusUninstalling.String(),
entity.FieldKeyStatus: releaseCom.StatusUninstalling.String(),
entity.FieldKeyMessage: "",
}
if err := u.model.UpdateRelease(ctx, u.req.GetClusterID(), ns, releaseName, rl); err != nil {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (

"github.com/Tencent/bk-bcs/bcs-common/common/blog"
"github.com/Tencent/bk-bcs/bcs-common/pkg/odm/drivers"
helmrelease "helm.sh/helm/v3/pkg/release"
releaseCom "helm.sh/helm/v4/pkg/release/common"

"github.com/Tencent/bk-bcs/bcs-services/bcs-helm-manager/internal/auth"
"github.com/Tencent/bk-bcs/bcs-services/bcs-helm-manager/internal/common"
Expand Down Expand Up @@ -130,10 +130,10 @@ func (u *UpgradeAddonsAction) saveDB(ctx context.Context, ns, chartName, release
create = true
}

status := helmrelease.StatusPendingUpgrade.String()
status := releaseCom.StatusPendingUpgrade.String()
// 对于非 chart 类型的 addons,直接返回成功
if isFakeChart(chartName) {
status = helmrelease.StatusDeployed.String()
status = releaseCom.StatusDeployed.String()
}
createBy := auth.GetUserFromCtx(ctx)
if create {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"time"

"github.com/Tencent/bk-bcs/bcs-common/common/blog"
"helm.sh/helm/v3/pkg/storage/driver"
"helm.sh/helm/v4/pkg/storage/driver"

"github.com/Tencent/bk-bcs/bcs-services/bcs-helm-manager/internal/common"
"github.com/Tencent/bk-bcs/bcs-services/bcs-helm-manager/internal/release"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
"errors"

"github.com/Tencent/bk-bcs/bcs-common/common/blog"
"helm.sh/helm/v3/pkg/storage/driver"
"helm.sh/helm/v4/pkg/storage/driver"

"github.com/Tencent/bk-bcs/bcs-services/bcs-helm-manager/internal/common"
"github.com/Tencent/bk-bcs/bcs-services/bcs-helm-manager/internal/release"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ import (
"fmt"

"github.com/Tencent/bk-bcs/bcs-common/common/blog"
helmrelease "helm.sh/helm/v3/pkg/release"
"helm.sh/helm/v3/pkg/storage/driver"
releaseCom "helm.sh/helm/v4/pkg/release/common"
"helm.sh/helm/v4/pkg/storage/driver"

"github.com/Tencent/bk-bcs/bcs-services/bcs-helm-manager/internal/auth"
"github.com/Tencent/bk-bcs/bcs-services/bcs-helm-manager/internal/common"
Expand Down Expand Up @@ -150,7 +150,7 @@ func (i *InstallReleaseV1Action) saveDB() error {
Values: i.req.GetValues(),
Args: i.req.GetArgs(),
CreateBy: createBy,
Status: helmrelease.StatusPendingInstall.String(),
Status: releaseCom.StatusPendingInstall.String(),
Env: i.req.GetEnv(),
}); err != nil {
return err
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
authUtils "github.com/Tencent/bk-bcs/bcs-services/pkg/bcs-auth/utils"
"go.mongodb.org/mongo-driver/bson/primitive"
"golang.org/x/sync/errgroup"
helmrelease "helm.sh/helm/v3/pkg/release"
releaseCom "helm.sh/helm/v4/pkg/release/common"

"github.com/Tencent/bk-bcs/bcs-services/bcs-helm-manager/internal/auth"
"github.com/Tencent/bk-bcs/bcs-services/bcs-helm-manager/internal/common"
Expand Down Expand Up @@ -194,7 +194,7 @@ func (l *ListReleaseV1Action) mergeReleases(clusterReleases,
continue
}
// 数据库中状态正常的数据,但在集群中不存在,则不展示
if v.GetStatus() == helmrelease.StatusDeployed.String() {
if v.GetStatus() == releaseCom.StatusDeployed.String() {
continue
}
newReleaseMap[l.getReleaseKey(v.GetNamespace(), v.GetName())] = dbReleases[i]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (

"github.com/Tencent/bk-bcs/bcs-common/common/blog"
_struct "github.com/golang/protobuf/ptypes/struct"
"helm.sh/helm/v3/pkg/storage/driver"
"helm.sh/helm/v4/pkg/storage/driver"
corev1 "k8s.io/api/core/v1"
"k8s.io/cli-runtime/pkg/resource"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ import (

"github.com/Tencent/bk-bcs/bcs-common/common/blog"
"gopkg.in/yaml.v2"
"helm.sh/helm/v3/pkg/chartutil"
helmrelease "helm.sh/helm/v3/pkg/release"
"helm.sh/helm/v3/pkg/storage/driver"
chartutil "helm.sh/helm/v4/pkg/chart/common/util"
helmrelease "helm.sh/helm/v4/pkg/release/v1"
"helm.sh/helm/v4/pkg/storage/driver"

"github.com/Tencent/bk-bcs/bcs-services/bcs-helm-manager/internal/auth"
"github.com/Tencent/bk-bcs/bcs-services/bcs-helm-manager/internal/common"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (

"github.com/Tencent/bk-bcs/bcs-common/common/blog"
"github.com/Tencent/bk-bcs/bcs-common/pkg/odm/drivers"
helmrelease "helm.sh/helm/v3/pkg/release"
releaseCom "helm.sh/helm/v4/pkg/release/common"

"github.com/Tencent/bk-bcs/bcs-services/bcs-helm-manager/internal/auth"
"github.com/Tencent/bk-bcs/bcs-services/bcs-helm-manager/internal/common"
Expand Down Expand Up @@ -130,14 +130,14 @@ func (r *RollbackReleaseV1Action) saveDB() error {
Namespace: r.req.GetNamespace(),
ClusterID: r.req.GetClusterID(),
CreateBy: username,
Status: helmrelease.StatusPendingRollback.String(),
Status: releaseCom.StatusPendingRollback.String(),
}); err != nil {
return err
}
} else {
rl := entity.M{
entity.FieldKeyUpdateBy: username,
entity.FieldKeyStatus: helmrelease.StatusPendingRollback.String(),
entity.FieldKeyStatus: releaseCom.StatusPendingRollback.String(),
entity.FieldKeyMessage: "",
}
if err = r.model.UpdateRelease(r.ctx, r.req.GetClusterID(), r.req.GetNamespace(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"github.com/Tencent/bk-bcs/bcs-common/common/blog"
_struct "github.com/golang/protobuf/ptypes/struct"
"google.golang.org/protobuf/types/known/structpb"
"helm.sh/helm/v3/pkg/storage/driver"
"helm.sh/helm/v4/pkg/storage/driver"

"github.com/Tencent/bk-bcs/bcs-services/bcs-helm-manager/internal/common"
"github.com/Tencent/bk-bcs/bcs-services/bcs-helm-manager/internal/release"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (

"github.com/Tencent/bk-bcs/bcs-common/common/blog"
"github.com/Tencent/bk-bcs/bcs-common/pkg/odm/drivers"
helmrelease "helm.sh/helm/v3/pkg/release"
releaseCom "helm.sh/helm/v4/pkg/release/common"

"github.com/Tencent/bk-bcs/bcs-services/bcs-helm-manager/internal/auth"
"github.com/Tencent/bk-bcs/bcs-services/bcs-helm-manager/internal/common"
Expand Down Expand Up @@ -121,14 +121,14 @@ func (u *UninstallReleaseV1Action) saveDB() error {
Namespace: u.req.GetNamespace(),
ClusterID: u.req.GetClusterID(),
CreateBy: username,
Status: helmrelease.StatusUninstalling.String(),
Status: releaseCom.StatusUninstalling.String(),
}); err != nil {
return err
}
} else {
rl := entity.M{
entity.FieldKeyUpdateBy: username,
entity.FieldKeyStatus: helmrelease.StatusUninstalling.String(),
entity.FieldKeyStatus: releaseCom.StatusUninstalling.String(),
entity.FieldKeyMessage: "",
}
if err = u.model.UpdateRelease(u.ctx, u.req.GetClusterID(), u.req.GetNamespace(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (

"github.com/Tencent/bk-bcs/bcs-common/common/blog"
"github.com/Tencent/bk-bcs/bcs-common/pkg/odm/drivers"
helmrelease "helm.sh/helm/v3/pkg/release"
releaseCom "helm.sh/helm/v4/pkg/release/common"

"github.com/Tencent/bk-bcs/bcs-services/bcs-helm-manager/internal/auth"
"github.com/Tencent/bk-bcs/bcs-services/bcs-helm-manager/internal/common"
Expand Down Expand Up @@ -151,7 +151,7 @@ func (u *UpgradeReleaseV1Action) saveDB() error {
Values: u.req.GetValues(),
Args: u.req.GetArgs(),
CreateBy: createBy,
Status: helmrelease.StatusPendingUpgrade.String(),
Status: releaseCom.StatusPendingUpgrade.String(),
Env: u.req.GetEnv(),
}); err != nil {
return err
Expand All @@ -176,7 +176,7 @@ func (u *UpgradeReleaseV1Action) saveDB() error {
entity.FieldKeyValueFile: u.req.GetValueFile(),
entity.FieldKeyArgs: u.req.Args,
entity.FieldKeyUpdateBy: createBy,
entity.FieldKeyStatus: helmrelease.StatusPendingUpgrade.String(),
entity.FieldKeyStatus: releaseCom.StatusPendingUpgrade.String(),
entity.FieldKeyMessage: "",
entity.FieldKeyEnv: u.req.GetEnv(),
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ import (

"github.com/Tencent/bk-bcs/bcs-common/common/blog"
"gopkg.in/yaml.v2"
"helm.sh/helm/v3/pkg/releaseutil"

"github.com/Tencent/bk-bcs/bcs-services/bcs-helm-manager/internal/repo"
"github.com/Tencent/bk-bcs/bcs-services/bcs-helm-manager/internal/store"
helmmanager "github.com/Tencent/bk-bcs/bcs-services/bcs-helm-manager/proto/bcs-helm-manager"
releaseutil "helm.sh/helm/v4/pkg/release/v1/util"
)

const (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
"path/filepath"
"strconv"

"helm.sh/helm/v3/pkg/chartutil"
chartutil "helm.sh/helm/v4/pkg/chart/v2/util"

"github.com/Tencent/bk-bcs/bcs-services/bcs-helm-manager/internal/client/pkg"
utilschart "github.com/Tencent/bk-bcs/bcs-services/bcs-helm-manager/internal/utils/chart"
Expand Down
10 changes: 5 additions & 5 deletions bcs-services/bcs-helm-manager/internal/common/constant.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
// Package common xxx
package common

import "helm.sh/helm/v3/pkg/release"
import "helm.sh/helm/v4/pkg/release/common"

const (
// ServiceDomain domain name for service
Expand All @@ -38,13 +38,13 @@ const (
// ReleaseStatus
const (
// ReleaseStatusInstallFailed xxx
ReleaseStatusInstallFailed release.Status = "failed-install"
ReleaseStatusInstallFailed common.Status = "failed-install"
// ReleaseStatusUpgradeFailed xxx
ReleaseStatusUpgradeFailed release.Status = "failed-upgrade"
ReleaseStatusUpgradeFailed common.Status = "failed-upgrade"
// ReleaseStatusRollbackFailed xxx
ReleaseStatusRollbackFailed release.Status = "failed-rollback"
ReleaseStatusRollbackFailed common.Status = "failed-rollback"
// ReleaseStatusUninstallFailed xxx
ReleaseStatusUninstallFailed release.Status = "failed-uninstall"
ReleaseStatusUninstallFailed common.Status = "failed-uninstall"
)

const (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"strconv"

"github.com/Tencent/bk-bcs/bcs-common/common/blog"
helmrelease "helm.sh/helm/v3/pkg/release"
releaseCom "helm.sh/helm/v4/pkg/release/common"

"github.com/Tencent/bk-bcs/bcs-services/bcs-helm-manager/internal/common"
"github.com/Tencent/bk-bcs/bcs-services/bcs-helm-manager/internal/component"
Expand Down Expand Up @@ -237,7 +237,7 @@ func (r *ReleaseInstallAction) Execute(ctx context.Context) error {

// Done xxx
func (r *ReleaseInstallAction) Done(err error) {
status := helmrelease.StatusDeployed
status := releaseCom.StatusDeployed
message := ""
if err != nil {
status = common.ReleaseStatusInstallFailed
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
"context"

"github.com/Tencent/bk-bcs/bcs-common/common/blog"
pkgrelease "helm.sh/helm/v3/pkg/release"
pkgrelease "helm.sh/helm/v4/pkg/release/v1"

"github.com/Tencent/bk-bcs/bcs-services/bcs-helm-manager/internal/release"
"github.com/Tencent/bk-bcs/bcs-services/bcs-helm-manager/internal/repo"
Expand Down
Loading