mirror of
https://github.com/kubevela/kubevela.git
synced 2026-02-14 10:00:06 +00:00
* feat: implement output resource existence validation in component, trait, and policy definitions Signed-off-by: Ayush Kumar <ayushshyamkumar888@gmail.com> Signed-off-by: Ayush Kumar <ayushshyamkumar888@gmail.com> feat: add validation tests for ComponentDefinition and TraitDefinition outputs - Implement tests for ComponentDefinition with non-existent CRDs in outputs, ensuring they are rejected. - Add tests for valid outputs in ComponentDefinition, confirming acceptance. - Include tests for mixed valid and non-K8s outputs in ComponentDefinition, verifying they pass validation. - Test handling of empty outputs in ComponentDefinition, ensuring they are accepted. - Introduce tests for invalid apiVersion formats in ComponentDefinition, confirming rejection. - Add tests for TraitDefinition with mixed valid and invalid outputs, ensuring proper rejection. - Create YAML manifests for valid and invalid ComponentDefinitions and TraitDefinitions to support e2e tests. - Ensure comprehensive coverage of edge cases in output validation logic. Signed-off-by: Ayush Kumar <ayushshyamkumar888@gmail.com> Signed-off-by: Ayush Kumar <ayushshyamkumar888@gmail.com> fix: handle errors in resource validation for component, trait, and policy definitions Signed-off-by: Ayush Kumar <ayushshyamkumar888@gmail.com> Signed-off-by: Ayush Kumar <ayushshyamkumar888@gmail.com> fix: improve error handling in Go module tidy and resource validation Signed-off-by: Ayush Kumar <ayushshyamkumar888@gmail.com> Signed-off-by: Ayush Kumar <ayushshyamkumar888@gmail.com> feat: add webhook debugging setup and validation tests for ComponentDefinition and TraitDefinition Signed-off-by: Ayush Kumar <ayushshyamkumar888@gmail.com> Signed-off-by: Ayush Kumar <ayushshyamkumar888@gmail.com> feat: add VS Code launch configuration for debugging webhook validation Signed-off-by: Ayush Kumar <ayushshyamkumar888@gmail.com> Signed-off-by: Ayush Kumar <ayushshyamkumar888@gmail.com> refactor: streamline error handling in Go module tidy and remove obsolete test manifests Signed-off-by: Ayush Kumar <ayushshyamkumar888@gmail.com> Signed-off-by: Ayush Kumar <ayushshyamkumar888@gmail.com> feat: add mock context support for CUE template compilation Signed-off-by: Reetika Malhotra <malhotra.reetika25@gmail.com> Signed-off-by: Ayush Kumar <ayushshyamkumar888@gmail.com> Signed-off-by: Ayush Kumar <ayushshyamkumar888@gmail.com> feat: enhance validation for WorkflowStepDefinition resources and improve output resource checks Signed-off-by: viskumar <viskumar@guidewire.com> Signed-off-by: Ayush Kumar <ayushshyamkumar888@gmail.com> Signed-off-by: Ayush Kumar <ayushshyamkumar888@gmail.com> feat: implement resource validation for CUE templates and add unit tests Signed-off-by: Ayush Kumar <ayushshyamkumar888@gmail.com> Signed-off-by: Ayush Kumar <ayushshyamkumar888@gmail.com> feat: enhance logging and validation for component, policy, and trait definitions Signed-off-by: Ayush Kumar <ayushshyamkumar888@gmail.com> Signed-off-by: Ayush Kumar <ayushshyamkumar888@gmail.com> feat: improve error handling and logging in validation handlers for component, policy, trait, and workflow step definitions Signed-off-by: Ayush Kumar <ayushshyamkumar888@gmail.com> Signed-off-by: Ayush Kumar <ayushshyamkumar888@gmail.com> Remove testUnknownResource folder from repository Signed-off-by: Ayush Kumar <ayushshyamkumar888@gmail.com> Signed-off-by: Ayush Kumar <ayushshyamkumar888@gmail.com> feat: implement structured logging for validation handlers and remove deprecated request_logger Signed-off-by: Ayush Kumar <ayushshyamkumar888@gmail.com> Signed-off-by: Ayush Kumar <ayushshyamkumar888@gmail.com> feat: enhance structured logging and error handling in admission validation handlers Signed-off-by: Ayush Kumar <ayushshyamkumar888@gmail.com> Signed-off-by: Ayush Kumar <ayushshyamkumar888@gmail.com> feat: improve logging messages in validating handlers for better clarity Signed-off-by: Ayush Kumar <ayushshyamkumar888@gmail.com> Signed-off-by: Ayush Kumar <ayushshyamkumar888@gmail.com> feat: refactor logging field definitions for consistency and improve error handling in resource validation Signed-off-by: Ayush Kumar <ayushshyamkumar888@gmail.com> Signed-off-by: Ayush Kumar <ayushshyamkumar888@gmail.com> chore: add license header to invalid_resource_check.go and invalid_resource_check_test.go Signed-off-by: Ayush Kumar <ayushshyamkumar888@gmail.com> Signed-off-by: Ayush Kumar <ayushshyamkumar888@gmail.com> feat: enhance validation tests for WorkflowStepDefinition and improve error messages Signed-off-by: Ayush Kumar <ayushshyamkumar888@gmail.com> Signed-off-by: Ayush Kumar <ayushshyamkumar888@gmail.com> feat: add e2e-test-local target for k3d cluster setup and webhook validation Signed-off-by: Ayush Kumar <ayushshyamkumar888@gmail.com> Signed-off-by: Ayush Kumar <ayushshyamkumar888@gmail.com> feat: add webhook configuration for workflow step definitions with validation rules Signed-off-by: Ayush Kumar <ayushshyamkumar888@gmail.com> feat: update e2e-test-local configuration and improve Ingress API version compatibility Signed-off-by: Ayush Kumar <ayushshyamkumar888@gmail.com> feat: add installation of FluxCD CRDs in pre-hook to prevent webhook validation errors Signed-off-by: Ayush Kumar <ayushshyamkumar888@gmail.com> feat: add ValidateResourcesExist feature gate and enhance resource validation in webhook handlers Signed-off-by: Ayush Kumar <ayushshyamkumar888@gmail.com> feat: enhance resource validation in e2e tests and improve addon definition checks Signed-off-by: Ayush Kumar <ayushshyamkumar888@gmail.com> feat: enhance addon definition detection by using owner references for validation Signed-off-by: Ayush Kumar <ayushshyamkumar888@gmail.com> feat: add ValidateResourcesExist feature gate and implement webhook validation for resource existence Signed-off-by: Ayush Kumar <ayushshyamkumar888@gmail.com> feat: update Ingress API version to v1 and adjust service references in tests Signed-off-by: Ayush Kumar <ayushshyamkumar888@gmail.com> chore: remove webhook test commands and related YAML files from makefiles and tests Signed-off-by: Ayush Kumar <ayushshyamkumar888@gmail.com> chore: remove architecture section from webhook debugging guide Signed-off-by: Ayush Kumar <ayushshyamkumar888@gmail.com> feat: update webhook setup script with k3d host gateway IP note and improve cluster creation logic Signed-off-by: Ayush Kumar <ayushshyamkumar888@gmail.com> * Fix: Correct path in Ingress resource definition in template tests Signed-off-by: Ayush Kumar <ayushshyamkumar888@gmail.com> * Chore: add empty line to re-trigger failing workflow Signed-off-by: Vaibhav Agrawal <vaibhav.agrawal0096@gmail.com> * Chore: remove space to re-trigger workflow Signed-off-by: Chaitanya Reddy Onteddu <co@guidewire.com> --------- Signed-off-by: Ayush Kumar <ayushshyamkumar888@gmail.com> Signed-off-by: Vaibhav Agrawal <vaibhav.agrawal0096@gmail.com> Signed-off-by: Chaitanya Reddy Onteddu <co@guidewire.com> Co-authored-by: Chaitanya Reddy Onteddu <chaitanyareddy0702@gmail.com> Co-authored-by: Amit Singh <amisingh@guidewire.com>
965 lines
26 KiB
Go
965 lines
26 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 controllers_test
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"time"
|
|
|
|
. "github.com/onsi/ginkgo/v2"
|
|
. "github.com/onsi/gomega"
|
|
"github.com/pkg/errors"
|
|
appsv1 "k8s.io/api/apps/v1"
|
|
batchv1 "k8s.io/api/batch/v1"
|
|
corev1 "k8s.io/api/core/v1"
|
|
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
|
"sigs.k8s.io/controller-runtime/pkg/client"
|
|
|
|
"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("Test application of the specified definition version", func() {
|
|
ctx := context.Background()
|
|
|
|
var namespace string
|
|
var ns corev1.Namespace
|
|
|
|
BeforeEach(func() {
|
|
namespace = randomNamespaceName("defrev-e2e-test")
|
|
ns = corev1.Namespace{ObjectMeta: metav1.ObjectMeta{Name: namespace}}
|
|
|
|
Eventually(func() error {
|
|
return k8sClient.Create(ctx, &ns)
|
|
}, time.Second*3, time.Microsecond*300).Should(SatisfyAny(BeNil(), &util.AlreadyExistMatcher{}))
|
|
|
|
labelV1 := labelWithNoTemplate.DeepCopy()
|
|
labelV1.Spec.Schematic.CUE.Template = labelV1Template
|
|
labelV1.SetNamespace(namespace)
|
|
Expect(k8sClient.Create(ctx, labelV1)).Should(Succeed())
|
|
|
|
labelV1DefRev := new(v1beta1.DefinitionRevision)
|
|
Eventually(func() error {
|
|
return k8sClient.Get(ctx, client.ObjectKey{Name: "label-v1", Namespace: namespace}, labelV1DefRev)
|
|
}, 15*time.Second, time.Second).Should(BeNil())
|
|
|
|
labelV2 := new(v1beta1.TraitDefinition)
|
|
Eventually(func() error {
|
|
err := k8sClient.Get(ctx, client.ObjectKey{Name: "label", Namespace: namespace}, labelV2)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
labelV2.Spec.Schematic.CUE.Template = labelV2Template
|
|
return k8sClient.Update(ctx, labelV2)
|
|
}, 15*time.Second, time.Second).Should(BeNil())
|
|
|
|
labelV2DefRev := new(v1beta1.DefinitionRevision)
|
|
Eventually(func() error {
|
|
return k8sClient.Get(ctx, client.ObjectKey{Name: "label-v2", Namespace: namespace}, labelV2DefRev)
|
|
}, 15*time.Second, time.Second).Should(BeNil())
|
|
|
|
webserviceV1 := webServiceWithNoTemplate.DeepCopy()
|
|
webserviceV1.Spec.Schematic.CUE.Template = webServiceV1Template
|
|
webserviceV1.SetNamespace(namespace)
|
|
Expect(k8sClient.Create(ctx, webserviceV1)).Should(Succeed())
|
|
|
|
webserviceV1DefRev := new(v1beta1.DefinitionRevision)
|
|
Eventually(func() error {
|
|
return k8sClient.Get(ctx, client.ObjectKey{Name: "webservice-v1", Namespace: namespace}, webserviceV1DefRev)
|
|
}, 15*time.Second, time.Second).Should(BeNil())
|
|
|
|
webserviceV2 := new(v1beta1.ComponentDefinition)
|
|
Eventually(func() error {
|
|
err := k8sClient.Get(ctx, client.ObjectKey{Name: "webservice", Namespace: namespace}, webserviceV2)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
webserviceV2.Spec.Schematic.CUE.Template = webServiceV2Template
|
|
return k8sClient.Update(ctx, webserviceV2)
|
|
}, 15*time.Second, time.Second).Should(BeNil())
|
|
|
|
webserviceV2DefRev := new(v1beta1.DefinitionRevision)
|
|
Eventually(func() error {
|
|
return k8sClient.Get(ctx, client.ObjectKey{Name: "webservice-v2", Namespace: namespace}, webserviceV2DefRev)
|
|
}, 15*time.Second, time.Second).Should(BeNil())
|
|
|
|
jobV1 := jobComponentDef.DeepCopy()
|
|
jobV1.SetNamespace(namespace)
|
|
Expect(k8sClient.Create(ctx, jobV1)).Should(Succeed())
|
|
|
|
jobV1Rev := new(v1beta1.DefinitionRevision)
|
|
Eventually(func() error {
|
|
return k8sClient.Get(ctx, client.ObjectKey{Name: "job-v1.2.1", Namespace: namespace}, jobV1Rev)
|
|
}, 15*time.Second, time.Second).Should(BeNil())
|
|
})
|
|
|
|
AfterEach(func() {
|
|
By("Clean up resources after a test")
|
|
k8sClient.DeleteAllOf(ctx, &v1beta1.Application{}, client.InNamespace(namespace))
|
|
k8sClient.DeleteAllOf(ctx, &v1beta1.ComponentDefinition{}, client.InNamespace(namespace))
|
|
k8sClient.DeleteAllOf(ctx, &v1beta1.WorkloadDefinition{}, client.InNamespace(namespace))
|
|
k8sClient.DeleteAllOf(ctx, &v1beta1.TraitDefinition{}, client.InNamespace(namespace))
|
|
k8sClient.DeleteAllOf(ctx, &v1beta1.DefinitionRevision{}, client.InNamespace(namespace))
|
|
|
|
By(fmt.Sprintf("Delete the entire namespaceName %s", ns.Name))
|
|
Expect(k8sClient.Delete(ctx, &ns, client.PropagationPolicy(metav1.DeletePropagationForeground))).Should(Succeed())
|
|
})
|
|
|
|
It("Test tries to deploy component which has both spec.version and revision name annotation", func() {
|
|
workerV1 := workerWithNoTemplate.DeepCopy()
|
|
workerV1.Spec.Workload = common.WorkloadTypeDescriptor{
|
|
Definition: common.WorkloadGVK{
|
|
APIVersion: "batch/v1",
|
|
Kind: "Job",
|
|
},
|
|
}
|
|
workerV1.ObjectMeta.Annotations[oam.AnnotationDefinitionRevisionName] = "1.0.0"
|
|
workerV1.Spec.Version = "1.0.0"
|
|
workerV1.Spec.Schematic.CUE.Template = workerV1Template
|
|
workerV1.SetNamespace(namespace)
|
|
|
|
Expect(k8sClient.Create(ctx, workerV1)).ShouldNot(Succeed())
|
|
})
|
|
|
|
It("Test tries to deploy component which has spec.version and but no revision name annotation", func() {
|
|
workerV1 := workerWithNoTemplate.DeepCopy()
|
|
workerV1.Spec.Workload = common.WorkloadTypeDescriptor{
|
|
Definition: common.WorkloadGVK{
|
|
APIVersion: "batch/v1",
|
|
Kind: "Job",
|
|
},
|
|
}
|
|
workerV1.Spec.Version = "1.0.0"
|
|
workerV1.Spec.Schematic.CUE.Template = workerV1Template
|
|
workerV1.SetNamespace(namespace)
|
|
|
|
Expect(k8sClient.Create(ctx, workerV1)).Should(Succeed())
|
|
})
|
|
|
|
It("Test tries to deploy trait which has both spec.version and revision name annotation", func() {
|
|
traitV1 := scalerTrait.DeepCopy()
|
|
|
|
traitV1.Spec.Schematic.CUE.Template = scalerTraitOutputTemplate
|
|
traitV1.ObjectMeta.Annotations[oam.AnnotationDefinitionRevisionName] = "1.0.0"
|
|
// traitV1.Spec.Version = "1.0.0"
|
|
traitV1.SetNamespace(namespace)
|
|
|
|
Expect(k8sClient.Create(ctx, traitV1)).ShouldNot(Succeed())
|
|
})
|
|
|
|
It("Test tries to deploy trait which has spec.version and but no revision name annotation", func() {
|
|
traitV1 := scalerTrait.DeepCopy()
|
|
|
|
traitV1.Spec.Schematic.CUE.Template = scalerTraitOutputTemplate
|
|
traitV1.Spec.Version = "1.0.0"
|
|
traitV1.SetNamespace(namespace)
|
|
|
|
Expect(k8sClient.Create(ctx, traitV1)).Should(Succeed())
|
|
})
|
|
|
|
It("Test tries to deploy policy which has both spec.version and revision name annotation", func() {
|
|
policyV1 := policyDef.DeepCopy()
|
|
|
|
policyV1.ObjectMeta.Annotations[oam.AnnotationDefinitionRevisionName] = "1.0.0"
|
|
policyV1.Spec.Version = "1.0.0"
|
|
policyV1.Spec.Schematic.CUE.Template = workerV1Template
|
|
policyV1.SetNamespace(namespace)
|
|
|
|
Expect(k8sClient.Create(ctx, policyV1)).ShouldNot(Succeed())
|
|
})
|
|
|
|
It("Test tries to deploy policy which has spec.version and but no revision name annotation", func() {
|
|
policyV1 := policyDef.DeepCopy()
|
|
|
|
policyV1.Spec.Version = "1.0.0"
|
|
policyV1.Spec.Schematic.CUE.Template = workerV1Template
|
|
policyV1.SetNamespace(namespace)
|
|
|
|
Expect(k8sClient.Create(ctx, policyV1)).Should(Succeed())
|
|
})
|
|
|
|
It("Test deploy application which containing cue rendering module", func() {
|
|
var (
|
|
appName = "test-website-app"
|
|
comp1Name = "front"
|
|
comp2Name = "backend"
|
|
)
|
|
|
|
workerV1 := workerWithNoTemplate.DeepCopy()
|
|
workerV1.Spec.Workload = common.WorkloadTypeDescriptor{
|
|
Definition: common.WorkloadGVK{
|
|
APIVersion: "batch/v1",
|
|
Kind: "Job",
|
|
},
|
|
}
|
|
workerV1.Spec.Schematic.CUE.Template = workerV1Template
|
|
workerV1.SetNamespace(namespace)
|
|
Expect(k8sClient.Create(ctx, workerV1)).Should(Succeed())
|
|
|
|
workerV1DefRev := new(v1beta1.DefinitionRevision)
|
|
Eventually(func() error {
|
|
return k8sClient.Get(ctx, client.ObjectKey{Name: "worker-v1", Namespace: namespace}, workerV1DefRev)
|
|
}, 15*time.Second, time.Second).Should(BeNil())
|
|
|
|
workerV2 := new(v1beta1.ComponentDefinition)
|
|
Eventually(func() error {
|
|
err := k8sClient.Get(ctx, client.ObjectKey{Name: "worker", Namespace: namespace}, workerV2)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
workerV1.Spec.Workload = common.WorkloadTypeDescriptor{
|
|
Definition: common.WorkloadGVK{
|
|
APIVersion: "apps/v1",
|
|
Kind: "Deployment",
|
|
},
|
|
}
|
|
workerV2.Spec.Schematic.CUE.Template = workerV2Template
|
|
return k8sClient.Update(ctx, workerV2)
|
|
}, 15*time.Second, time.Second).Should(BeNil())
|
|
|
|
workerV2DefRev := new(v1beta1.DefinitionRevision)
|
|
Eventually(func() error {
|
|
return k8sClient.Get(ctx, client.ObjectKey{Name: "worker-v2", Namespace: namespace}, workerV2DefRev)
|
|
}, 15*time.Second, time.Second).Should(BeNil())
|
|
|
|
app := v1beta1.Application{
|
|
ObjectMeta: metav1.ObjectMeta{
|
|
Name: appName,
|
|
Namespace: namespace,
|
|
},
|
|
Spec: v1beta1.ApplicationSpec{
|
|
Components: []common.ApplicationComponent{
|
|
{
|
|
Name: comp1Name,
|
|
Type: "webservice",
|
|
Properties: util.Object2RawExtension(map[string]interface{}{
|
|
"image": "nginx",
|
|
}),
|
|
Traits: []common.ApplicationTrait{
|
|
{
|
|
Type: "label",
|
|
Properties: util.Object2RawExtension(map[string]interface{}{
|
|
"labels": map[string]string{
|
|
"hello": "world",
|
|
},
|
|
}),
|
|
},
|
|
},
|
|
},
|
|
{
|
|
Name: comp2Name,
|
|
Type: "worker",
|
|
Properties: util.Object2RawExtension(map[string]interface{}{
|
|
"image": "busybox",
|
|
"cmd": []string{"sleep", "1000"},
|
|
}),
|
|
},
|
|
},
|
|
},
|
|
}
|
|
|
|
By("Create application")
|
|
Eventually(func() error {
|
|
return k8sClient.Create(ctx, app.DeepCopy())
|
|
}, 10*time.Second, 500*time.Millisecond).Should(Succeed())
|
|
|
|
By("Verify the workload(deployment) is created successfully")
|
|
webServiceDeploy := &appsv1.Deployment{}
|
|
deployName := comp1Name
|
|
Eventually(func() error {
|
|
return k8sClient.Get(ctx, client.ObjectKey{Name: deployName, Namespace: namespace}, webServiceDeploy)
|
|
}, 30*time.Second, 3*time.Second).Should(Succeed())
|
|
|
|
workerDeploy := &appsv1.Deployment{}
|
|
deployName = comp2Name
|
|
Eventually(func() error {
|
|
return k8sClient.Get(ctx, client.ObjectKey{Name: deployName, Namespace: namespace}, workerDeploy)
|
|
}, 30*time.Second, 3*time.Second).Should(Succeed())
|
|
|
|
By("Verify trait is applied to the workload")
|
|
webserviceLabels := webServiceDeploy.GetLabels()
|
|
Expect(webserviceLabels["hello"]).Should(Equal("world"))
|
|
|
|
By("Update Application and Specify the Definition version in Application")
|
|
app = v1beta1.Application{
|
|
ObjectMeta: metav1.ObjectMeta{
|
|
Name: appName,
|
|
Namespace: namespace,
|
|
},
|
|
Spec: v1beta1.ApplicationSpec{
|
|
Components: []common.ApplicationComponent{
|
|
{
|
|
Name: comp1Name,
|
|
Type: "webservice@v1",
|
|
Properties: util.Object2RawExtension(map[string]interface{}{
|
|
"image": "nginx",
|
|
}),
|
|
Traits: []common.ApplicationTrait{
|
|
{
|
|
Type: "label@v1",
|
|
Properties: util.Object2RawExtension(map[string]interface{}{
|
|
"labels": map[string]string{
|
|
"hello": "kubevela",
|
|
},
|
|
}),
|
|
},
|
|
},
|
|
},
|
|
{
|
|
Name: comp2Name,
|
|
Type: "worker@v1",
|
|
Properties: util.Object2RawExtension(map[string]interface{}{
|
|
"image": "busybox",
|
|
"cmd": []string{"sleep", "1000"},
|
|
}),
|
|
},
|
|
},
|
|
},
|
|
}
|
|
Expect(k8sClient.Patch(ctx, &app, client.Merge)).Should(Succeed())
|
|
|
|
By("Wait for dispatching v2 resources successfully")
|
|
Eventually(func() error {
|
|
RequestReconcileNow(ctx, &app)
|
|
rt := &v1beta1.ResourceTracker{}
|
|
if err := k8sClient.Get(ctx, client.ObjectKey{Name: fmt.Sprintf("%s-v2-%s", appName, namespace)}, rt); err != nil {
|
|
return err
|
|
}
|
|
if len(rt.Spec.ManagedResources) != 0 {
|
|
return nil
|
|
}
|
|
return errors.New("v2 resources have not been dispatched")
|
|
}, 10*time.Second, 500*time.Millisecond).Should(Succeed())
|
|
|
|
By("Verify the workload(deployment) is created successfully")
|
|
webServiceV1Deploy := &appsv1.Deployment{}
|
|
deployName = comp1Name
|
|
Eventually(func() error {
|
|
return k8sClient.Get(ctx, client.ObjectKey{Name: deployName, Namespace: namespace}, webServiceV1Deploy)
|
|
}, 30*time.Second, 3*time.Second).Should(Succeed())
|
|
|
|
By("Verify the workload(job) is created successfully")
|
|
workerJob := &batchv1.Job{}
|
|
jobName := comp2Name
|
|
Eventually(func() error {
|
|
return k8sClient.Get(ctx, client.ObjectKey{Name: jobName, Namespace: namespace}, workerJob)
|
|
}, 30*time.Second, 3*time.Second).Should(Succeed())
|
|
|
|
By("Verify if trait is applied to the workload")
|
|
webserviceV1Labels := webServiceV1Deploy.GetLabels()
|
|
Expect(webserviceV1Labels["hello"]).Should(Equal("kubevela"))
|
|
By("Check Application is rendered by the specified version of the Definition")
|
|
Expect(webServiceV1Deploy.Labels["componentdefinition.oam.dev/version"]).Should(Equal("v1"))
|
|
Expect(webServiceV1Deploy.Labels["traitdefinition.oam.dev/version"]).Should(Equal("v1"))
|
|
|
|
By("Application specifies the wrong version of the Definition, it will raise an error")
|
|
app = v1beta1.Application{
|
|
ObjectMeta: metav1.ObjectMeta{
|
|
Name: appName,
|
|
Namespace: namespace,
|
|
},
|
|
Spec: v1beta1.ApplicationSpec{
|
|
Components: []common.ApplicationComponent{
|
|
{
|
|
Name: comp1Name,
|
|
Type: "webservice@v10",
|
|
Properties: util.Object2RawExtension(map[string]interface{}{
|
|
"image": "nginx",
|
|
"cmd": []string{"sleep", "1000"},
|
|
}),
|
|
},
|
|
},
|
|
},
|
|
}
|
|
Expect(k8sClient.Patch(ctx, &app, client.Merge)).Should(HaveOccurred())
|
|
})
|
|
|
|
It("Test deploy application which specify the name of component", func() {
|
|
compName := "job"
|
|
app := v1beta1.Application{
|
|
ObjectMeta: metav1.ObjectMeta{
|
|
Name: "test-defrevision-app-with-job",
|
|
Namespace: namespace,
|
|
},
|
|
Spec: v1beta1.ApplicationSpec{
|
|
Components: []common.ApplicationComponent{
|
|
{
|
|
Name: compName,
|
|
Type: "job@v1.2.1",
|
|
Properties: util.Object2RawExtension(map[string]interface{}{
|
|
"image": "busybox",
|
|
"cmd": []string{"sleep", "1000"},
|
|
}),
|
|
},
|
|
},
|
|
},
|
|
}
|
|
Expect(k8sClient.Create(ctx, &app)).Should(Succeed())
|
|
|
|
By("Verify the workload(job) is created successfully")
|
|
busyBoxJob := &batchv1.Job{}
|
|
jobName := compName
|
|
Eventually(func() error {
|
|
return k8sClient.Get(ctx, client.ObjectKey{Name: jobName, Namespace: namespace}, busyBoxJob)
|
|
}, 30*time.Second, 3*time.Second).Should(Succeed())
|
|
})
|
|
|
|
// refer to https://github.com/oam-dev/kubevela/discussions/1810#discussioncomment-914295
|
|
It("Test k8s resources created by application whether with correct label", func() {
|
|
var (
|
|
appName = "test-resources-labels"
|
|
compName = "web"
|
|
)
|
|
|
|
exposeV1 := exposeWithNoTemplate.DeepCopy()
|
|
exposeV1.Spec.Schematic.CUE.Template = exposeV1Template
|
|
exposeV1.SetNamespace(namespace)
|
|
Expect(k8sClient.Create(ctx, exposeV1)).Should(Succeed())
|
|
|
|
exposeV1DefRev := new(v1beta1.DefinitionRevision)
|
|
Eventually(func() error {
|
|
return k8sClient.Get(ctx, client.ObjectKey{Name: "expose-v1", Namespace: namespace}, exposeV1DefRev)
|
|
}, 15*time.Second, time.Second).Should(BeNil())
|
|
|
|
exposeV2 := new(v1beta1.TraitDefinition)
|
|
Eventually(func() error {
|
|
err := k8sClient.Get(ctx, client.ObjectKey{Name: "expose", Namespace: namespace}, exposeV2)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
exposeV2.Spec.Schematic.CUE.Template = exposeV2Template
|
|
return k8sClient.Update(ctx, exposeV2)
|
|
}, 15*time.Second, time.Second).Should(BeNil())
|
|
|
|
exposeV2DefRev := new(v1beta1.DefinitionRevision)
|
|
Eventually(func() error {
|
|
return k8sClient.Get(ctx, client.ObjectKey{Name: "expose-v2", Namespace: namespace}, exposeV2DefRev)
|
|
}, 15*time.Second, time.Second).Should(BeNil())
|
|
|
|
app := v1beta1.Application{
|
|
ObjectMeta: metav1.ObjectMeta{
|
|
Name: appName,
|
|
Namespace: namespace,
|
|
},
|
|
Spec: v1beta1.ApplicationSpec{
|
|
Components: []common.ApplicationComponent{
|
|
{
|
|
Name: compName,
|
|
Type: "webservice@v1",
|
|
Properties: util.Object2RawExtension(map[string]interface{}{
|
|
"image": "crccheck/hello-world",
|
|
"port": 8000,
|
|
}),
|
|
Traits: []common.ApplicationTrait{
|
|
{
|
|
Type: "expose@v1",
|
|
Properties: util.Object2RawExtension(map[string]interface{}{
|
|
"port": []int{8000},
|
|
}),
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
}
|
|
|
|
By("Create application")
|
|
Eventually(func() error {
|
|
return k8sClient.Create(ctx, app.DeepCopy())
|
|
}, 10*time.Second, 500*time.Millisecond).Should(Succeed())
|
|
|
|
By("Verify the workload(deployment) is created successfully")
|
|
webServiceDeploy := &appsv1.Deployment{}
|
|
deployName := compName
|
|
Eventually(func() error {
|
|
return k8sClient.Get(ctx, client.ObjectKey{Name: deployName, Namespace: namespace}, webServiceDeploy)
|
|
}, 30*time.Second, 3*time.Second).Should(Succeed())
|
|
|
|
By("Verify the workload label generated by KubeVela")
|
|
workloadLabel := webServiceDeploy.GetLabels()[oam.WorkloadTypeLabel]
|
|
Expect(workloadLabel).Should(Equal("webservice-v1"))
|
|
|
|
By("Verify the traPIt(service) is created successfully")
|
|
exposeSVC := &corev1.Service{}
|
|
Eventually(func() error {
|
|
return k8sClient.Get(ctx, client.ObjectKey{Name: compName, Namespace: namespace}, exposeSVC)
|
|
}, 30*time.Second, 3*time.Second).Should(Succeed())
|
|
|
|
By("Verify the trait label generated by KubeVela")
|
|
traitLabel := exposeSVC.GetLabels()[oam.TraitTypeLabel]
|
|
Expect(traitLabel).Should(Equal("expose-v1"))
|
|
})
|
|
})
|
|
|
|
var webServiceWithNoTemplate = &v1beta1.ComponentDefinition{
|
|
TypeMeta: metav1.TypeMeta{
|
|
Kind: "ComponentDefinition",
|
|
APIVersion: "core.oam.dev/v1beta1",
|
|
},
|
|
ObjectMeta: metav1.ObjectMeta{
|
|
Name: "webservice",
|
|
},
|
|
Spec: v1beta1.ComponentDefinitionSpec{
|
|
Workload: common.WorkloadTypeDescriptor{
|
|
Definition: common.WorkloadGVK{
|
|
APIVersion: "apps/v1",
|
|
Kind: "Deployment",
|
|
},
|
|
},
|
|
Schematic: &common.Schematic{
|
|
CUE: &common.CUE{
|
|
Template: "",
|
|
},
|
|
},
|
|
},
|
|
}
|
|
|
|
var workerWithNoTemplate = &v1beta1.ComponentDefinition{
|
|
TypeMeta: metav1.TypeMeta{
|
|
Kind: "ComponentDefinition",
|
|
APIVersion: "core.oam.dev/v1beta1",
|
|
},
|
|
ObjectMeta: metav1.ObjectMeta{
|
|
Name: "worker",
|
|
Annotations: map[string]string{},
|
|
},
|
|
Spec: v1beta1.ComponentDefinitionSpec{
|
|
Schematic: &common.Schematic{
|
|
CUE: &common.CUE{
|
|
Template: "",
|
|
},
|
|
},
|
|
},
|
|
}
|
|
|
|
var jobComponentDef = &v1beta1.ComponentDefinition{
|
|
TypeMeta: metav1.TypeMeta{
|
|
Kind: "ComponentDefinition",
|
|
APIVersion: "core.oam.dev/v1beta1",
|
|
},
|
|
ObjectMeta: metav1.ObjectMeta{
|
|
Name: "job",
|
|
Annotations: map[string]string{
|
|
oam.AnnotationDefinitionRevisionName: "1.2.1",
|
|
},
|
|
},
|
|
Spec: v1beta1.ComponentDefinitionSpec{
|
|
Workload: common.WorkloadTypeDescriptor{
|
|
Definition: common.WorkloadGVK{
|
|
APIVersion: "batch/v1",
|
|
Kind: "Job",
|
|
},
|
|
},
|
|
Schematic: &common.Schematic{
|
|
CUE: &common.CUE{
|
|
Template: workerV1Template,
|
|
},
|
|
},
|
|
},
|
|
}
|
|
|
|
var policyDefOutputTemplate = `properties: enable: true`
|
|
|
|
var policyDef = &v1beta1.PolicyDefinition{
|
|
TypeMeta: metav1.TypeMeta{
|
|
Kind: "PolicyDefinition",
|
|
APIVersion: "core.oam.dev/v1beta1",
|
|
},
|
|
ObjectMeta: metav1.ObjectMeta{
|
|
Name: "policy-apply-once",
|
|
Annotations: map[string]string{},
|
|
},
|
|
Spec: v1beta1.PolicyDefinitionSpec{
|
|
Version: "1.0.0",
|
|
Schematic: &common.Schematic{
|
|
CUE: &common.CUE{
|
|
Template: policyDefOutputTemplate,
|
|
},
|
|
},
|
|
},
|
|
}
|
|
|
|
var KUBEWorker = &v1beta1.ComponentDefinition{
|
|
TypeMeta: metav1.TypeMeta{
|
|
Kind: "ComponentDefinition",
|
|
APIVersion: "core.oam.dev/v1beta1",
|
|
},
|
|
ObjectMeta: metav1.ObjectMeta{
|
|
Name: "kube-worker",
|
|
},
|
|
}
|
|
|
|
var HELMWorker = &v1beta1.ComponentDefinition{
|
|
TypeMeta: metav1.TypeMeta{
|
|
Kind: "ComponentDefinition",
|
|
APIVersion: "core.oam.dev/v1beta1",
|
|
},
|
|
ObjectMeta: metav1.ObjectMeta{
|
|
Name: "helm-worker",
|
|
},
|
|
}
|
|
|
|
var labelWithNoTemplate = &v1beta1.TraitDefinition{
|
|
TypeMeta: metav1.TypeMeta{
|
|
Kind: "TraitDefinition",
|
|
APIVersion: "core.oam.dev/v1beta1",
|
|
},
|
|
ObjectMeta: metav1.ObjectMeta{
|
|
Name: "label",
|
|
},
|
|
Spec: v1beta1.TraitDefinitionSpec{
|
|
Schematic: &common.Schematic{
|
|
CUE: &common.CUE{
|
|
Template: "",
|
|
},
|
|
},
|
|
},
|
|
}
|
|
|
|
var exposeWithNoTemplate = &v1beta1.TraitDefinition{
|
|
TypeMeta: metav1.TypeMeta{
|
|
Kind: "TraitDefinition",
|
|
APIVersion: "core.oam.dev/v1beta1",
|
|
},
|
|
ObjectMeta: metav1.ObjectMeta{
|
|
Name: "expose",
|
|
},
|
|
Spec: v1beta1.TraitDefinitionSpec{
|
|
Schematic: &common.Schematic{
|
|
CUE: &common.CUE{
|
|
Template: "",
|
|
},
|
|
},
|
|
},
|
|
}
|
|
|
|
var webServiceV1Template = `output: {
|
|
apiVersion: "apps/v1"
|
|
kind: "Deployment"
|
|
metadata: labels: {
|
|
"componentdefinition.oam.dev/version": "v1"
|
|
}
|
|
spec: {
|
|
selector: matchLabels: {
|
|
"app.oam.dev/component": context.name
|
|
}
|
|
template: {
|
|
metadata: labels: {
|
|
"app.oam.dev/component": context.name
|
|
}
|
|
spec: {
|
|
containers: [{
|
|
name: context.name
|
|
image: parameter.image
|
|
if parameter["cmd"] != _|_ {
|
|
command: parameter.cmd
|
|
}
|
|
if parameter["env"] != _|_ {
|
|
env: parameter.env
|
|
}
|
|
if context["config"] != _|_ {
|
|
env: context.config
|
|
}
|
|
ports: [{
|
|
containerPort: parameter.port
|
|
}]
|
|
if parameter["cpu"] != _|_ {
|
|
resources: {
|
|
limits:
|
|
cpu: parameter.cpu
|
|
requests:
|
|
cpu: parameter.cpu
|
|
}
|
|
}
|
|
}]
|
|
}
|
|
}
|
|
}
|
|
}
|
|
parameter: {
|
|
image: string
|
|
cmd?: [...string]
|
|
port: *80 | int
|
|
env?: [...{
|
|
name: string
|
|
value?: string
|
|
valueFrom?: {
|
|
secretKeyRef: {
|
|
name: string
|
|
key: string
|
|
}
|
|
}
|
|
}]
|
|
cpu?: string
|
|
}
|
|
`
|
|
|
|
var webServiceV2Template = `output: {
|
|
apiVersion: "apps/v1"
|
|
kind: "Deployment"
|
|
spec: {
|
|
selector: matchLabels: {
|
|
"app.oam.dev/component": context.name
|
|
}
|
|
template: {
|
|
metadata: labels: {
|
|
"app.oam.dev/component": context.name
|
|
if parameter.addRevisionLabel {
|
|
"app.oam.dev/appRevision": context.appRevision
|
|
}
|
|
}
|
|
spec: {
|
|
containers: [{
|
|
name: context.name
|
|
image: parameter.image
|
|
if parameter["cmd"] != _|_ {
|
|
command: parameter.cmd
|
|
}
|
|
if parameter["env"] != _|_ {
|
|
env: parameter.env
|
|
}
|
|
if context["config"] != _|_ {
|
|
env: context.config
|
|
}
|
|
ports: [{
|
|
containerPort: parameter.port
|
|
}]
|
|
if parameter["cpu"] != _|_ {
|
|
resources: {
|
|
limits:
|
|
cpu: parameter.cpu
|
|
requests:
|
|
cpu: parameter.cpu
|
|
}
|
|
}
|
|
}]
|
|
}
|
|
}
|
|
}
|
|
}
|
|
parameter: {
|
|
image: string
|
|
cmd?: [...string]
|
|
port: *80 | int
|
|
env?: [...{
|
|
name: string
|
|
value?: string
|
|
valueFrom?: {
|
|
secretKeyRef: {
|
|
name: string
|
|
key: string
|
|
}
|
|
}
|
|
}]
|
|
cpu?: string
|
|
addRevisionLabel: *false | bool
|
|
}
|
|
`
|
|
|
|
var workerV1Template = `output: {
|
|
apiVersion: "batch/v1"
|
|
kind: "Job"
|
|
spec: {
|
|
parallelism: parameter.count
|
|
completions: parameter.count
|
|
template: spec: {
|
|
restartPolicy : parameter.restart
|
|
containers: [{
|
|
name: context.name
|
|
image: parameter.image
|
|
if parameter["cmd"] != _|_ {
|
|
command: parameter.cmd
|
|
}
|
|
}]
|
|
}
|
|
}
|
|
}
|
|
parameter: {
|
|
count: *1 | int
|
|
image: string
|
|
restart: *"Never" | string
|
|
cmd?: [...string]
|
|
}
|
|
`
|
|
|
|
var workerV2Template = `output: {
|
|
apiVersion: "apps/v1"
|
|
kind: "Deployment"
|
|
spec: {
|
|
selector: matchLabels: {
|
|
"app.oam.dev/component": context.name
|
|
}
|
|
template: {
|
|
metadata: labels: {
|
|
"app.oam.dev/component": context.name
|
|
}
|
|
spec: {
|
|
containers: [{
|
|
name: context.name
|
|
image: parameter.image
|
|
|
|
if parameter["cmd"] != _|_ {
|
|
command: parameter.cmd
|
|
}
|
|
}]
|
|
}
|
|
}
|
|
}
|
|
}
|
|
parameter: {
|
|
image: string
|
|
cmd?: [...string]
|
|
}
|
|
`
|
|
|
|
var labelV1Template = `patch: {
|
|
metadata: labels: {
|
|
for k, v in parameter.labels {
|
|
"\(k)": v
|
|
}
|
|
"traitdefinition.oam.dev/version": "v1"
|
|
}
|
|
}
|
|
parameter: {
|
|
labels: [string]: string
|
|
}
|
|
`
|
|
|
|
var labelV2Template = `patch: {
|
|
metadata: labels: {
|
|
for k, v in parameter.labels {
|
|
"\(k)": v
|
|
}
|
|
}
|
|
}
|
|
parameter: {
|
|
labels: [string]: string
|
|
}
|
|
`
|
|
|
|
var KUBEWorkerV1Template = `apiVersion: apps/v1
|
|
kind: Deployment
|
|
spec:
|
|
selector:
|
|
matchLabels:
|
|
app: nginx
|
|
template:
|
|
metadata:
|
|
labels:
|
|
app: nginx
|
|
spec:
|
|
containers:
|
|
- name: nginx
|
|
ports:
|
|
- containerPort: 80
|
|
`
|
|
|
|
var KUBEWorkerV2Template = `apiVersion: "batch/v1"
|
|
kind: "Job"
|
|
spec:
|
|
parallelism: 1
|
|
completions: 1
|
|
template:
|
|
spec:
|
|
restartPolicy: "Never"
|
|
containers:
|
|
- name: "job"
|
|
image: "busybox"
|
|
command:
|
|
- "sleep"
|
|
- "1000"
|
|
`
|
|
|
|
var exposeV1Template = `
|
|
outputs: service: {
|
|
apiVersion: "v1"
|
|
kind: "Service"
|
|
metadata:
|
|
name: context.name
|
|
spec: {
|
|
selector:
|
|
"app.oam.dev/component": context.name
|
|
ports: [
|
|
for p in parameter.port {
|
|
port: p
|
|
targetPort: p
|
|
},
|
|
]
|
|
}
|
|
}
|
|
parameter: {
|
|
// +usage=Specify the exposion ports
|
|
port: [...int]
|
|
}
|
|
`
|
|
|
|
var exposeV2Template = `
|
|
outputs: service: {
|
|
apiVersion: "v1"
|
|
kind: "Service"
|
|
metadata:
|
|
name: context.name
|
|
spec: {
|
|
selector: {
|
|
"app.oam.dev/component": context.name
|
|
}
|
|
ports: [
|
|
for k, v in parameter.http {
|
|
port: v
|
|
targetPort: v
|
|
},
|
|
]
|
|
}
|
|
}
|
|
|
|
outputs: ingress: {
|
|
apiVersion: "networking.k8s.io/v1"
|
|
kind: "Ingress"
|
|
metadata:
|
|
name: context.name
|
|
spec: {
|
|
rules: [{
|
|
host: parameter.domain
|
|
http: {
|
|
paths: [
|
|
for k, v in parameter.http {
|
|
path: k
|
|
pathType: "Prefix"
|
|
backend: {
|
|
service: {
|
|
name: context.name
|
|
port: {
|
|
number: v
|
|
}
|
|
}
|
|
}
|
|
},
|
|
]
|
|
}
|
|
}]
|
|
}
|
|
}
|
|
|
|
parameter: {
|
|
domain: string
|
|
http: [string]: int
|
|
}
|
|
`
|