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: project-manager 支持自定义配置projectcode注解(v1.29.x) #3654

Merged
merged 1 commit into from
Dec 20, 2024
Merged

feat: project-manager 支持自定义配置projectcode注解(v1.29.x) #3654

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: 2 additions & 0 deletions bcs-services/bcs-project-manager/etc/bcs-project-manager.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,3 +87,5 @@ bcscc:
bcsGateway:
host: ""
token: ""
sharedClusterConfig:
annoKeyProjCode: ""
5 changes: 3 additions & 2 deletions bcs-services/bcs-project-manager/internal/actions/namespace/shared/create-callback.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import (
"github.com/Tencent/bk-bcs/bcs-services/bcs-project-manager/internal/component/bcscc"
"github.com/Tencent/bk-bcs/bcs-services/bcs-project-manager/internal/component/clientset"
"github.com/Tencent/bk-bcs/bcs-services/bcs-project-manager/internal/component/iam"
"github.com/Tencent/bk-bcs/bcs-services/bcs-project-manager/internal/config"
"github.com/Tencent/bk-bcs/bcs-services/bcs-project-manager/internal/logging"
nsm "github.com/Tencent/bk-bcs/bcs-services/bcs-project-manager/internal/store/namespace"
vdm "github.com/Tencent/bk-bcs/bcs-services/bcs-project-manager/internal/store/variabledefinition"
Expand Down Expand Up @@ -66,8 +67,8 @@ func (a *SharedNamespaceAction) CreateNamespaceCallback(ctx context.Context,
namespace := &corev1.Namespace{}
namespace.SetName(ns.Name)
namespace.SetAnnotations(map[string]string{
constant.AnnotationKeyProjectCode: req.GetProjectCode(),
constant.AnnotationKeyCreator: ns.Creator,
config.GlobalConf.SharedClusterConfig.AnnoKeyProjCode: req.GetProjectCode(),
constant.AnnotationKeyCreator: ns.Creator,
})
_, err = client.CoreV1().Namespaces().Create(ctx, namespace, metav1.CreateOptions{})
if err != nil {
Expand Down
3 changes: 1 addition & 2 deletions bcs-services/bcs-project-manager/internal/actions/namespace/shared/create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

"github.com/Tencent/bk-bcs/bcs-services/bcs-project-manager/internal/actions/namespace/independent"
"github.com/Tencent/bk-bcs/bcs-services/bcs-project-manager/internal/common/constant"
"github.com/Tencent/bk-bcs/bcs-services/bcs-project-manager/internal/common/envs"
"github.com/Tencent/bk-bcs/bcs-services/bcs-project-manager/internal/component/clientset"
"github.com/Tencent/bk-bcs/bcs-services/bcs-project-manager/internal/component/itsm"
Expand All @@ -50,7 +49,7 @@ func (a *SharedNamespaceAction) CreateNamespace(ctx context.Context,
if !config.GlobalConf.ITSM.Enable {
ia := independent.NewIndependentNamespaceAction(a.model)
req.Annotations = append(req.Annotations, &proto.Annotation{
Key: constant.AnnotationKeyProjectCode,
Key: config.GlobalConf.SharedClusterConfig.AnnoKeyProjCode,
Value: req.GetProjectCode(),
})
return ia.CreateNamespace(ctx, req, resp)
Expand Down
3 changes: 2 additions & 1 deletion bcs-services/bcs-project-manager/internal/actions/namespace/shared/native-list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import (

"github.com/Tencent/bk-bcs/bcs-services/bcs-project-manager/internal/common/constant"
"github.com/Tencent/bk-bcs/bcs-services/bcs-project-manager/internal/component/clientset"
"github.com/Tencent/bk-bcs/bcs-services/bcs-project-manager/internal/config"
"github.com/Tencent/bk-bcs/bcs-services/bcs-project-manager/internal/logging"
"github.com/Tencent/bk-bcs/bcs-services/bcs-project-manager/internal/util/errorx"
nsutils "github.com/Tencent/bk-bcs/bcs-services/bcs-project-manager/internal/util/namespace"
Expand Down Expand Up @@ -48,7 +49,7 @@ func (a *SharedNamespaceAction) ListNativeNamespaces(ctx context.Context,
}
retDatas := []*proto.NativeNamespaceData{}
for _, namespace := range namespaces {
projectCode, ok := namespace.Annotations[constant.AnnotationKeyProjectCode]
projectCode, ok := namespace.Annotations[config.GlobalConf.SharedClusterConfig.AnnoKeyProjCode]
if !ok {
continue
}
Expand Down
4 changes: 4 additions & 0 deletions bcs-services/bcs-project-manager/internal/common/envs/envs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
package envs

import (
"github.com/Tencent/bk-bcs/bcs-services/bcs-project-manager/internal/common/constant"
"github.com/Tencent/bk-bcs/bcs-services/bcs-project-manager/internal/util/stringx"
)

Expand All @@ -28,4 +29,7 @@ var (
// BCSGatewayToken bcs gateway token
BCSGatewayToken = stringx.GetEnv("gatewayToken", "")
BCSNamespacePrefix = stringx.GetEnv("BCS_NAMESPACE_PREFIX", "bcs")

// AnnotationKeyProjectCode shared cluster project code annotation key
AnnotationKeyProjectCode = stringx.GetEnv("annotationKeyProjectCode", constant.AnnotationKeyProjectCode)
)
16 changes: 16 additions & 0 deletions bcs-services/bcs-project-manager/internal/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,18 @@ type ListForIAMConfig struct {
All bool `yaml:"all" usage:"list all projects"`
}

// TaskConfig option for dispatch task broker & worker
type TaskConfig struct {
QueueAddress string `yaml:"address"`
Exchange string `yaml:"exchange"`
WorkerCnt int `yaml:"workerCnt"`
}

// SharedClusterConfig 共享集群相关配置
type SharedClusterConfig struct {
AnnoKeyProjCode string `yaml:"annoKeyProjCode"`
}

// ProjectConfig 项目的配置信息
type ProjectConfig struct {
Etcd EtcdConfig `yaml:"etcd"`
Expand All @@ -189,6 +201,7 @@ type ProjectConfig struct {
App AppConfig `yaml:"app"`
BcsGateway BCSGatewayConfig `yaml:"bcsGateway"`
ListForIAM ListForIAMConfig `yaml:"listForIAM"`
SharedClusterConfig SharedClusterConfig `yaml:"sharedClusterConfig"`
}

func (conf *ProjectConfig) initServerAddress() {
Expand All @@ -208,6 +221,9 @@ func (conf *ProjectConfig) initFromEnv() {
if conf.BcsGateway.Token == "" {
conf.BcsGateway.Token = envs.BCSGatewayToken
}
if conf.SharedClusterConfig.AnnoKeyProjCode == "" {
conf.SharedClusterConfig.AnnoKeyProjCode = envs.AnnotationKeyProjectCode
}
}

// GlobalConf 项目配置信息，全局都可以使用
Expand Down
3 changes: 2 additions & 1 deletion bcs-services/bcs-project-manager/internal/util/namespace/namespace.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,14 @@ import (
corev1 "k8s.io/api/core/v1"

"github.com/Tencent/bk-bcs/bcs-services/bcs-project-manager/internal/common/constant"
"github.com/Tencent/bk-bcs/bcs-services/bcs-project-manager/internal/config"
)

// FilterNamespaces filter shared namespace
func FilterNamespaces(namespaceList *corev1.NamespaceList, shared bool, projectCode string) []corev1.Namespace {
nsList := []corev1.Namespace{}
for _, ns := range namespaceList.Items {
if shared && ns.Annotations[constant.AnnotationKeyProjectCode] != projectCode {
if shared && ns.Annotations[config.GlobalConf.SharedClusterConfig.AnnoKeyProjCode] != projectCode {
continue
}
nsList = append(nsList, ns)
Expand Down
Loading