github/kubevela
1
0
Fork 0
mirror of https://github.com/kubevela/kubevela.git synced 2026-04-22 10:37:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

cue template health check skipStandard workload and fix test diverge (#3087)

Browse Source 
Signed-off-by: wangyike <wangyike_wyk@163.com>

add annotation

Signed-off-by: wangyike <wangyike_wyk@163.com>

set skipStandardworkload in wl

Signed-off-by: wangyike <wangyike_wyk@163.com>

add annotation

Signed-off-by: wangyike <wangyike_wyk@163.com>
This commit is contained in:
wyike
2022-01-13 19:08:43 +08:00
committed by GitHub
parent c298c98f25
commit 5b1c47c918
3 changed files with 20 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/appfile/appfile.go
View File

@@ -81,6 +81,7 @@ type Workload struct {
Ctx process.Context
Patch *value.Value
engine definition.AbstractEngine
SkipApplyWorkload bool
}
// EvalContext eval workload template and set result to context
@@ -90,12 +91,17 @@ func (wl *Workload) EvalContext(ctx process.Context) error {
// EvalStatus eval workload status
func (wl *Workload) EvalStatus(ctx process.Context, cli client.Client, ns string) (string, error) {
// if the standard workload is managed by trait always return empty message
if wl.SkipApplyWorkload {
return "", nil
}
return wl.engine.Status(ctx, cli, ns, wl.FullTemplate.CustomStatus, wl.Params)
}
// EvalHealth eval workload health check
func (wl *Workload) EvalHealth(ctx process.Context, client client.Client, namespace string) (bool, error) {
if wl.FullTemplate.Health == "" {
// if health of template is not set or standard workload is managed by trait always return true
if wl.FullTemplate.Health == "" || wl.SkipApplyWorkload {
return true, nil
}
return wl.engine.HealthCheck(ctx, client, namespace, wl.FullTemplate.Health)

12
pkg/controller/core.oam.dev/v1alpha2/application/generator.go
View File

@@ -162,8 +162,8 @@ func (h *AppHandler) applyComponentFunc(appParser *appfile.Parser, appRev *v1bet
if err != nil {
return nil, nil, false, err
}
skipStandardWorkload := skipApplyWorkload(wl)
if !skipStandardWorkload {
checkSkipApplyWorkload(wl)
if !wl.SkipApplyWorkload {
if err := h.Dispatch(ctx, clusterName, common.WorkflowResourceCreator, readyWorkload); err != nil {
return nil, nil, false, errors.WithMessage(err, "DispatchStandardWorkload")
}
@@ -181,7 +181,7 @@ func (h *AppHandler) applyComponentFunc(appParser *appfile.Parser, appRev *v1bet
if !isHealth {
return nil, nil, false, nil
}
workload, traits, err := getComponentResources(ctx, manifest, skipStandardWorkload, h.r.Client)
workload, traits, err := getComponentResources(ctx, manifest, wl.SkipApplyWorkload, h.r.Client)
return workload, traits, true, err
}
}
@@ -231,13 +231,13 @@ func renderComponentsAndTraits(client client.Client, manifest *types.ComponentMa
return readyWorkload, readyTraits, nil
}
func skipApplyWorkload(wl *appfile.Workload) bool {
func checkSkipApplyWorkload(wl *appfile.Workload) {
for _, trait := range wl.Traits {
if trait.FullTemplate.TraitDefinition.Spec.ManageWorkload {
return true
wl.SkipApplyWorkload = true
break
}
}
return false
}
func getComponentResources(ctx context.Context, manifest *types.ComponentManifest, skipStandardWorkload bool, cli client.Client) (*unstructured.Unstructured, []*unstructured.Unstructured, error) {

133
test/e2e-test/rollout_trait_test.go
View File

@@ -28,7 +28,6 @@ import (
"k8s.io/apimachinery/pkg/types"
"k8s.io/apimachinery/pkg/util/intstr"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/yaml"
common2 "github.com/oam-dev/kubevela/apis/core.oam.dev/common"
"github.com/oam-dev/kubevela/apis/standard.oam.dev/v1alpha1"
@@ -53,26 +52,6 @@ var _ = Describe("rollout related e2e-test,rollout trait test", func() {
var targerDeploy, sourceDeploy v1.Deployment
var err error
createAllDef := func() {
By("install all related definition")
var cd v1beta1.ComponentDefinition
Expect(yaml.Unmarshal([]byte(rolloutTestWd), &cd))
// create the componentDefinition if not exist
cd.Namespace = namespaceName
Eventually(
func() error {
return k8sClient.Create(ctx, &cd)
},
time.Second*3, time.Millisecond*300).Should(SatisfyAny(BeNil(), &util.AlreadyExistMatcher{}))
var td v1beta1.TraitDefinition
Expect(yaml.Unmarshal([]byte(rolloutTestTd), &td)).Should(BeNil())
td.Namespace = namespaceName
Eventually(func() error {
return k8sClient.Create(ctx, &td)
},
time.Second*3, time.Millisecond*300).Should(SatisfyAny(BeNil(), &util.AlreadyExistMatcher{}))
}
createNamespace := func() {
ns = corev1.Namespace{
ObjectMeta: metav1.ObjectMeta{
@@ -155,7 +134,6 @@ var _ = Describe("rollout related e2e-test,rollout trait test", func() {
namespaceName = randomNamespaceName("rollout-trait-e2e-test")
app = v1beta1.Application{}
createNamespace()
createAllDef()
componentName = "express-server"
})
@@ -211,7 +189,7 @@ var _ = Describe("rollout related e2e-test,rollout trait test", func() {
if err = k8sClient.Get(ctx, appKey, checkApp); err != nil {
return err
}
checkApp.Spec.Components[0].Traits[0].Properties.Raw = []byte(`{"targetRevision":"express-server-v2","firstBatchReplicas":1,"secondBatchReplicas":1}`)
checkApp.Spec.Components[0].Traits[0].Properties.Raw = []byte(`{"targetRevision":"express-server-v2","rolloutBatches":[{"replicas":1},{"replicas":1}],"targetSize":2}`)
if err = k8sClient.Update(ctx, checkApp); err != nil {
return err
}
@@ -223,8 +201,7 @@ var _ = Describe("rollout related e2e-test,rollout trait test", func() {
if err = k8sClient.Get(ctx, appKey, checkApp); err != nil {
return err
}
checkApp.Spec.Components[0].Traits[0].Properties.Raw =
[]byte(`{"targetRevision":"express-server-v2","targetSize":4,"firstBatchReplicas":1,"secondBatchReplicas":1}`)
checkApp.Spec.Components[0].Traits[0].Properties.Raw = []byte(`{"targetRevision":"express-server-v2","targetSize":4,"rolloutBatches":[{"replicas":1},{"replicas":1}]}`)
if err = k8sClient.Update(ctx, checkApp); err != nil {
return err
}
@@ -239,7 +216,7 @@ var _ = Describe("rollout related e2e-test,rollout trait test", func() {
}
checkApp.Spec.Components[0].Properties.Raw = []byte(`{"image":"stefanprodan/podinfo:4.0.3","cpu":"0.3"}`)
checkApp.Spec.Components[0].Traits[0].Properties.Raw =
[]byte(`{"firstBatchReplicas":2,"secondBatchReplicas":2,"targetSize":4}`)
[]byte(`{"rolloutBatches":[{"replicas":2},{"replicas":2}],"targetSize":4}`)
if err = k8sClient.Update(ctx, checkApp); err != nil {
return err
}
@@ -251,9 +228,9 @@ var _ = Describe("rollout related e2e-test,rollout trait test", func() {
if err = k8sClient.Get(ctx, appKey, checkApp); err != nil {
return err
}
checkApp.Spec.Components[0].Properties.Raw = []byte(`{"image":"stefanprodan/podinfo:4.0.3","cpu":"0.5"}`)
checkApp.Spec.Components[0].Properties.Raw = []byte(`{"image":"stefanprodan/podinfo:4.0.3","cpu":"0.31"}`)
checkApp.Spec.Components[0].Traits[0].Properties.Raw =
[]byte(`{"firstBatchReplicas":2,"secondBatchReplicas":2,"targetSize":4,"batchPartition":0}`)
[]byte(`{"rolloutBatches":[{"replicas":2},{"replicas":2}],"targetSize":4,"batchPartition":0}`)
if err = k8sClient.Update(ctx, checkApp); err != nil {
return err
}
@@ -291,7 +268,7 @@ var _ = Describe("rollout related e2e-test,rollout trait test", func() {
return err
}
checkApp.Spec.Components[0].Traits[0].Properties.Raw =
[]byte(`{"firstBatchReplicas":2,"secondBatchReplicas":2,"targetSize":4,"batchPartition":1}`)
[]byte(`{"rolloutBatches":[{"replicas":2},{"replicas":2}],"targetSize":4,"batchPartition":1}`)
if err = k8sClient.Update(ctx, checkApp); err != nil {
return err
}
@@ -362,7 +339,7 @@ var _ = Describe("rollout related e2e-test,rollout trait test", func() {
}
checkApp.Spec.Components[0].Properties.Raw = []byte(`{"image":"stefanprodan/podinfo:4.0.3","cpu":"0.1"}`)
checkApp.Spec.Components[0].Traits[0].Properties.Raw =
[]byte(`{"firstBatchReplicas":2,"secondBatchReplicas":2,"targetSize":4}`)
[]byte(`{"rolloutBatches":[{"replicas":2},{"replicas":2}],"targetSize":4}`)
if err = k8sClient.Update(ctx, checkApp); err != nil {
return err
}
@@ -441,99 +418,3 @@ var _ = Describe("rollout related e2e-test,rollout trait test", func() {
}, 30*time.Second, 300*time.Millisecond).Should(BeNil())
})
})
const (
rolloutTestWd = `# Code generated by KubeVela templates. DO NOT EDIT.
apiVersion: core.oam.dev/v1beta1
kind: ComponentDefinition
metadata:
name: webservice
spec:
workload:
definition:
apiVersion: apps/v1
kind: Deployment
schematic:
cue:
template: |
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["cpu"] != _|_ {
resources: {
limits:
cpu: parameter.cpu
requests: cpu: "0"
}
}
}]
}
}
}
}
parameter: {
// +usage=Which image would you like to use for your service
// +short=i
image: string
cpu?: 0.5|string
}
`
rolloutTestTd = `apiVersion: core.oam.dev/v1beta1
kind: TraitDefinition
metadata:
name: rollout
spec:
manageWorkload: true
schematic:
cue:
template: |
outputs: rollout: {
apiVersion: "standard.oam.dev/v1alpha1"
kind: "Rollout"
metadata: {
name: context.name
namespace: context.namespace
}
spec: {
targetRevisionName: parameter.targetRevision
componentName: context.name
rolloutPlan: {
rolloutStrategy: "DecreaseFirst"
if parameter.firstBatchReplicas != _|_ && parameter.secondBatchReplicas != _|_ {
rolloutBatches:[
{ replicas: parameter.firstBatchReplicas},
{ replicas: parameter.secondBatchReplicas}]
}
targetSize: parameter.targetSize
if parameter["batchPartition"] != _|_ {
batchPartition: parameter.batchPartition
}
}
}
}
parameter: {
targetRevision: *context.revision|string
targetSize: *2|int
firstBatchReplicas?: int
secondBatchReplicas?: int
batchPartition?: int
}`
)