Skip to content

Commit 302b9b5

Browse files
committed
feat: rollout webhook add exec time
1 parent bcc499f commit 302b9b5

File tree

4 files changed

+10
-4
lines changed

4 files changed

+10
-4
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ require (
2323
k8s.io/klog/v2 v2.130.1
2424
k8s.io/kubernetes v1.22.2
2525
k8s.io/utils v0.0.0-20241210054802-24370beab758
26-
kusionstack.io/kube-api v0.7.4-0.20251013070018-4c09604521e4
26+
kusionstack.io/kube-api v0.7.4-0.20251118090915-fd0f1c418628
2727
kusionstack.io/kube-utils v0.2.1-0.20250613035327-11e9cdaec9d6
2828
kusionstack.io/resourceconsist v0.0.4
2929
sigs.k8s.io/controller-runtime v0.21.0

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1021,8 +1021,8 @@ k8s.io/sample-apiserver v0.22.2/go.mod h1:h+/DIV5EmuNq4vfPr5TSXy9mIBVXXlPAKQMPbj
10211021
k8s.io/system-validators v1.5.0/go.mod h1:bPldcLgkIUK22ALflnsXk8pvkTEndYdNuaHH6gRrl0Q=
10221022
k8s.io/utils v0.0.0-20240102154912-e7106e64919e h1:eQ/4ljkx21sObifjzXwlPKpdGLrCfRziVtos3ofG/sQ=
10231023
k8s.io/utils v0.0.0-20240102154912-e7106e64919e/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
1024-
kusionstack.io/kube-api v0.7.4-0.20251013070018-4c09604521e4 h1:VQS8BsRs7jXTY+wwtRjOIfSxDq/Mu7ZIaFZ9CxRIe6U=
1025-
kusionstack.io/kube-api v0.7.4-0.20251013070018-4c09604521e4/go.mod h1:e1jtrQH2LK5fD2nTyfIXG6nYrYbU8VXShRxTRwVPaLk=
1024+
kusionstack.io/kube-api v0.7.4-0.20251118090915-fd0f1c418628 h1:MvttNk/rbyIgBch+1OutcDOoOsFjWVFvvdnepCqvt0w=
1025+
kusionstack.io/kube-api v0.7.4-0.20251118090915-fd0f1c418628/go.mod h1:e1jtrQH2LK5fD2nTyfIXG6nYrYbU8VXShRxTRwVPaLk=
10261026
kusionstack.io/kube-utils v0.2.1-0.20250613035327-11e9cdaec9d6 h1:HYE6Wa8EzSlA6UmaTLtNKUgkB2mmasp6Ul69d3/SpK0=
10271027
kusionstack.io/kube-utils v0.2.1-0.20250613035327-11e9cdaec9d6/go.mod h1:5Uy3GCJ1JEGqZw/Sp/uVnHBJN1t9wjY6USPSZ9s4idk=
10281028
kusionstack.io/resourceconsist v0.0.4 h1:wRqLJuNh8O4TT6p0uOklFpHUKiRdRxcAH71Sw/q9LhE=

pkg/controllers/rolloutrun/executor/do_hook.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import (
44
"time"
55

66
"github.com/samber/lo"
7+
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
78
"k8s.io/utils/ptr"
89
rolloutv1alpha1 "kusionstack.io/kube-api/rollout/v1alpha1"
910

@@ -56,6 +57,9 @@ func (r *webhookExecutorImpl) Do(ctx *ExecutorContext, hookType rolloutv1alpha1.
5657
// shorten long message
5758
hookResult.Message = utils.Abbreviate(hookResult.Message, 1024)
5859

60+
if hookResult.State == rolloutv1alpha1.WebhookCompleted {
61+
hookResult.FinishTime = ptr.To(metav1.Now())
62+
}
5963
ctx.SetWebhookStatus(rolloutv1alpha1.RolloutWebhookStatus(*hookResult))
6064

6165
if hookResult.State == rolloutv1alpha1.WebhookOnHold &&

pkg/controllers/rolloutrun/webhook/worker.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import (
2020
"sync"
2121
"time"
2222

23+
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2324
"k8s.io/apimachinery/pkg/types"
2425
"k8s.io/apimachinery/pkg/util/runtime"
2526
"k8s.io/utils/ptr"
@@ -88,7 +89,8 @@ func newWorker(m *manager, key types.UID, webhook rolloutv1alpha1.RolloutWebhook
8889
}
8990
// init result
9091
w.lastResult = Result{
91-
State: rolloutv1alpha1.WebhookRunning,
92+
State: rolloutv1alpha1.WebhookRunning,
93+
StartTime: ptr.To(metav1.Now()),
9294
CodeReasonMessage: rolloutv1alpha1.CodeReasonMessage{
9395
Code: rolloutv1alpha1.WebhookReviewCodeProcessing,
9496
Reason: "Processing",

0 commit comments

Comments
 (0)