when devops is disabled, there is no need to clean up the devops data.

Signed-off-by: runzexia <runzexia@yunify.com>
This commit is contained in:
runzexia
2019-09-12 14:16:26 +08:00
parent 495785092e
commit 95a9d5ff20
2 changed files with 20 additions and 3 deletions

View File

@@ -189,7 +189,6 @@ func CreateClientSet(conf *apiserverconfig.Config, stopCh <-chan struct{}) error
SetPrometheusOptions(conf.MonitoringOptions).
SetRedisOptions(conf.RedisOptions)
client.NewClientSetFactory(csop, stopCh)
return nil

View File

@@ -598,15 +598,35 @@ func DeleteUser(username string) error {
klog.Errorln("delete user terminal pod failed", username, err)
}
if err := deleteUserInDevOps(username); err != nil {
klog.Errorln("delete user in devops failed", username, err)
}
return nil
}
// deleteUserInDevOps is used to clean up user data of devops, such as permission rules
func deleteUserInDevOps(username string) error {
devopsDb, err := clientset.ClientSets().MySQL()
if err != nil {
if _, ok := err.(clientset.ClientSetNotEnabledError); ok {
klog.Warning("devops client is not enable")
return nil
}
return err
}
dp, err := clientset.ClientSets().Devops()
if err != nil {
if _, ok := err.(clientset.ClientSetNotEnabledError); ok {
klog.Warning("devops client is not enable")
return nil
}
return err
}
jenkinsClient := dp.Jenkins()
_, err = devopsDb.DeleteFrom(devops.DevOpsProjectMembershipTableName).
@@ -623,9 +643,7 @@ func DeleteUser(username string) error {
klog.Errorf("%+v", err)
return err
}
return nil
}
func deleteRoleBindings(username string) error {