github/kubevela
1
0
Fork 0
mirror of https://github.com/kubevela/kubevela.git synced 2026-02-14 18:10:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

rollback after rollout failure

Browse Source
This commit is contained in:
Ryan Zhang
2021-03-11 18:31:41 -08:00
parent 2cebad6ff4
commit b64009c02d
3 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
test/e2e-test/appconfig_finalizer_test.go
View File

@@ -4,19 +4,18 @@ import (
"context"
"time"
"github.com/crossplane/crossplane-runtime/apis/core/v1alpha1"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
"github.com/oam-dev/kubevela/pkg/oam/util"
"github.com/oam-dev/kubevela/apis/core.oam.dev/v1alpha2"
"github.com/crossplane/crossplane-runtime/apis/core/v1alpha1"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"sigs.k8s.io/controller-runtime/pkg/client"
logf "sigs.k8s.io/controller-runtime/pkg/log"
"github.com/oam-dev/kubevela/apis/core.oam.dev/v1alpha2"
"github.com/oam-dev/kubevela/pkg/oam/util"
)
var (

3
test/e2e-test/containerized_workload_test.go
View File

@@ -17,10 +17,9 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client"
logf "sigs.k8s.io/controller-runtime/pkg/log"
"github.com/oam-dev/kubevela/apis/core.oam.dev/v1alpha2"
"github.com/oam-dev/kubevela/pkg/oam"
"github.com/oam-dev/kubevela/pkg/oam/util"
"github.com/oam-dev/kubevela/apis/core.oam.dev/v1alpha2"
)
var _ = Describe("ContainerizedWorkload", func() {

23
test/e2e-test/rollout_plan_test.go
View File

@@ -177,7 +177,7 @@ var _ = Describe("Cloneset based rollout tests", func() {
}
VerifyRolloutOwnsCloneset := func() {
By("VerifySpec that rollout controller owns the cloneset")
By("Verify that rollout controller owns the cloneset")
Eventually(
func() string {
k8sClient.Get(ctx, client.ObjectKey{Namespace: namespace, Name: clonesetName}, &kc)
@@ -218,7 +218,7 @@ var _ = Describe("Cloneset based rollout tests", func() {
Expect(kc.Status.UpdatedReplicas).Should(BeEquivalentTo(*kc.Spec.Replicas))
Expect(kc.Status.UpdatedReadyReplicas).Should(BeEquivalentTo(*kc.Spec.Replicas))
By("VerifySpec AppConfig rolling status")
By("Verify AppConfig rolling status")
var appConfig v1alpha2.ApplicationConfiguration
Eventually(
@@ -230,7 +230,7 @@ var _ = Describe("Cloneset based rollout tests", func() {
}
VerifyAppConfigInactive := func(appConfigName string) {
By("VerifySpec AppConfig is inactive")
By("Verify AppConfig is inactive")
var appConfig v1alpha2.ApplicationConfiguration
Eventually(
@@ -278,13 +278,14 @@ var _ = Describe("Cloneset based rollout tests", func() {
k8sClient.Get(ctx, client.ObjectKey{Namespace: namespace, Name: appRollout.Name}, &appRollout)
appRollout.Spec.SourceAppRevisionName = appConfig2.Name
appRollout.Spec.TargetAppRevisionName = appConfig3.Name
appRollout.Spec.RolloutPlan.BatchPartition = nil
return k8sClient.Update(ctx, &appRollout)
},
time.Second*5, time.Millisecond*500).Should(Succeed())
VerifyRolloutOwnsCloneset()
By("VerifySpec AppConfig rolling status")
By("Verify AppConfig rolling status")
VerifyRolloutSucceeded()
@@ -366,7 +367,7 @@ var _ = Describe("Cloneset based rollout tests", func() {
},
time.Second*15, time.Millisecond*500).Should(BeEquivalentTo(batchPartition))
By("VerifySpec that the rollout stops at the first batch")
By("Verify that the rollout stops at the first batch")
// wait for the batch to be ready
Eventually(
func() oamstd.BatchRollingState {
@@ -425,7 +426,7 @@ var _ = Describe("Cloneset based rollout tests", func() {
return err
},
time.Second*5, time.Millisecond*500).Should(Succeed())
By("VerifySpec that the rollout pauses")
By("Verify that the rollout pauses")
// wait for the batch to be ready
Eventually(
func() corev1.ConditionStatus {
@@ -500,7 +501,7 @@ var _ = Describe("Cloneset based rollout tests", func() {
RevertBackToSource()
})
PIt("Test rolling back after a failed rollout", func() {
It("Test rolling back after a failed rollout", func() {
ApplyTwoAppVersion()
By("Apply the application rollout that stops after the first batche")
@@ -527,14 +528,14 @@ var _ = Describe("Cloneset based rollout tests", func() {
},
time.Second*60, time.Millisecond*500).Should(BeEquivalentTo(batchPartition))
By("VerifySpec that the rollout stops")
By("Verify that the rollout stops")
// wait for the batch to be ready
Eventually(
func() oamstd.BatchRollingState {
k8sClient.Get(ctx, client.ObjectKey{Namespace: namespace, Name: appRollout.Name}, &appRollout)
return appRollout.Status.BatchRollingState
},
time.Second*30, time.Millisecond*500).Should(Equal(oamstd.BatchReadyState))
time.Second*60, time.Millisecond*500).Should(Equal(oamstd.BatchReadyState))
By("Move back the partition to cause the rollout to fail")
Eventually(
@@ -543,7 +544,7 @@ var _ = Describe("Cloneset based rollout tests", func() {
appRollout.Spec.RolloutPlan.BatchPartition = pointer.Int32Ptr(0)
return k8sClient.Update(ctx, &appRollout)
},
time.Second*30, time.Millisecond*500).Should(Succeed())
time.Second*15, time.Millisecond*500).Should(Succeed())
By("Wait for the rollout phase change to fail")
Eventually(
@@ -551,7 +552,7 @@ var _ = Describe("Cloneset based rollout tests", func() {
k8sClient.Get(ctx, client.ObjectKey{Namespace: namespace, Name: newAppRollout.Name}, &appRollout)
return appRollout.Status.RollingState
},
time.Second*5, time.Millisecond*500).Should(BeEquivalentTo(oamstd.RolloutFailedState))
time.Second*10, time.Millisecond*500).Should(BeEquivalentTo(oamstd.RolloutFailedState))
RevertBackToSource()
})