fix, mutating when pod status chaged (#63)

KusionStack · Aug 28, 2023 · 43d35c0 · 43d35c0
1 parent 49126be
commit 43d35c0
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/config/webhook/webhook.yaml b/config/webhook/webhook.yaml
@@ -23,6 +23,7 @@ webhooks:
           - DELETE
         resources:
           - pods
+          - pods/status
         scope: '*'
     objectSelector:
       matchExpressions:

diff --git a/pkg/webhook/server/generic/generic_webhooks.go b/pkg/webhook/server/generic/generic_webhooks.go
@@ -36,7 +36,10 @@ var MutatingTypeHandlerMap = map[string]webhookdmission.DispatchHandler{}
 var ValidatingTypeHandlerMap = map[string]webhookdmission.DispatchHandler{}
 
 func init() {
-	MutatingTypeHandlerMap["Pod"] = pod.NewMutatingHandler()
+	podMutatingHandler := pod.NewMutatingHandler()
+	MutatingTypeHandlerMap["Pod"] = podMutatingHandler
+	MutatingTypeHandlerMap["Pod/status"] = podMutatingHandler
+
 	ValidatingTypeHandlerMap["Pod"] = pod.NewValidatingHandler()
 
 	MutatingTypeHandlerMap["RuleSet"] = ruleset.NewMutatingHandler()

diff --git a/pkg/webhook/server/generic/pod/opslifecycle/webhook.go b/pkg/webhook/server/generic/pod/opslifecycle/webhook.go
@@ -64,7 +64,7 @@ func New() *OpsLifecycle {
 		readyToUpgrade: hasNoBlockingFinalizer,
 		isPodReady:     controllerutils.IsPodReady,
 		timeLabelValue: func() string {
-			return strconv.FormatInt(time.Now().Unix(), 10)
+			return strconv.FormatInt(time.Now().UnixNano(), 10)
 		},
 	}
 }