From 50c2d5d2272bbca4a888f18193b3126288876373 Mon Sep 17 00:00:00 2001
From: ShutingZhao <shuting@nirmata.com>
Date: Tue, 13 Aug 2024 19:03:55 +0800
Subject: [PATCH] chore: remove commented code

Signed-off-by: ShutingZhao <shuting@nirmata.com>
---
 .github/actions/kyverno-logs/action.yaml            |  4 ----
 api/kyverno/v2/constants.go                         |  6 +-----
 pkg/background/common/labels.go                     |  6 ------
 .../generated-resources.yaml                        | 13 -------------
 .../generated-resources.yaml                        | 13 -------------
 5 files changed, 1 insertion(+), 41 deletions(-)

diff --git a/.github/actions/kyverno-logs/action.yaml b/.github/actions/kyverno-logs/action.yaml
index 425c528afcb0..10ccde215621 100644
--- a/.github/actions/kyverno-logs/action.yaml
+++ b/.github/actions/kyverno-logs/action.yaml
@@ -14,10 +14,6 @@ runs:
       run: |
         kubectl -n kyverno get pod
         kubectl -n kyverno describe pod | grep -i events -A10
-    - shell: bash
-      run: |
-        kubectl -n kyverno get ur
-        kubectl -n kyverno get ur -o yaml
     - shell: bash
       run: |
         kubectl -n kyverno logs deploy/kyverno-admission-controller --all-containers
diff --git a/api/kyverno/v2/constants.go b/api/kyverno/v2/constants.go
index b1c753109972..d10de6903c6a 100644
--- a/api/kyverno/v2/constants.go
+++ b/api/kyverno/v2/constants.go
@@ -9,10 +9,6 @@ const (
 	URMutateTriggerAPIVersionLabel = "mutate.updaterequest.kyverno.io/trigger-apiversion"
 
 	// URGeneratePolicyLabel adds the policy name to URs for generate policies
-	URGeneratePolicyLabel = "generate.kyverno.io/policy-name"
-	// URGenerateResourceNameLabel    = "generate.kyverno.io/resource-name"
-	// URGenerateResourceUIDLabel     = "generate.kyverno.io/resource-uid"
-	// URGenerateResourceNSLabel      = "generate.kyverno.io/resource-namespace"
-	// URGenerateResourceKindLabel    = "generate.kyverno.io/resource-kind"
+	URGeneratePolicyLabel          = "generate.kyverno.io/policy-name"
 	URGenerateRetryCountAnnotation = "generate.kyverno.io/retry-count"
 )
diff --git a/pkg/background/common/labels.go b/pkg/background/common/labels.go
index 6fcd5f49d5d7..8157c243ffce 100644
--- a/pkg/background/common/labels.go
+++ b/pkg/background/common/labels.go
@@ -59,12 +59,6 @@ func GenerateLabelsSet(policyKey string) pkglabels.Set {
 	set := pkglabels.Set{
 		kyvernov2.URGeneratePolicyLabel: policyName,
 	}
-	// isNil := trigger == nil || (reflect.ValueOf(trigger).Kind() == reflect.Ptr && reflect.ValueOf(trigger).IsNil())
-	// if !isNil {
-	// set[kyvernov2.URGenerateResourceUIDLabel] = string(trigger.GetUID())
-	// set[kyvernov2.URGenerateResourceNSLabel] = trigger.GetNamespace()
-	// set[kyvernov2.URGenerateResourceKindLabel] = trigger.GetKind()
-	// }
 	return set
 }
 
diff --git a/test/conformance/chainsaw/generate/clusterpolicy/standard/existing/different-generate-existing-values-reorder/generated-resources.yaml b/test/conformance/chainsaw/generate/clusterpolicy/standard/existing/different-generate-existing-values-reorder/generated-resources.yaml
index 740d5d289f31..31a31fa1b65d 100644
--- a/test/conformance/chainsaw/generate/clusterpolicy/standard/existing/different-generate-existing-values-reorder/generated-resources.yaml
+++ b/test/conformance/chainsaw/generate/clusterpolicy/standard/existing/different-generate-existing-values-reorder/generated-resources.yaml
@@ -1,16 +1,3 @@
-# apiVersion: networking.k8s.io/v1
-# kind: NetworkPolicy
-# metadata:
-#   labels:
-#     created-by: kyverno
-#   name: default-deny
-#   namespace: red-ns
-# spec:
-#   podSelector: {}
-#   policyTypes:
-#   - Ingress
-#   - Egress
----
 apiVersion: networking.k8s.io/v1
 kind: NetworkPolicy
 metadata:
diff --git a/test/conformance/chainsaw/generate/clusterpolicy/standard/existing/different-generate-existing-values/generated-resources.yaml b/test/conformance/chainsaw/generate/clusterpolicy/standard/existing/different-generate-existing-values/generated-resources.yaml
index 740d5d289f31..31a31fa1b65d 100644
--- a/test/conformance/chainsaw/generate/clusterpolicy/standard/existing/different-generate-existing-values/generated-resources.yaml
+++ b/test/conformance/chainsaw/generate/clusterpolicy/standard/existing/different-generate-existing-values/generated-resources.yaml
@@ -1,16 +1,3 @@
-# apiVersion: networking.k8s.io/v1
-# kind: NetworkPolicy
-# metadata:
-#   labels:
-#     created-by: kyverno
-#   name: default-deny
-#   namespace: red-ns
-# spec:
-#   podSelector: {}
-#   policyTypes:
-#   - Ingress
-#   - Egress
----
 apiVersion: networking.k8s.io/v1
 kind: NetworkPolicy
 metadata: