Files
5ab882cdd7 Fix(rollout): trigger OpenKruise reversion when paused at canary step (#7251)
* fix(rollout): trigger OpenKruise reversion when paused at canary step

Signed-off-by: kampitojha <kampitojha@users.noreply.github.com>

* refactor(rollout): extract shared helper to deduplicate resume and rollback logic

Signed-off-by: kampitojha <kampitojha@users.noreply.github.com>

* fix(rollout): fix error message formatting and verbs in rollout helper

Signed-off-by: kampitojha <kampitojha@users.noreply.github.com>

* test(rollout): set valid canaryRevision and podTemplateHash in rollout test

Signed-off-by: kampitojha <kampitojha@users.noreply.github.com>

* test(rollout): remove outdated required fields under status.canaryStatus in test CRD schema

Signed-off-by: kampitojha <kampitojha@users.noreply.github.com>

* test(rollout): add coverage tests for writer path, canary-only paused, and no-op resume cases

Signed-off-by: kampitojha <kampitojha@users.noreply.github.com>

* test(rollout): cover seen-key deduplication branch with duplicate RT entry

Signed-off-by: kampitojha <kampitojha@users.noreply.github.com>

* style(rollout): remove extra blank line to pass goimports check-diff

Signed-off-by: kampitojha <kampitojha@users.noreply.github.com>

* fix(rollout): wait for OpenKruise to settle before correcting canary step state

Signed-off-by: kampitojha <kampitojha@users.noreply.github.com>

* test(rollout): cover rollback settle-timeout and rollout-disappearance error paths

Signed-off-by: kampitojha <kampitojha@users.noreply.github.com>

* chore(ci): re-trigger workflows after GitHub Actions outage

Signed-off-by: kampitojha <kampitojha@users.noreply.github.com>

---------

Signed-off-by: kampitojha <kampitojha@users.noreply.github.com>
Co-authored-by: kampitojha <kampitojha@users.noreply.github.com>
2026-08-12 10:35:25 +01:00

389 lines
14 KiB
Go

/*
Copyright 2021 The KubeVela Authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
package rollout
import (
"context"
"strings"
"time"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
kruisev1alpha1 "github.com/openkruise/rollouts/api/v1alpha1"
v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
"k8s.io/utils/ptr"
"github.com/oam-dev/kubevela/apis/core.oam.dev/common"
"github.com/oam-dev/kubevela/apis/core.oam.dev/v1beta1"
"github.com/oam-dev/kubevela/pkg/oam"
"github.com/oam-dev/kubevela/pkg/oam/util"
)
var _ = Describe("Kruise rollout test", func() {
ctx := context.Background()
BeforeEach(func() {
Expect(k8sClient.Create(ctx, rollout.DeepCopy())).Should(SatisfyAny(BeNil(), util.AlreadyExistMatcher{}))
Expect(k8sClient.Create(ctx, rt.DeepCopy())).Should(SatisfyAny(BeNil(), util.AlreadyExistMatcher{}))
Expect(k8sClient.Create(ctx, app.DeepCopy())).Should(SatisfyAny(BeNil(), util.AlreadyExistMatcher{}))
Expect(k8sClient.Create(ctx, rollingReleaseRollout.DeepCopy())).Should(SatisfyAny(BeNil(), util.AlreadyExistMatcher{}))
})
It("test get associated rollout func", func() {
rollouts, err := getAssociatedRollouts(ctx, k8sClient, &app, false)
Expect(err).Should(BeNil())
// test will only fetch one rollout in result
Expect(len(rollouts)).Should(BeEquivalentTo(1))
})
It("Suspend rollout", func() {
r := kruisev1alpha1.Rollout{}
Expect(k8sClient.Get(ctx, types.NamespacedName{Namespace: "default", Name: "my-rollout"}, &r)).Should(BeNil())
r.Status.Phase = kruisev1alpha1.RolloutPhaseProgressing
Expect(k8sClient.Status().Update(ctx, &r)).Should(BeNil())
Expect(SuspendRollout(ctx, k8sClient, &app, nil))
Expect(k8sClient.Get(ctx, types.NamespacedName{Namespace: "default", Name: "my-rollout"}, &r))
Expect(r.Spec.Strategy.Paused).Should(BeEquivalentTo(true))
})
It("Resume rollout", func() {
r := kruisev1alpha1.Rollout{}
Expect(k8sClient.Get(ctx, types.NamespacedName{Namespace: "default", Name: "my-rollout"}, &r)).Should(BeNil())
Expect(r.Spec.Strategy.Paused).Should(BeEquivalentTo(true))
Expect(ResumeRollout(ctx, k8sClient, &app, nil))
Expect(k8sClient.Get(ctx, types.NamespacedName{Namespace: "default", Name: "my-rollout"}, &r))
Expect(r.Spec.Strategy.Paused).Should(BeEquivalentTo(false))
})
It("Rollback rollout", func() {
r := kruisev1alpha1.Rollout{}
Expect(k8sClient.Get(ctx, types.NamespacedName{Namespace: "default", Name: "my-rollout"}, &r)).Should(BeNil())
r.Spec.Strategy.Paused = true
Expect(k8sClient.Update(ctx, &r)).Should(BeNil())
r.Status.Phase = kruisev1alpha1.RolloutPhaseHealthy
r.Status.CanaryStatus = &kruisev1alpha1.CanaryStatus{
CurrentStepState: kruisev1alpha1.CanaryStepStatePaused,
}
Expect(k8sClient.Status().Update(ctx, &r)).Should(BeNil())
modified, err := RollbackRollout(ctx, k8sClient, &app, nil)
Expect(err).Should(BeNil())
Expect(modified).Should(BeTrue())
Expect(k8sClient.Get(ctx, types.NamespacedName{Namespace: "default", Name: "my-rollout"}, &r)).Should(BeNil())
Expect(r.Spec.Strategy.Paused).Should(BeEquivalentTo(false))
Expect(r.Status.CanaryStatus.CurrentStepState).Should(BeEquivalentTo(kruisev1alpha1.CanaryStepStateReady))
})
It("Rollback rollout with writer covers log output path", func() {
r := kruisev1alpha1.Rollout{}
Expect(k8sClient.Get(ctx, types.NamespacedName{Namespace: "default", Name: "my-rollout"}, &r)).Should(BeNil())
r.Spec.Strategy.Paused = true
Expect(k8sClient.Update(ctx, &r)).Should(BeNil())
r.Status.Phase = kruisev1alpha1.RolloutPhaseHealthy
r.Status.CanaryStatus = &kruisev1alpha1.CanaryStatus{
CurrentStepState: kruisev1alpha1.CanaryStepStatePaused,
}
Expect(k8sClient.Status().Update(ctx, &r)).Should(BeNil())
buf := &strings.Builder{}
modified, err := RollbackRollout(ctx, k8sClient, &app, buf)
Expect(err).Should(BeNil())
Expect(modified).Should(BeTrue())
Expect(buf.String()).Should(ContainSubstring("rollback"))
})
It("Rollback rollout waits for OpenKruise to settle before correcting canary status", func() {
r := kruisev1alpha1.Rollout{}
Expect(k8sClient.Get(ctx, types.NamespacedName{Namespace: "default", Name: "my-rollout"}, &r)).Should(BeNil())
r.Spec.Strategy.Paused = true
Expect(k8sClient.Update(ctx, &r)).Should(BeNil())
r.Status.Phase = kruisev1alpha1.RolloutPhaseProgressing
r.Status.CanaryStatus = &kruisev1alpha1.CanaryStatus{
CurrentStepState: kruisev1alpha1.CanaryStepStatePaused,
}
Expect(k8sClient.Status().Update(ctx, &r)).Should(BeNil())
// simulate the OpenKruise controller: once KubeVela unpauses the spec,
// settle the rollout by leaving the Progressing phase with the canary
// step state still stale at StepPaused (the exact race being fixed).
done := make(chan struct{})
go func() {
defer close(done)
settleWhenUnpaused := func() bool {
deadline := time.Now().Add(10 * time.Second)
for time.Now().Before(deadline) {
var rr kruisev1alpha1.Rollout
if err := k8sClient.Get(ctx, types.NamespacedName{Namespace: "default", Name: "my-rollout"}, &rr); err == nil && !rr.Spec.Strategy.Paused {
rr.Status.Phase = kruisev1alpha1.RolloutPhaseHealthy
if err := k8sClient.Status().Update(ctx, &rr); err == nil {
return true
}
}
time.Sleep(50 * time.Millisecond)
}
return false
}
settleWhenUnpaused()
}()
modified, err := RollbackRollout(ctx, k8sClient, &app, nil)
Expect(err).Should(BeNil())
Expect(modified).Should(BeTrue())
Eventually(done).WithTimeout(10 * time.Second).WithPolling(50 * time.Millisecond).Should(BeClosed())
Expect(k8sClient.Get(ctx, types.NamespacedName{Namespace: "default", Name: "my-rollout"}, &r)).Should(BeNil())
Expect(r.Spec.Strategy.Paused).Should(BeEquivalentTo(false))
Expect(r.Status.CanaryStatus.CurrentStepState).Should(BeEquivalentTo(kruisev1alpha1.CanaryStepStateReady))
})
It("Rollback rollout proceeds best-effort when OpenKruise does not settle within timeout", func() {
oldInterval, oldTimeout := rolloutSettleInterval, rolloutSettleTimeout
rolloutSettleInterval = 300 * time.Millisecond
rolloutSettleTimeout = 1 * time.Second
defer func() { rolloutSettleInterval, rolloutSettleTimeout = oldInterval, oldTimeout }()
r := kruisev1alpha1.Rollout{}
Expect(k8sClient.Get(ctx, types.NamespacedName{Namespace: "default", Name: "my-rollout"}, &r)).Should(BeNil())
r.Spec.Strategy.Paused = true
Expect(k8sClient.Update(ctx, &r)).Should(BeNil())
r.Status.Phase = kruisev1alpha1.RolloutPhaseProgressing
r.Status.CanaryStatus = &kruisev1alpha1.CanaryStatus{
CurrentStepState: kruisev1alpha1.CanaryStepStatePaused,
}
Expect(k8sClient.Status().Update(ctx, &r)).Should(BeNil())
modified, err := RollbackRollout(ctx, k8sClient, &app, nil)
Expect(err).Should(BeNil())
Expect(modified).Should(BeTrue())
Expect(k8sClient.Get(ctx, types.NamespacedName{Namespace: "default", Name: "my-rollout"}, &r)).Should(BeNil())
Expect(r.Spec.Strategy.Paused).Should(BeEquivalentTo(false))
Expect(r.Status.CanaryStatus.CurrentStepState).Should(BeEquivalentTo(kruisev1alpha1.CanaryStepStateReady))
})
It("Rollback rollout returns an error when the rollout disappears while settling", func() {
r := kruisev1alpha1.Rollout{}
Expect(k8sClient.Get(ctx, types.NamespacedName{Namespace: "default", Name: "my-rollout"}, &r)).Should(BeNil())
r.Spec.Strategy.Paused = true
Expect(k8sClient.Update(ctx, &r)).Should(BeNil())
r.Status.Phase = kruisev1alpha1.RolloutPhaseProgressing
r.Status.CanaryStatus = &kruisev1alpha1.CanaryStatus{
CurrentStepState: kruisev1alpha1.CanaryStepStatePaused,
}
Expect(k8sClient.Status().Update(ctx, &r)).Should(BeNil())
// simulate the rollout being deleted while the rollback waits for the
// OpenKruise controller to settle, so the poll surfaces a real error.
done := make(chan struct{})
go func() {
defer close(done)
deadline := time.Now().Add(10 * time.Second)
for time.Now().Before(deadline) {
var rr kruisev1alpha1.Rollout
if err := k8sClient.Get(ctx, types.NamespacedName{Namespace: "default", Name: "my-rollout"}, &rr); err == nil && !rr.Spec.Strategy.Paused {
_ = k8sClient.Delete(ctx, &rr)
return
}
time.Sleep(50 * time.Millisecond)
}
}()
modified, err := RollbackRollout(ctx, k8sClient, &app, nil)
Expect(err).Should(HaveOccurred())
Expect(modified).Should(BeFalse())
Eventually(done).WithTimeout(10 * time.Second).WithPolling(50 * time.Millisecond).Should(BeClosed())
})
It("Resume rollout with only CanaryStatus paused (spec not paused)", func() {
r := kruisev1alpha1.Rollout{}
Expect(k8sClient.Get(ctx, types.NamespacedName{Namespace: "default", Name: "my-rollout"}, &r)).Should(BeNil())
// spec is NOT paused, only canaryStatus is paused
r.Spec.Strategy.Paused = false
Expect(k8sClient.Update(ctx, &r)).Should(BeNil())
r.Status.CanaryStatus = &kruisev1alpha1.CanaryStatus{
CurrentStepState: kruisev1alpha1.CanaryStepStatePaused,
}
Expect(k8sClient.Status().Update(ctx, &r)).Should(BeNil())
modified, err := ResumeRollout(ctx, k8sClient, &app, nil)
Expect(err).Should(BeNil())
Expect(modified).Should(BeTrue())
Expect(k8sClient.Get(ctx, types.NamespacedName{Namespace: "default", Name: "my-rollout"}, &r)).Should(BeNil())
Expect(r.Status.CanaryStatus.CurrentStepState).Should(BeEquivalentTo(kruisev1alpha1.CanaryStepStateReady))
})
It("Resume rollout that is already not paused returns modified=false", func() {
r := kruisev1alpha1.Rollout{}
Expect(k8sClient.Get(ctx, types.NamespacedName{Namespace: "default", Name: "my-rollout"}, &r)).Should(BeNil())
r.Spec.Strategy.Paused = false
Expect(k8sClient.Update(ctx, &r)).Should(BeNil())
// no canary status set — fully unpaused
r.Status.CanaryStatus = nil
Expect(k8sClient.Status().Update(ctx, &r)).Should(BeNil())
modified, err := ResumeRollout(ctx, k8sClient, &app, nil)
Expect(err).Should(BeNil())
Expect(modified).Should(BeFalse())
})
It("test get associated rollout deduplication", func() {
rollouts, err := getAssociatedRollouts(ctx, k8sClient, &app, true)
Expect(err).Should(BeNil())
Expect(len(rollouts)).Should(BeEquivalentTo(1))
})
})
var app = v1beta1.Application{
TypeMeta: metav1.TypeMeta{
APIVersion: "core.oam.dev/v1beta1",
Kind: "Application",
},
ObjectMeta: metav1.ObjectMeta{
Name: "rollout-app",
Namespace: "default",
Generation: 1,
},
Spec: v1beta1.ApplicationSpec{
Components: []common.ApplicationComponent{},
},
}
var rt = v1beta1.ResourceTracker{
TypeMeta: metav1.TypeMeta{
APIVersion: "core.oam.dev/v1beta1",
Kind: "ResourceTracker",
},
ObjectMeta: metav1.ObjectMeta{
Name: "rollout-app",
Labels: map[string]string{
"app.oam.dev/appRevision": "rollout-app-v1",
"app.oam.dev/name": "rollout-app",
"app.oam.dev/namespace": "default",
},
},
Spec: v1beta1.ResourceTrackerSpec{
ApplicationGeneration: 1,
Type: v1beta1.ResourceTrackerTypeVersioned,
ManagedResources: []v1beta1.ManagedResource{
{
ClusterObjectReference: common.ClusterObjectReference{
ObjectReference: v1.ObjectReference{
APIVersion: "rollouts.kruise.io/v1alpha1",
Kind: "Rollout",
Name: "my-rollout",
Namespace: "default",
},
},
OAMObjectReference: common.OAMObjectReference{
Component: "my-rollout",
},
},
// Duplicate entry for my-rollout to exercise the seen[key] deduplication branch
{
ClusterObjectReference: common.ClusterObjectReference{
ObjectReference: v1.ObjectReference{
APIVersion: "rollouts.kruise.io/v1alpha1",
Kind: "Rollout",
Name: "my-rollout",
Namespace: "default",
},
},
OAMObjectReference: common.OAMObjectReference{
Component: "my-rollout",
},
},
{
ClusterObjectReference: common.ClusterObjectReference{
ObjectReference: v1.ObjectReference{
APIVersion: "rollouts.kruise.io/v1alpha1",
Kind: "Rollout",
Name: "rolling-release-rollout",
Namespace: "default",
},
},
OAMObjectReference: common.OAMObjectReference{
Component: "my-rollout",
},
},
},
},
}
var rollout = kruisev1alpha1.Rollout{
TypeMeta: metav1.TypeMeta{
APIVersion: "rollouts.kruise.io/v1alpha1",
Kind: "Rollout",
},
ObjectMeta: metav1.ObjectMeta{
Name: "my-rollout",
Namespace: "default",
},
Spec: kruisev1alpha1.RolloutSpec{
ObjectRef: kruisev1alpha1.ObjectRef{
WorkloadRef: &kruisev1alpha1.WorkloadRef{
APIVersion: "appsv1",
Kind: "Deployment",
Name: "canary-demo",
},
},
Strategy: kruisev1alpha1.RolloutStrategy{
Canary: &kruisev1alpha1.CanaryStrategy{
Steps: []kruisev1alpha1.CanaryStep{
{
Weight: ptr.To(int32(30)),
},
},
},
Paused: false,
},
},
}
var rollingReleaseRollout = kruisev1alpha1.Rollout{
TypeMeta: metav1.TypeMeta{
APIVersion: "rollouts.kruise.io/v1alpha1",
Kind: "Rollout",
},
ObjectMeta: metav1.ObjectMeta{
Name: "rolling-release-rollout",
Namespace: "default",
Annotations: map[string]string{
oam.AnnotationSkipResume: "true",
},
},
Spec: kruisev1alpha1.RolloutSpec{
ObjectRef: kruisev1alpha1.ObjectRef{
WorkloadRef: &kruisev1alpha1.WorkloadRef{
APIVersion: "appsv1",
Kind: "Deployment",
Name: "canary-demo",
},
},
Strategy: kruisev1alpha1.RolloutStrategy{
Canary: &kruisev1alpha1.CanaryStrategy{
Steps: []kruisev1alpha1.CanaryStep{
{
Weight: ptr.To(int32(30)),
},
},
},
Paused: false,
},
},
}