Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

webhook validate v1beta1 rollout #188

Merged
merged 1 commit into from
Dec 18, 2023

Conversation

zmberg
Copy link
Member

@zmberg zmberg commented Dec 12, 2023

Ⅰ. Describe what this PR does

Ⅱ. Does this pull request fix one issue?

Ⅲ. Special notes for reviews

@codecov-commenter
Copy link

codecov-commenter commented Dec 12, 2023

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (9dcf365) 43.40% compared to head (3475d30) 43.36%.

❗ Your organization needs to install the Codecov GitHub app to enable full functionality.

Additional details and impacted files
@@            Coverage Diff             @@
##           master     #188      +/-   ##
==========================================
- Coverage   43.40%   43.36%   -0.05%     
==========================================
  Files          52       52              
  Lines        5667     5659       -8     
==========================================
- Hits         2460     2454       -6     
+ Misses       2783     2782       -1     
+ Partials      424      423       -1     
Flag Coverage Δ
unittests 43.36% <100.00%> (-0.05%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@zmberg zmberg force-pushed the fix-v1beta1-webhook branch 2 times, most recently from 9cd94f3 to cd65e92 Compare December 12, 2023 08:27
@@ -74,7 +74,8 @@ func (src *Rollout) ConvertTo(dst conversion.Hub) error {
obj.Spec.Strategy.Canary.PatchPodTemplateMetadata.Labels[k] = v
}
}
if src.Annotations[RolloutStyleAnnotation] != string(PartitionRollingStyle) {
if src.Annotations[RolloutStyleAnnotation] != string(PartitionRollingStyle) &&
srcSpec.ObjectRef.WorkloadRef.Kind == "Deployment" {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we should also convert traffic annotation to TrafficRoutingRef

@zmberg zmberg force-pushed the fix-v1beta1-webhook branch 2 times, most recently from eab3a1f to 52ec5d2 Compare December 14, 2023 06:50
@zmberg zmberg force-pushed the fix-v1beta1-webhook branch from 52ec5d2 to 52b0574 Compare December 14, 2023 06:53
@zmberg zmberg force-pushed the fix-v1beta1-webhook branch from 52b0574 to 1b71bae Compare December 14, 2023 07:14
@kruise-bot kruise-bot added size/M and removed size/S labels Dec 14, 2023
@zmberg zmberg force-pushed the fix-v1beta1-webhook branch 3 times, most recently from 338a862 to d3b723a Compare December 15, 2023 02:59
@zmberg zmberg force-pushed the fix-v1beta1-webhook branch from d3b723a to 3475d30 Compare December 15, 2023 04:49
Copy link
Member

@furykerry furykerry left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@furykerry
Copy link
Member

/approve

@kruise-bot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: furykerry

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@kruise-bot kruise-bot merged commit 75b1b90 into openkruise:master Dec 18, 2023
19 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants