前端: - src/srv/api → src/api,按域分文件夹(auth/cluster/host/storage/deployment/collector) - 新增 http.ts 引擎(http.get/post/put/delete),域模块改用语义化调用 - index.html 增加 favicon(匹配应用 logo 的 emerald + Activity 脉冲) 后端分层增强(保留包名): - 新增 repository/:从 models 拆出 JsonDB 持久化层(InitDB/GetDB/Shutdown/RequestSave) - 新增 dto/:从 controllers 抽出各域请求契约(带 binding 校验) - 新增 pkg/crypto、pkg/jwt:从 utils 拆出安全原语(外部 jwt 别名 jwtv5 避免冲突) - models 只留领域实体 + sanitizer;utils 只留 gin/应用相关(response/errors) v2 优化移植与缺陷修复: - 移植密钥分离/SSH TOFU/并发写安全/Loki 生产级配置/Docker 加固 - 修复 deployment.go 并发丢更新、Helm values 重复键、EncryptField 哨兵、loki-gateway 端点等审计缺陷 - 实现真正的优雅关停(main.go http.Server + signal + repository.Shutdown) - 修复登录契约:后端返回 accessToken,前端 auth.ts/Login.tsx 对齐 - 补 crypto/jwt/repository 单元测试(含并发写回归) 验证: go build/vet/test 全绿;npm run build 通过;登录→鉴权→优雅关停冒烟通过 Co-Authored-By: Claude <noreply@anthropic.com>
200 lines
5.0 KiB
Go
200 lines
5.0 KiB
Go
package services
|
||
|
||
import (
|
||
"context"
|
||
"fmt"
|
||
"os"
|
||
"path/filepath"
|
||
"time"
|
||
|
||
"lokideploy/config"
|
||
"lokideploy/models"
|
||
"lokideploy/repository"
|
||
"lokideploy/utils"
|
||
)
|
||
|
||
type ClusterService struct{}
|
||
|
||
func NewClusterService() *ClusterService {
|
||
return &ClusterService{}
|
||
}
|
||
|
||
func SaveKubeConfig(name, content string) (string, error) {
|
||
dir := config.GetConfig().KubeDir
|
||
if err := os.MkdirAll(dir, 0700); err != nil {
|
||
return "", err
|
||
}
|
||
path := filepath.Join(dir, fmt.Sprintf("%s.yaml", name))
|
||
if err := os.WriteFile(path, []byte(content), 0600); err != nil {
|
||
return "", err
|
||
}
|
||
return path, nil
|
||
}
|
||
|
||
// Create 创建集群。token 接入时自动构造等价 kubeconfig,统一存储,使部署模块同样可用。
|
||
func (s *ClusterService) Create(name, description, configType, apiServer, kubeconfig, token, contextName string) (*models.Cluster, error) {
|
||
if configType == "" {
|
||
configType = "kubeconfig"
|
||
}
|
||
|
||
finalKubeconfig := kubeconfig
|
||
if configType == "token" {
|
||
// 安全默认:不嵌入 CA、不跳过 TLS 验证,依赖系统 CA 池。
|
||
// 自签证书的集群请改用 kubeconfig 模式(其内含 CA 证书)。
|
||
finalKubeconfig = BuildKubeconfigFromToken(apiServer, token, "", false)
|
||
}
|
||
// 展示用 APIServer:token 模式取入参,kubeconfig 模式从内容提取
|
||
if apiServer == "" {
|
||
apiServer = ExtractAPIServer(finalKubeconfig)
|
||
}
|
||
|
||
path, err := SaveKubeConfig(name, finalKubeconfig)
|
||
if err != nil {
|
||
return nil, fmt.Errorf("kubeconfig 保存失败: %w", err)
|
||
}
|
||
|
||
cluster := models.Cluster{
|
||
ID: repository.GetDB().NextID("clusters"),
|
||
Name: name,
|
||
Description: description,
|
||
ConfigType: configType,
|
||
APIServer: apiServer,
|
||
KubeConfig: finalKubeconfig,
|
||
KubeConfigPath: path,
|
||
Context: contextName,
|
||
Status: "pending",
|
||
CreatedAt: time.Now(),
|
||
UpdatedAt: time.Now(),
|
||
}
|
||
|
||
db := repository.GetDB()
|
||
db.Lock()
|
||
db.Clusters = append(db.Clusters, cluster)
|
||
db.Unlock()
|
||
db.RequestSave()
|
||
|
||
go s.Validate(cluster.ID)
|
||
return &cluster, nil
|
||
}
|
||
|
||
func (s *ClusterService) Get(id uint) (*models.Cluster, error) {
|
||
db := repository.GetDB()
|
||
db.RLock()
|
||
defer db.RUnlock()
|
||
for i := range db.Clusters {
|
||
if db.Clusters[i].ID == id {
|
||
c := db.Clusters[i]
|
||
return &c, nil
|
||
}
|
||
}
|
||
return nil, utils.ErrNotFound
|
||
}
|
||
|
||
func (s *ClusterService) List(page, pageSize int) ([]models.Cluster, int64, error) {
|
||
db := repository.GetDB()
|
||
db.RLock()
|
||
defer db.RUnlock()
|
||
|
||
total := int64(len(db.Clusters))
|
||
start := (page - 1) * pageSize
|
||
if start < 0 || start >= len(db.Clusters) {
|
||
return []models.Cluster{}, total, nil
|
||
}
|
||
end := start + pageSize
|
||
if end > len(db.Clusters) {
|
||
end = len(db.Clusters)
|
||
}
|
||
result := make([]models.Cluster, end-start)
|
||
copy(result, db.Clusters[start:end])
|
||
return result, total, nil
|
||
}
|
||
|
||
func (s *ClusterService) Update(id uint, updates map[string]interface{}) error {
|
||
db := repository.GetDB()
|
||
db.Lock()
|
||
defer db.Unlock()
|
||
for i := range db.Clusters {
|
||
if db.Clusters[i].ID == id {
|
||
if v, ok := updates["name"].(string); ok && v != "" {
|
||
db.Clusters[i].Name = v
|
||
}
|
||
if v, ok := updates["description"].(string); ok {
|
||
db.Clusters[i].Description = v
|
||
}
|
||
if v, ok := updates["status"].(string); ok && v != "" {
|
||
db.Clusters[i].Status = v
|
||
}
|
||
if v, ok := updates["version"].(string); ok {
|
||
db.Clusters[i].Version = v
|
||
}
|
||
if v, ok := updates["nodesCount"].(int); ok {
|
||
db.Clusters[i].NodesCount = v
|
||
}
|
||
if v, ok := updates["context"].(string); ok {
|
||
db.Clusters[i].Context = v
|
||
}
|
||
if v, ok := updates["lastConnected"].(time.Time); ok {
|
||
db.Clusters[i].LastConnected = v
|
||
}
|
||
// 接入方式与展示字段
|
||
if v, ok := updates["configType"].(string); ok && v != "" {
|
||
db.Clusters[i].ConfigType = v
|
||
}
|
||
if v, ok := updates["apiServer"].(string); ok {
|
||
db.Clusters[i].APIServer = v
|
||
}
|
||
// 凭据字段:空值不覆盖,避免编辑其它项时清空
|
||
if v, ok := updates["kubeconfig"].(string); ok && v != "" {
|
||
db.Clusters[i].KubeConfig = v
|
||
if db.Clusters[i].KubeConfigPath != "" {
|
||
_ = os.WriteFile(db.Clusters[i].KubeConfigPath, []byte(v), 0600)
|
||
}
|
||
}
|
||
db.Clusters[i].UpdatedAt = time.Now()
|
||
db.RequestSave()
|
||
return nil
|
||
}
|
||
}
|
||
return utils.ErrNotFound
|
||
}
|
||
|
||
func (s *ClusterService) Delete(id uint) error {
|
||
db := repository.GetDB()
|
||
db.Lock()
|
||
defer db.Unlock()
|
||
for i, c := range db.Clusters {
|
||
if c.ID == id {
|
||
if c.KubeConfigPath != "" {
|
||
_ = os.Remove(c.KubeConfigPath)
|
||
}
|
||
db.Clusters = append(db.Clusters[:i], db.Clusters[i+1:]...)
|
||
db.RequestSave()
|
||
return nil
|
||
}
|
||
}
|
||
return utils.ErrNotFound
|
||
}
|
||
|
||
func (s *ClusterService) Validate(id uint) {
|
||
cluster, err := s.Get(id)
|
||
if err != nil {
|
||
return
|
||
}
|
||
ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
|
||
defer cancel()
|
||
|
||
info, err := GetClusterInfo(ctx, cluster)
|
||
if err != nil {
|
||
s.Update(id, map[string]interface{}{"status": "error"})
|
||
return
|
||
}
|
||
|
||
s.Update(id, map[string]interface{}{
|
||
"status": "active",
|
||
"version": info.Version,
|
||
"nodesCount": len(info.Nodes),
|
||
"lastConnected": time.Now(),
|
||
"context": info.CurrentCtx,
|
||
})
|
||
}
|