From 84c09d70e6c552dea5b7cc309a5d9798e6834b16 Mon Sep 17 00:00:00 2001 From: "changyanhao.cyh" Date: Fri, 22 Dec 2023 16:21:12 +0800 Subject: [PATCH] style(gracedelete): optimize klog and annotation --- pkg/webhook/server/generic/pod/gracedelete/webhook.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkg/webhook/server/generic/pod/gracedelete/webhook.go b/pkg/webhook/server/generic/pod/gracedelete/webhook.go index 290f8886..bd778762 100644 --- a/pkg/webhook/server/generic/pod/gracedelete/webhook.go +++ b/pkg/webhook/server/generic/pod/gracedelete/webhook.go @@ -25,7 +25,7 @@ import ( corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/types" - "k8s.io/klog" + "k8s.io/klog/v2" "kusionstack.io/operating/apis/apps/v1alpha1" "kusionstack.io/operating/pkg/controllers/poddeletion" "kusionstack.io/operating/pkg/controllers/utils/podopslifecycle" @@ -47,6 +47,8 @@ func (gd *GraceDelete) Name() string { } func (gd *GraceDelete) Validating(ctx context.Context, c client.Client, oldPod, newPod *corev1.Pod, operation admissionv1.Operation) error { + // GraceDeleteWebhook FeatureGate defaults to false + // Add '--feature-gates=GraceDeleteWebhook=true' to container args, to enable gracedelete webhook if !feature.DefaultFeatureGate.Enabled(features.GraceDeleteWebhook) || operation != admissionv1.Delete { return nil } @@ -58,7 +60,7 @@ func (gd *GraceDelete) Validating(ctx context.Context, c client.Client, oldPod, return err } - klog.Info("pod is deleted") + klog.V(2).Info("pod is deleted") return nil } if !utils.ControlledByKusionStack(pod) {