mirrors/kyverno
1
0
Fork 0
mirror of https://github.com/kyverno/kyverno.git synced 2024-12-14 11:57:48 +00:00
Code Activity

fix: correct tombstone usage (#3718)

Browse source 
Signed-off-by: Charles-Edouard Brétéché <charled.breteche@gmail.com>
This commit is contained in:
Charles-Edouard Brétéché 2022-04-29 09:50:17 +02:00 committed by GitHub
parent 24ed931f42
commit 61a1d40e5e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkg/background/generate/cleanup/controller.go
View file

@ -129,7 +129,7 @@ func (c *Controller) deletePolicy(obj interface{}) {
logger.Info("couldn't get object from tombstone", "obj", obj)
return
}
_, ok = tombstone.Obj.(*kyverno.ClusterPolicy)
p, ok = tombstone.Obj.(*kyverno.ClusterPolicy)
if !ok {
logger.Info("Tombstone contained object that is not a Generate Request", "obj", obj)
return
@ -194,8 +194,7 @@ func (c *Controller) deleteUR(obj interface{}) {
logger.Info("Couldn't get object from tombstone", "obj", obj)
return
}
_, ok = tombstone.Obj.(*urkyverno.UpdateRequest)
gr, ok = tombstone.Obj.(*urkyverno.UpdateRequest)
if !ok {
logger.Info("ombstone contained object that is not a Generate Request", "obj", obj)
return

4
pkg/background/update_request_controller.go
View file

@ -320,7 +320,7 @@ func (c *Controller) deleteGR(obj interface{}) {
logger.Info("Couldn't get object from tombstone", "obj", obj)
return
}
_, ok = tombstone.Obj.(*kyverno.GenerateRequest)
gr, ok = tombstone.Obj.(*kyverno.GenerateRequest)
if !ok {
logger.Info("tombstone contained object that is not a Generate Request CR", "obj", obj)
return
@ -377,7 +377,7 @@ func (c *Controller) deleteUR(obj interface{}) {
logger.Info("Couldn't get object from tombstone", "obj", obj)
return
}
_, ok = tombstone.Obj.(*urkyverno.UpdateRequest)
gr, ok = tombstone.Obj.(*urkyverno.UpdateRequest)
if !ok {
logger.Info("tombstone contained object that is not a Generate Request CR", "obj", obj)
return

2
pkg/config/dynamicconfig.go
View file

@ -213,7 +213,7 @@ func (cd *ConfigData) deleteCM(obj interface{}) {
logger.Info("failed to get object from tombstone")
return
}
_, ok = tombstone.Obj.(*v1.ConfigMap)
cm, ok = tombstone.Obj.(*v1.ConfigMap)
if !ok {
logger.Info("Tombstone contained object that is not a ConfigMap", "object", obj)
return

2
pkg/policy/policy_controller.go
View file

@ -260,7 +260,6 @@ func (pc *PolicyController) deletePolicy(obj interface{}) {
logger.Info("couldn't get object from tombstone", "obj", obj)
return
}
p, ok = tombstone.Obj.(*kyverno.ClusterPolicy)
if !ok {
logger.Info("tombstone container object that is not a policy", "obj", obj)
@ -355,7 +354,6 @@ func (pc *PolicyController) deleteNsPolicy(obj interface{}) {
logger.Info("couldn't get object from tombstone", "obj", obj)
return
}
p, ok = tombstone.Obj.(*kyverno.Policy)
if !ok {
logger.Info("tombstone container object that is not a policy", "obj", obj)