Skip to content

Fix: Deficiencies when using v1alpha1 as CRD storage #302

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.

Sign up for GitHub

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

Open
AiRanthem wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Fix: Deficiencies when using v1alpha1 as CRD storage #302

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
fff409e
Fix: will convert rollout-id
AiRanthem Aug 1, 2025
c2e4aa3
Fix: conversion issues when crd storage set to v1alpha1
AiRanthem Aug 8, 2025
47f43ea
Add some unit tests
AiRanthem Aug 8, 2025
64b426e
Add convert unit test
AiRanthem Aug 8, 2025
0564f48
Fix stupid AI
AiRanthem Aug 8, 2025
c78c5f3
simplify code
AiRanthem Aug 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 31 additions & 8 deletions api/v1alpha1/conversion.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,21 @@ func (src *Rollout) ConvertTo(dst conversion.Hub) error {
switch t := dst.(type) {
case *v1beta1.Rollout:
obj := dst.(*v1beta1.Rollout)

// metadata
obj.ObjectMeta = src.ObjectMeta
if src.Spec.DeprecatedRolloutID != "" {
if obj.Labels == nil {
obj.Labels = map[string]string{}
}
obj.Labels[v1beta1.RolloutIDLabel] = src.Spec.DeprecatedRolloutID
Copy link
Copy Markdown
Member

@furykerry furykerry Aug 12, 2025

Choose a reason for hiding this comment

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

the label should read from the workload label not the rollout label

}
if obj.Annotations == nil {
obj.Annotations = map[string]string{}
}
obj.Annotations[RolloutStyleAnnotation] = src.Annotations[RolloutStyleAnnotation]
Copy link
Copy Markdown
Member

@furykerry furykerry Aug 12, 2025

Choose a reason for hiding this comment

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

why copy the annotation to v1beta1 , v1beta1 should save the information in the Spec.Strategy.Canary.EnableExtraWorkloadForCanary


// spec
obj.Spec = v1beta1.RolloutSpec{}
srcSpec := src.Spec
obj.Spec.WorkloadRef = v1beta1.ObjectRef{
Expand Down Expand Up @@ -122,6 +136,8 @@ func (src *Rollout) ConvertTo(dst conversion.Hub) error {
CanaryReplicas: src.Status.CanaryStatus.CanaryReplicas,
CanaryReadyReplicas: src.Status.CanaryStatus.CanaryReadyReplicas,
}
obj.Status.CurrentStepState = obj.Status.CanaryStatus.CurrentStepState
obj.Status.CurrentStepIndex = obj.Status.CanaryStatus.CurrentStepIndex
return nil
default:
return fmt.Errorf("unsupported type %v", t)
Expand Down Expand Up @@ -192,7 +208,8 @@ func (dst *Rollout) ConvertFrom(src conversion.Hub) error {
FailureThreshold: srcV1beta1.Spec.Strategy.Canary.FailureThreshold,
},
},
Disabled: srcV1beta1.Spec.Disabled,
DeprecatedRolloutID: srcV1beta1.Labels[v1beta1.RolloutIDLabel],
Disabled: srcV1beta1.Spec.Disabled,
}
for _, step := range srcV1beta1.Spec.Strategy.Canary.Steps {
obj := CanaryStep{
Expand Down Expand Up @@ -221,10 +238,14 @@ func (dst *Rollout) ConvertFrom(src conversion.Hub) error {
if dst.Annotations == nil {
dst.Annotations = map[string]string{}
}
if srcV1beta1.Spec.Strategy.Canary.EnableExtraWorkloadForCanary {
dst.Annotations[RolloutStyleAnnotation] = strings.ToLower(string(CanaryRollingStyle))
if style, ok := srcV1beta1.Annotations[RolloutStyleAnnotation]; ok {
dst.Annotations[RolloutStyleAnnotation] = style
} else {
dst.Annotations[RolloutStyleAnnotation] = strings.ToLower(string(PartitionRollingStyle))
if srcV1beta1.Spec.Strategy.Canary.EnableExtraWorkloadForCanary {
dst.Annotations[RolloutStyleAnnotation] = strings.ToLower(string(CanaryRollingStyle))
} else {
dst.Annotations[RolloutStyleAnnotation] = strings.ToLower(string(PartitionRollingStyle))
}
}
if srcV1beta1.Spec.Strategy.Canary.TrafficRoutingRef != "" {
dst.Annotations[TrafficRoutingAnnotation] = srcV1beta1.Spec.Strategy.Canary.TrafficRoutingRef
Expand Down Expand Up @@ -434,11 +455,13 @@ func (dst *BatchRelease) ConvertFrom(src conversion.Hub) error {
dst.Spec.ReleasePlan.PatchPodTemplateMetadata.Labels[k] = v
}
}
if dst.Annotations == nil {
dst.Annotations = map[string]string{}
if rollingStyle := srcV1beta1.Spec.ReleasePlan.RollingStyle; rollingStyle != "" {
if dst.Annotations == nil {
dst.Annotations = map[string]string{}
}
dst.Annotations[RolloutStyleAnnotation] = strings.ToLower(string(rollingStyle))
dst.Spec.ReleasePlan.RollingStyle = RollingStyleType(rollingStyle)
}
dst.Annotations[RolloutStyleAnnotation] = strings.ToLower(string(srcV1beta1.Spec.ReleasePlan.RollingStyle))
dst.Spec.ReleasePlan.RollingStyle = RollingStyleType(srcV1beta1.Spec.ReleasePlan.RollingStyle)
dst.Spec.ReleasePlan.EnableExtraWorkloadForCanary = srcV1beta1.Spec.ReleasePlan.EnableExtraWorkloadForCanary

// status
Expand Down
Loading
Loading