fix: auth processUpdate when phase is not terminating (#105)

tkestack · Dec 27, 2019 · e36a99f · e36a99f
1 parent 930cb63
commit e36a99f
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 17 deletions.
diff --git a/pkg/auth/controller/group/group_controller.go b/pkg/auth/controller/group/group_controller.go
@@ -208,13 +208,13 @@ func (c *Controller) syncItem(key string) error {
  case err != nil:
  log.Warn("Unable to retrieve group from store", log.String("group name", key), log.Err(err))
  default:
- if group.Status.Phase == v1.GroupActive {
- err = c.processUpdate(group, key)
- } else if group.Status.Phase == v1.GroupTerminating {
+ if group.Status.Phase == v1.GroupTerminating {
  err = c.groupedResourcesDeleter.Delete(key)
+ } else {
+ err = c.processUpdate(group, key)
  }
 
- //log.Info("Handle group", log.Any("group", group))
+ log.Debug("Handle group", log.Any("group", group))
  }
  return err
 }

diff --git a/pkg/auth/controller/localidentity/localidentity_controller.go b/pkg/auth/controller/localidentity/localidentity_controller.go
@@ -20,15 +20,16 @@ package localidentity
 
 import (
  "fmt"
+ "reflect"
+ "time"
+
  "github.com/casbin/casbin/v2"
  "k8s.io/apimachinery/pkg/api/errors"
  "k8s.io/apimachinery/pkg/util/runtime"
  "k8s.io/apimachinery/pkg/util/wait"
  "k8s.io/client-go/tools/cache"
  "k8s.io/client-go/util/workqueue"
- "reflect"
- "time"
- "tkestack.io/tke/api/auth/v1"
+ v1 "tkestack.io/tke/api/auth/v1"
  clientset "tkestack.io/tke/api/client/clientset/versioned"
  authv1informer "tkestack.io/tke/api/client/informers/externalversions/auth/v1"
  authv1lister "tkestack.io/tke/api/client/listers/auth/v1"
@@ -203,12 +204,12 @@ func (c *Controller) syncItem(key string) error {
  case err != nil:
  log.Warn("Unable to retrieve localIdentity from store", log.String("localIdentity name", key), log.Err(err))
  default:
- // Only check deleting localIentity for now
+ // Only check deleting localIdentity for now
  if localIdentity.Status.Phase == v1.LocalIdentityDeleting {
  err = c.localIdentityedResourcesDeleter.Delete(key)
  }
 
- //log.Info("Handle localIdentity", log.Any("localIdentity", localIdentity))
+ log.Debug("Handle localIdentity", log.Any("localIdentity", localIdentity))
  }
  return err
 }
diff --git a/pkg/auth/controller/policy/policy_controller.go b/pkg/auth/controller/policy/policy_controller.go
@@ -209,13 +209,13 @@ func (c *Controller) syncItem(key string) error {
  case err != nil:
  log.Warn("Unable to retrieve policy from store", log.String("policy name", key), log.Err(err))
  default:
- if policy.Status.Phase == v1.PolicyActive {
- err = c.processUpdate(policy, key)
- } else if policy.Status.Phase == v1.PolicyTerminating {
+ if policy.Status.Phase == v1.PolicyTerminating {
  err = c.policyedResourcesDeleter.Delete(key)
+ } else {
+ err = c.processUpdate(policy, key)
  }
 
- //log.Info("Handle policy", log.Any("policy", policy))
+ log.Debug("Handle policy", log.Any("policy", policy))
  }
  return err
 }

diff --git a/pkg/auth/controller/role/role_controller.go b/pkg/auth/controller/role/role_controller.go
@@ -208,13 +208,13 @@ func (c *Controller) syncItem(key string) error {
  case err != nil:
  log.Warn("Unable to retrieve role from store", log.String("role name", key), log.Err(err))
  default:
- if role.Status.Phase == v1.RoleActive {
- err = c.processUpdate(role, key)
- } else if role.Status.Phase == v1.RoleTerminating {
+ if role.Status.Phase == v1.RoleTerminating {
  err = c.roleedResourcesDeleter.Delete(key)
+ } else {
+ err = c.processUpdate(role, key)
  }
 
- //log.Info("Handle role", log.Any("role", role))
+ log.Debug("Handle role", log.Any("role", role))
  }
  return err
 }