openkruise
/
rollouts
mirror of https://github.com/openkruise/rollouts.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed a bug caused by NOT considering case-insensitivity. 

Signed-off-by: yunbo <yunbo10124scut@gmail.com>
This commit is contained in:
yunbo 2024-01-18 15:32:32 +08:00
parent 678d4d2b34
commit 4846b88f88
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
api/v1alpha1/conversion.go
View File

@ -19,6 +19,8 @@ package v1alpha1
import ( import (
"fmt" "fmt"
"strings"
"github.com/openkruise/rollouts/api/v1beta1" "github.com/openkruise/rollouts/api/v1beta1"
"k8s.io/apimachinery/pkg/util/intstr" "k8s.io/apimachinery/pkg/util/intstr"
utilpointer "k8s.io/utils/pointer" utilpointer "k8s.io/utils/pointer"
@ -74,7 +76,7 @@ func (src *Rollout) ConvertTo(dst conversion.Hub) error {
obj.Spec.Strategy.Canary.PatchPodTemplateMetadata.Labels[k] = v obj.Spec.Strategy.Canary.PatchPodTemplateMetadata.Labels[k] = v
} }
} }
if src.Annotations[RolloutStyleAnnotation] != string(PartitionRollingStyle) { if !strings.EqualFold(src.Annotations[RolloutStyleAnnotation], string(PartitionRollingStyle)) {
obj.Spec.Strategy.Canary.EnableExtraWorkloadForCanary = true obj.Spec.Strategy.Canary.EnableExtraWorkloadForCanary = true
} }
if src.Annotations[TrafficRoutingAnnotation] != "" { if src.Annotations[TrafficRoutingAnnotation] != "" {
@ -211,9 +213,9 @@ func (dst *Rollout) ConvertFrom(src conversion.Hub) error {
dst.Annotations = map[string]string{} dst.Annotations = map[string]string{}
} }
if srcV1beta1.Spec.Strategy.Canary.EnableExtraWorkloadForCanary { if srcV1beta1.Spec.Strategy.Canary.EnableExtraWorkloadForCanary {
dst.Annotations[RolloutStyleAnnotation] = string(CanaryRollingStyle) dst.Annotations[RolloutStyleAnnotation] = strings.ToLower(string(CanaryRollingStyle))
} else { } else {
dst.Annotations[RolloutStyleAnnotation] = string(PartitionRollingStyle) dst.Annotations[RolloutStyleAnnotation] = strings.ToLower(string(PartitionRollingStyle))
} }
if srcV1beta1.Spec.Strategy.Canary.TrafficRoutingRef != "" { if srcV1beta1.Spec.Strategy.Canary.TrafficRoutingRef != "" {
dst.Annotations[TrafficRoutingAnnotation] = srcV1beta1.Spec.Strategy.Canary.TrafficRoutingRef dst.Annotations[TrafficRoutingAnnotation] = srcV1beta1.Spec.Strategy.Canary.TrafficRoutingRef
@ -336,7 +338,7 @@ func (src *BatchRelease) ConvertTo(dst conversion.Hub) error {
obj.Spec.ReleasePlan.PatchPodTemplateMetadata.Labels[k] = v obj.Spec.ReleasePlan.PatchPodTemplateMetadata.Labels[k] = v
} }
} }
if src.Annotations[RolloutStyleAnnotation] != string(PartitionRollingStyle) { if !strings.EqualFold(src.Annotations[RolloutStyleAnnotation], string(PartitionRollingStyle)) {
obj.Spec.ReleasePlan.EnableExtraWorkloadForCanary = true obj.Spec.ReleasePlan.EnableExtraWorkloadForCanary = true
} }
@ -416,9 +418,9 @@ func (dst *BatchRelease) ConvertFrom(src conversion.Hub) error {
dst.Annotations = map[string]string{} dst.Annotations = map[string]string{}
} }
if srcV1beta1.Spec.ReleasePlan.EnableExtraWorkloadForCanary { if srcV1beta1.Spec.ReleasePlan.EnableExtraWorkloadForCanary {
dst.Annotations[RolloutStyleAnnotation] = string(CanaryRollingStyle) dst.Annotations[RolloutStyleAnnotation] = strings.ToLower(string(CanaryRollingStyle))
} else { } else {
dst.Annotations[RolloutStyleAnnotation] = string(PartitionRollingStyle) dst.Annotations[RolloutStyleAnnotation] = strings.ToLower(string(PartitionRollingStyle))
} }
// status // status