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

Jump to bottom

多DB授权 #655

Merged
merged 2 commits into from
Nov 13, 2020
Merged

多DB授权 #655

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
862d361
Merge pull request #13 from Tencent/1.19.x
AlexAi27 Oct 15, 2020
557cc70
feature: webhook-server support granting privilege to multi dbs
AlexAi27 Nov 6, 2020
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
75 changes: 43 additions & 32 deletions bcs-services/bcs-webhook-server/pkg/inject/k8s/db_priv_conf.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
package k8s

import (
"encoding/json"
"fmt"
"strconv"

"github.com/Tencent/bk-bcs/bcs-common/common/blog"
"github.com/Tencent/bk-bcs/bcs-services/bcs-webhook-server/options"
Expand All @@ -33,6 +33,15 @@ type DbPrivConfInject struct {
DbPrivSecret *corev1.Secret
}

// DBPrivEnv is db privilege info
type DBPrivEnv struct {
AppName string `json:"appName"`
TargetDb string `json:"targetDb"`
CallUser string `json:"callUser"`
DbName string `json:"dbName"`
CallType string `json:"callType"`
}

// NewDbPrivConfInject create DbPrivConfInject object
func NewDbPrivConfInject(bcsDbPrivConfLister listers.BcsDbPrivConfigLister, injects options.InjectOptions, dbPrivSecret *corev1.Secret) K8sInject { // nolint
k8sInject := &DbPrivConfInject{
Expand Down Expand Up @@ -69,10 +78,12 @@ func (dbPrivConf *DbPrivConfInject) InjectContent(pod *corev1.Pod) ([]PatchOpera
}
}
if len(matchedBdpcs) > 0 {
initContainers := pod.Spec.InitContainers
for i, matched := range matchedBdpcs {
initContainers = append(initContainers, dbPrivConf.generateInitContainer(i, matched))
container, err := dbPrivConf.generateInitContainer(matchedBdpcs)
if err != nil {
blog.Errorf("generateInitContainer error %s", err.Error())
return nil, err
}
initContainers := append(pod.Spec.InitContainers, container)
patch = append(patch, PatchOperation{
Op: "replace",
Path: "/spec/initContainers",
Expand All @@ -84,23 +95,39 @@ func (dbPrivConf *DbPrivConfInject) InjectContent(pod *corev1.Pod) ([]PatchOpera
}

// generateInitContainer generate an init-container with BcsDbPrivConfig
func (dbPrivConf *DbPrivConfInject) generateInitContainer(i int, matched *v1.BcsDbPrivConfig) corev1.Container {
var fieldPath, callType string
func (dbPrivConf *DbPrivConfInject) generateInitContainer(configs []*v1.BcsDbPrivConfig) (corev1.Container, error) {
var envs = make([]DBPrivEnv, 0)
var fieldPath string

for _, config := range configs {
var env = DBPrivEnv{
AppName: config.Spec.AppName,
TargetDb: config.Spec.TargetDb,
CallUser: config.Spec.CallUser,
DbName: config.Spec.DbName,
}
if config.Spec.DbType == "mysql" {
env.CallType = "mysql_ignoreCC"
} else if config.Spec.DbType == "spider" {
env.CallType = "spider_ignoreCC"
}
envs = append(envs, env)
}

envstr, err := json.Marshal(envs)
if err != nil {
blog.Errorf("convert DBPrivEnv array to json string failed: %s", err.Error())
return corev1.Container{}, err
}

if dbPrivConf.Injects.DbPriv.NetworkType == "overlay" {
fieldPath = "status.hostIP"
} else if dbPrivConf.Injects.DbPriv.NetworkType == "underlay" {
fieldPath = "status.podIP"
}

if matched.Spec.DbType == "mysql" {
callType = "mysql_ignoreCC"
} else if matched.Spec.DbType == "spider" {
callType = "spider_ignoreCC"
}

initContainer := corev1.Container{
Name: "db-privilege" + "-" + strconv.Itoa(i),
Name: "db-privilege",
Image: dbPrivConf.Injects.DbPriv.InitContainerImage,
Env: []corev1.EnvVar{
{
Expand Down Expand Up @@ -128,27 +155,11 @@ func (dbPrivConf *DbPrivConfInject) generateInitContainer(i int, matched *v1.Bcs
Value: string(dbPrivConf.DbPrivSecret.Data["sdk-operator"]),
},
{
Name: "io_tencent_bcs_db_privilege_app_name",
Value: matched.Spec.AppName,
},
{
Name: "io_tencent_bcs_db_privilege_target",
Value: matched.Spec.TargetDb,
},
{
Name: "io_tencent_bcs_db_privilege_db_name",
Value: matched.Spec.DbName,
},
{
Name: "io_tencent_bcs_db_privilege_call_user",
Value: matched.Spec.CallUser,
},
{
Name: "io_tencent_bcs_db_privilege_db_type",
Value: callType,
Name: "io_tencent_bcs_db_privilege_env",
Value: string(envstr),
},
},
}

return initContainer
return initContainer, nil
}