From eef15dff89e8b71c10155db8d54f5e11a3b9ab28 Mon Sep 17 00:00:00 2001
From: NoSkillGirl <singhpooja240393@gmail.com>
Date: Tue, 29 Dec 2020 00:05:29 +0530
Subject: [PATCH] changed synchronize label
---
pkg/generate/cleanup/controller.go | 2 +-
pkg/generate/generate.go | 14 +++++++-------
pkg/generate/generate_controller.go | 2 +-
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/pkg/generate/cleanup/controller.go b/pkg/generate/cleanup/controller.go
index f5d772ebcd..11dbcd50d2 100644
--- a/pkg/generate/cleanup/controller.go
+++ b/pkg/generate/cleanup/controller.go
@@ -188,7 +188,7 @@ func (c *Controller) deleteGR(obj interface{}) {
return
}
- if r != nil && r.GetLabels()["generate.kyverno.io/synchronize"] == "enable" {
+ if r != nil && r.GetLabels()["policy.kyverno.io//synchronize"] == "enable" {
if err := c.client.DeleteResource(r.GetAPIVersion(), r.GetKind(), r.GetNamespace(), r.GetName(), false); err != nil && !apierrors.IsNotFound(err) {
logger.Error(err, "failed to delete the generated resource", "resource", r.GetName())
return
diff --git a/pkg/generate/generate.go b/pkg/generate/generate.go
index 678c711468..15e7baab54 100644
--- a/pkg/generate/generate.go
+++ b/pkg/generate/generate.go
@@ -83,7 +83,7 @@ func (c *Controller) applyGenerate(resource unstructured.Unstructured, gr kyvern
continue
}
- if resp != nil && resp.GetLabels()["generate.kyverno.io/synchronize"] == "enable" {
+ if resp != nil && resp.GetLabels()["policy.kyverno.io/synchronize"] == "enable" {
if err := c.client.DeleteResource(resp.GetAPIVersion(), resp.GetKind(), resp.GetNamespace(), resp.GetName(), false); err != nil {
logger.Error(err, "generated resource is not deleted", "Resource", e.Name)
}
@@ -377,14 +377,14 @@ func applyRule(log logr.Logger, client *dclient.Client, rule kyverno.Rule, resou
manageLabels(newResource, resource)
// Add Synchronize label
label := newResource.GetLabels()
- label["generate.kyverno.io/policy-name"] = policy
- label["generate.kyverno.io/gr-name"] = gr.Name
+ label["policy.kyverno.io/policy-name"] = policy
+ label["policy.kyverno.io/gr-name"] = gr.Name
delete(label, "generate.kyverno.io/clone-policy-name")
if mode == Create {
if rule.Generation.Synchronize {
- label["generate.kyverno.io/synchronize"] = "enable"
+ label["policy.kyverno.io/synchronize"] = "enable"
} else {
- label["generate.kyverno.io/synchronize"] = "disable"
+ label["policy.kyverno.io/synchronize"] = "disable"
}
// Reset resource version
@@ -400,9 +400,9 @@ func applyRule(log logr.Logger, client *dclient.Client, rule kyverno.Rule, resou
} else if mode == Update {
if rule.Generation.Synchronize {
- label["generate.kyverno.io/synchronize"] = "enable"
+ label["policy.kyverno.io/synchronize"] = "enable"
} else {
- label["generate.kyverno.io/synchronize"] = "disable"
+ label["policy.kyverno.io/synchronize"] = "disable"
}
if rule.Generation.Synchronize {
diff --git a/pkg/generate/generate_controller.go b/pkg/generate/generate_controller.go
index 829501b916..228d366de2 100644
--- a/pkg/generate/generate_controller.go
+++ b/pkg/generate/generate_controller.go
@@ -239,7 +239,7 @@ func (c *Controller) deleteGR(obj interface{}) {
continue
}
- if r != nil && r.GetLabels()["generate.kyverno.io/synchronize"] == "enable" {
+ if r != nil && r.GetLabels()["policy.kyverno.io/synchronize"] == "enable" {
if err := c.client.DeleteResource(r.GetAPIVersion(), r.GetKind(), r.GetNamespace(), r.GetName(), false); err != nil && !apierrors.IsNotFound(err) {
logger.Error(err, "Generated resource is not deleted", "Resource", r.GetName())
}