Skip to content

Commit 727e862

Browse files
committed
fix: bump kube api
version && support webhook
1 parent 691200c commit 727e862

5 files changed

Lines changed: 6 additions & 6 deletions

File tree

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.5-0.20260306081812-18b6128bc6fb
26+
kusionstack.io/kube-api v0.7.5-0.20260413084915-e038d5ff4fea
2727
kusionstack.io/kube-utils v0.2.1-0.20251125083928-1134a582b341
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.5-0.20260306081812-18b6128bc6fb h1:ODxnOte9umQL5yjsNjnGj+OmNqZRx/NtjaYgJteemW8=
1025-
kusionstack.io/kube-api v0.7.5-0.20260306081812-18b6128bc6fb/go.mod h1:e1jtrQH2LK5fD2nTyfIXG6nYrYbU8VXShRxTRwVPaLk=
1024+
kusionstack.io/kube-api v0.7.5-0.20260413084915-e038d5ff4fea h1:fQ6jQ5QDOPBthYBcz2ibu0F6QbCGMOzcWZLGO2mGZhY=
1025+
kusionstack.io/kube-api v0.7.5-0.20260413084915-e038d5ff4fea/go.mod h1:e1jtrQH2LK5fD2nTyfIXG6nYrYbU8VXShRxTRwVPaLk=
10261026
kusionstack.io/kube-utils v0.2.1-0.20251125083928-1134a582b341 h1:dnMtHJvIpU3338WpqGiNN2qXWZFiXaoiuzR9jwhvWpg=
10271027
kusionstack.io/kube-utils v0.2.1-0.20251125083928-1134a582b341/go.mod h1:Lz5SBYWg9+jw+kP0CAyf/b62D5DeUPf6+jE1d0WC4cI=
10281028
kusionstack.io/resourceconsist v0.0.4 h1:wRqLJuNh8O4TT6p0uOklFpHUKiRdRxcAH71Sw/q9LhE=

pkg/controllers/rollout/inline_strategy.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ func constructRolloutRunFromInlineStrategy(
5656
Kind: obj.Spec.WorkloadRef.Kind,
5757
},
5858
TrafficTopologyRefs: obj.Spec.TrafficTopologyRefs,
59-
Webhooks: []rolloutv1alpha1.RolloutWebhook{}, // Empty for inline strategy
59+
Webhooks: obj.Spec.Webhooks,
6060
},
6161
}
6262

pkg/controllers/rollout/rollout_controller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -722,7 +722,7 @@ func (r *RolloutReconciler) applyOneTimeStrategy(ctx context.Context, obj *rollo
722722
return nil
723723
})
724724
if err != nil {
725-
r.recordCondition(obj, newStatus, rolloutv1alpha1.RolloutConditionTrigger, metav1.ConditionFalse, "FailedUpdate", fmt.Sprintf("failed to apply one time stratey to RolloutRun: %v", err))
725+
r.recordCondition(obj, newStatus, rolloutv1alpha1.RolloutConditionTrigger, metav1.ConditionFalse, "FailedUpdate", fmt.Sprintf("failed to apply one time strategy to RolloutRun: %v", err))
726726
// allow retry
727727
return err
728728
}

pkg/controllers/rollout/rollout_controller_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -614,7 +614,7 @@ func (s *RolloutControllerTestSuite) Test_TriggerRolloutRunWithInlineBatchStrate
614614
s.Require().Equal("30%", run.Spec.Batch.Batches[0].Targets[0].Replicas.String())
615615

616616
// Verify second batch
617-
s.Require().True(run.Spec.Batch.Batches[1].Breakpoint, "Second batch should not have breakpoint")
617+
s.Require().True(run.Spec.Batch.Batches[1].Breakpoint, "Second batch should have breakpoint")
618618
s.Require().Len(run.Spec.Batch.Batches[1].Targets, 1, "Second batch should have 1 target")
619619
s.Require().Equal("100%", run.Spec.Batch.Batches[1].Targets[0].Replicas.String())
620620
}

0 commit comments

Comments
 (0)