This repository has been archived by the owner on Jun 8, 2022. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 80
don't block app from running if no definition found #267
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
161 changes: 161 additions & 0 deletions
161
pkg/controller/v1alpha2/applicationconfiguration/appconfig_suit_test.go
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,161 @@ | ||
| package applicationconfiguration | ||
|
|
||
| import ( | ||
| "context" | ||
| "time" | ||
|
|
||
| . "github.com/onsi/ginkgo" | ||
| . "github.com/onsi/gomega" | ||
|
|
||
| corev1 "k8s.io/api/core/v1" | ||
| crdv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" | ||
| metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||
| "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" | ||
| "k8s.io/apimachinery/pkg/runtime" | ||
| "sigs.k8s.io/controller-runtime/pkg/client" | ||
| "sigs.k8s.io/controller-runtime/pkg/reconcile" | ||
|
|
||
| "github.com/crossplane/oam-kubernetes-runtime/apis/core/v1alpha2" | ||
| "github.com/crossplane/oam-kubernetes-runtime/pkg/oam/util" | ||
| ) | ||
|
|
||
| var _ = Describe("CRD without definition can run in an ApplicationConfiguration", func() { | ||
| ctx := context.Background() | ||
| It("run workload and trait without CRD", func() { | ||
|
|
||
| By("Creating CRD foo.crdtest1.com") | ||
| // Create a crd for appconfig dependency test | ||
| crd = crdv1.CustomResourceDefinition{ | ||
| ObjectMeta: metav1.ObjectMeta{ | ||
| Name: "foo.crdtest1.com", | ||
| Labels: map[string]string{"crd": "dependency"}, | ||
| }, | ||
| Spec: crdv1.CustomResourceDefinitionSpec{ | ||
| Group: "crdtest1.com", | ||
| Names: crdv1.CustomResourceDefinitionNames{ | ||
| Kind: "Foo", | ||
| ListKind: "FooList", | ||
| Plural: "foo", | ||
| Singular: "foo", | ||
| }, | ||
| Versions: []crdv1.CustomResourceDefinitionVersion{{ | ||
| Name: "v1", | ||
| Served: true, | ||
| Storage: true, | ||
| Schema: &crdv1.CustomResourceValidation{ | ||
| OpenAPIV3Schema: &crdv1.JSONSchemaProps{ | ||
| Type: "object", | ||
| Properties: map[string]crdv1.JSONSchemaProps{ | ||
| "spec": { | ||
| Type: "object", | ||
| Properties: map[string]crdv1.JSONSchemaProps{ | ||
| "key": {Type: "string"}, | ||
| }}}}}}, | ||
| }, | ||
| Scope: crdv1.NamespaceScoped, | ||
| }, | ||
| } | ||
| Expect(k8sClient.Create(context.Background(), &crd)).Should(SatisfyAny(BeNil(), &util.AlreadyExistMatcher{})) | ||
|
|
||
| By("Creating namespace trait-no-def-test") | ||
| namespace := "trait-no-def-test" | ||
| var ns = corev1.Namespace{ObjectMeta: metav1.ObjectMeta{Name: namespace}} | ||
| Expect(k8sClient.Create(ctx, &ns)).Should(SatisfyAny(BeNil(), &util.AlreadyExistMatcher{})) | ||
|
|
||
| By("creating component using workload by foo.crdtest1.com without definition") | ||
| tempFoo := &unstructured.Unstructured{} | ||
| tempFoo.SetAPIVersion("crdtest1.com/v1") | ||
| tempFoo.SetKind("Foo") | ||
| tempFoo.SetNamespace(namespace) | ||
| // Define a workload | ||
| wl := tempFoo.DeepCopy() | ||
| // Set Name so we can get easily | ||
| wlname := "test-workload" | ||
| wl.SetName(wlname) | ||
| // Create a component | ||
| componentName := "component" | ||
| comp := v1alpha2.Component{ | ||
| ObjectMeta: metav1.ObjectMeta{ | ||
| Name: componentName, | ||
| Namespace: namespace, | ||
| }, | ||
| Spec: v1alpha2.ComponentSpec{ | ||
| Workload: runtime.RawExtension{ | ||
| Object: wl, | ||
| }, | ||
| }, | ||
| } | ||
| Expect(k8sClient.Create(ctx, &comp)).Should(BeNil()) | ||
|
|
||
| By("Create application configuration with trait using foo.crdtest1.com without definition") | ||
| tr := tempFoo.DeepCopy() | ||
| // Set Name so we can get easily | ||
| trname := "test-trait" | ||
| tr.SetName(trname) | ||
| appConfigName := "appconfig-trait-no-def" | ||
| appConfig := v1alpha2.ApplicationConfiguration{ | ||
| ObjectMeta: metav1.ObjectMeta{ | ||
| Name: appConfigName, | ||
| Namespace: namespace, | ||
| }, | ||
| Spec: v1alpha2.ApplicationConfigurationSpec{ | ||
| Components: []v1alpha2.ApplicationConfigurationComponent{{ | ||
| ComponentName: componentName, | ||
| Traits: []v1alpha2.ComponentTrait{{ | ||
| Trait: runtime.RawExtension{ | ||
| Object: tr, | ||
| }}}, | ||
| }}}, | ||
| } | ||
| By("Creating application config") | ||
| Expect(k8sClient.Create(ctx, &appConfig)).Should(BeNil()) | ||
|
|
||
| By("Reconcile") | ||
| appconfigKey := client.ObjectKey{ | ||
| Name: appConfigName, | ||
| Namespace: namespace, | ||
| } | ||
| req := reconcile.Request{NamespacedName: appconfigKey} | ||
| Expect(func() error { _, err := reconciler.Reconcile(req); return err }()).Should(BeNil()) | ||
|
|
||
| By("Checking that workload should be created") | ||
| workloadKey := client.ObjectKey{ | ||
| Name: wlname, | ||
| Namespace: namespace, | ||
| } | ||
| workloadFoo := tempFoo.DeepCopy() | ||
| Eventually(func() error { | ||
| err := k8sClient.Get(ctx, workloadKey, workloadFoo) | ||
| if err != nil { | ||
| // Try 3 (= 1s/300ms) times | ||
| reconciler.Reconcile(req) | ||
| } | ||
| return err | ||
| }, time.Second, 300*time.Millisecond).Should(BeNil()) | ||
|
|
||
| By("Checking that trait should be created") | ||
| traitKey := client.ObjectKey{ | ||
| Name: trname, | ||
| Namespace: namespace, | ||
| } | ||
| traitFoo := tempFoo.DeepCopy() | ||
| Eventually(func() error { | ||
| err := k8sClient.Get(ctx, traitKey, traitFoo) | ||
| if err != nil { | ||
| // Try 3 (= 1s/300ms) times | ||
| reconciler.Reconcile(req) | ||
| } | ||
| return err | ||
| }, time.Second, 300*time.Millisecond).Should(BeNil()) | ||
|
|
||
| By("Checking the application status has right warning message") | ||
| Expect(func() string { | ||
| err := k8sClient.Get(ctx, appconfigKey, &appConfig) | ||
| if err != nil { | ||
| return "" | ||
| } | ||
| return appConfig.Status.Workloads[0].Traits[0].Message | ||
| }()).Should(Equal(util.DummyTraitMessage)) | ||
| }) | ||
|
|
||
| }) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It seems that this only applies to traits. What about workloads?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
we don't check workloadDef when apply worklaod.