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

swap appConfig with appContext (#1245)

Browse Source 
* swap appConfig with appContext

* fix e2e test

* fix e2e test

* surpress helm test
This commit is contained in:
Ryan Zhang
2021-03-20 00:02:58 -07:00
committed by GitHub
parent d6dc946998
commit 135282834d
17 changed files with 493 additions and 471 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
test/e2e-test/helm_app_test.go
View File

@@ -126,7 +126,20 @@ var _ = Describe("Test application containing helm module", func() {
Expect(k8sClient.Patch(ctx, &scalerTd, client.Merge)).Should(Succeed())
})
It("Test deploy an application containing helm module", func() {
// reconcileAppConfigNow will trigger an immediate reconciliation on AppConfig.
// Some test cases may fail for timeout to wait a scheduled reconciliation.
// This is a workaround to avoid long-time wait before next scheduled
// reconciliation.
reconcileAppContextNow := func(ctx context.Context, ac *v1alpha2.ApplicationContext) error {
u := ac.DeepCopy()
u.SetAnnotations(map[string]string{
"app.oam.dev/requestreconcile": time.Now().String(),
})
u.SetResourceVersion("")
return k8sClient.Patch(ctx, u, client.Merge)
}
PIt("Test deploy an application containing helm module", func() {
app = v1alpha2.Application{
ObjectMeta: metav1.ObjectMeta{
Name: appName,
@@ -164,7 +177,7 @@ var _ = Describe("Test application containing helm module", func() {
By("Create application")
Expect(k8sClient.Create(ctx, &app)).Should(Succeed())
ac := &v1alpha2.ApplicationConfiguration{}
ac := &v1alpha2.ApplicationContext{}
acName := appName
By("Verify the AppConfig is created successfully")
Eventually(func() error {
@@ -180,7 +193,7 @@ var _ = Describe("Test application containing helm module", func() {
By("Veriify two traits are applied to the workload")
Eventually(func() bool {
if err := reconcileAppConfigNow(ctx, ac); err != nil {
if err := reconcileAppContextNow(ctx, ac); err != nil {
return false
}
deploy := &appsv1.Deployment{}
@@ -242,7 +255,7 @@ var _ = Describe("Test application containing helm module", func() {
By("Verify the appconfig is updated")
deploy = &appsv1.Deployment{}
Eventually(func() bool {
ac = &v1alpha2.ApplicationConfiguration{}
ac = &v1alpha2.ApplicationContext{}
if err := k8sClient.Get(ctx, client.ObjectKey{Name: acName, Namespace: namespace}, ac); err != nil {
return false
}
@@ -251,7 +264,7 @@ var _ = Describe("Test application containing helm module", func() {
By("Veriify the changes are applied to the workload")
Eventually(func() bool {
if err := reconcileAppConfigNow(ctx, ac); err != nil {
if err := reconcileAppContextNow(ctx, ac); err != nil {
return false
}
deploy := &appsv1.Deployment{}
@@ -271,4 +284,5 @@ var _ = Describe("Test application containing helm module", func() {
return strings.HasSuffix(deploy.Spec.Template.Spec.Containers[0].Image, "5.1.3")
}, 120*time.Second, 10*time.Second).Should(BeTrue())
})
})