mirrors/kyverno
mirrors/kyverno
1
0
Fork 0
mirror of https://github.com/kyverno/kyverno.git synced 2025-03-28 10:28:36 +00:00
Code Activity

Added propagationPolicy to TTL controller for resource deletion (#11207)

Browse source 
* Added propagationPolicy to TTL controller for resource deletion

Signed-off-by: ShivamJha2436 <shivamkumar87148@gmail.com>

* Added per-resource deletion policy with optional global default

Signed-off-by: ShivamJha2436 <shivamkumar87148@gmail.com>

* Fix: Added nil check for annotations to prevent runtime errors

Signed-off-by: ShivamJha2436 <shivamkumar87148@gmail.com>

* Fix: Moved logic for retrieving propagation policy from annotations to a dedicated function

Signed-off-by: ShivamJha2436 <shivamkumar87148@gmail.com>

* Fix: Resolve merge conflict in controller.go and update propagation policy handling
- Added missing gvr field from main branch
- Improved annotation naming as per team discussion
- Moved propagation policy logic closer to usage

Signed-off-by: ShivamJha2436 <shivamkumar87148@gmail.com>

* Simplified propagation policy logic

Signed-off-by: ShivamJha2436 <shivamkumar87148@gmail.com>

* Add unit tests for controller.go

Signed-off-by: ShivamJha2436 <shivamkumar87148@gmail.com>

* Removed the test file for controller.go and fixed the lint error

Signed-off-by: ShivamJha2436 <shivamkumar87148@gmail.com>

---------

Signed-off-by: ShivamJha2436 <shivamkumar87148@gmail.com>
This commit is contained in:
Shivam Kumar 2024-09-27 20:15:09 +05:30 • committed by GitHub
parent e2ffdef81c
commit 48b7a68733
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 38 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
api/kyverno/constants.go
View file

@ -9,11 +9,12 @@ const (
LabelCleanupTtl = "cleanup.kyverno.io/ttl"
LabelWebhookManagedBy = "webhook.kyverno.io/managed-by"
// Well known annotations
AnnotationAutogenControllers = "pod-policies.kyverno.io/autogen-controllers"
AnnotationImageVerify = "kyverno.io/verify-images"
AnnotationPolicyCategory = "policies.kyverno.io/category"
AnnotationPolicyScored = "policies.kyverno.io/scored"
AnnotationPolicySeverity = "policies.kyverno.io/severity"
AnnotationAutogenControllers = "pod-policies.kyverno.io/autogen-controllers"
AnnotationImageVerify = "kyverno.io/verify-images"
AnnotationPolicyCategory = "policies.kyverno.io/category"
AnnotationPolicyScored = "policies.kyverno.io/scored"
AnnotationPolicySeverity = "policies.kyverno.io/severity"
AnnotationCleanupPropagationPolicy = "cleanup.kyverno.io/propagation-policy"
// Well known values
ValueKyvernoApp = "kyverno"
ValueTtlDateTimeLayout = "2006-01-02T150405Z"

33
pkg/controllers/ttl/controller.go
View file

@ -118,6 +118,34 @@ func (c *controller) deregisterEventHandlers() {
c.logger.V(3).Info("deregistered event handlers")
}
// Function to determine the deletion propagation policy
func (c *controller) determinePropagationPolicy(metaObj metav1.Object, logger logr.Logger) *metav1.DeletionPropagation {
annotations := metaObj.GetAnnotations()
var policy *metav1.DeletionPropagation
if annotations != nil {
annotationPolicy := annotations["kyverno.AnnotationCleanupPropagationPolicy"]
if annotationPolicy == "" {
switch annotationPolicy {
case "Foreground":
fg := metav1.DeletePropagationForeground
policy = &fg
case "Background":
bg := metav1.DeletePropagationBackground
policy = &bg
case "Orphan":
orphan := metav1.DeletePropagationOrphan
policy = &orphan
case "":
return nil
default:
logger.Info("Unknown propagationPolicy annotation, no global policy found", "policy", annotationPolicy)
}
}
}
return policy
}
func (c *controller) reconcile(ctx context.Context, logger logr.Logger, itemKey string, _, _ string) error {
namespace, name, err := cache.SplitMetaNamespaceKey(itemKey)
if err != nil {
@ -164,7 +192,10 @@ func (c *controller) reconcile(ctx context.Context, logger logr.Logger, itemKey
return nil
}
if time.Now().After(deletionTime) {
err = c.client.Namespace(namespace).Delete(context.Background(), metaObj.GetName(), metav1.DeleteOptions{})
deleteOptions := metav1.DeleteOptions{
PropagationPolicy: c.determinePropagationPolicy(metaObj, logger),
}
err = c.client.Namespace(namespace).Delete(context.Background(), metaObj.GetName(), deleteOptions)
if err != nil {
logger.Error(err, "failed to delete resource")
if c.metrics.ttlFailureTotal != nil {