devlopment branch (#1736)

This commit is contained in:
zryfish
2020-01-02 20:52:00 +08:00
committed by GitHub
parent ff0ffe8650
commit eceadec69c
440 changed files with 61524 additions and 3699 deletions

View File

@@ -799,8 +799,8 @@ 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")
if err == clientset.ErrClientSetNotEnabled {
klog.Warning("mysql is not enable")
return nil
}
return err
@@ -808,11 +808,10 @@ func deleteUserInDevOps(username string) error {
dp, err := clientset.ClientSets().Devops()
if err != nil {
if _, ok := err.(clientset.ClientSetNotEnabledError); ok {
if err == clientset.ErrClientSetNotEnabled {
klog.Warning("devops client is not enable")
return nil
}
return err
}