Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

align workload/trait definition schema with v0.2.2 spec #1117

Merged
merged 1 commit into from
Mar 4, 2021

Conversation

wonderflow
Copy link
Collaborator

@wonderflow wonderflow commented Mar 1, 2021

fix #976

align with oam-dev/spec#443

@codecov
Copy link

codecov bot commented Mar 2, 2021

Codecov Report

Merging #1117 (8c8ca60) into master (a833792) will decrease coverage by 1.69%.
The diff coverage is 85.71%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #1117      +/-   ##
==========================================
- Coverage   53.74%   52.04%   -1.70%     
==========================================
  Files          70       72       +2     
  Lines        5975     6244     +269     
==========================================
+ Hits         3211     3250      +39     
- Misses       2404     2634     +230     
  Partials      360      360              
Flag Coverage Δ
unittests 52.04% <85.71%> (-1.70%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
pkg/utils/apply/apply.go 90.74% <ø> (ø)
pkg/oam/util/template.go 40.29% <83.33%> (+2.79%) ⬆️
...dev/v1alpha2/traitdefinition/validating_handler.go 54.05% <100.00%> (ø)
...ha2/applicationconfiguration/validating_handler.go 77.94% <0.00%> (-4.42%) ⬇️
...oam.dev/v1alpha2/applicationconfiguration/apply.go 63.76% <0.00%> (-0.30%) ⬇️
...am.dev/v1alpha2/applicationconfiguration/render.go 87.47% <0.00%> (-0.12%) ⬇️
pkg/oam/util/helper.go 69.07% <0.00%> (ø)
pkg/controller/common/rollout/rollout_webhook.go 0.00% <0.00%> (ø)
...ntroller/common/rollout/rollout_plan_controller.go 0.00% <0.00%> (ø)
...am.dev/v1alpha2/applicationconfiguration/helper.go 77.04% <0.00%> (+0.38%) ⬆️
... and 2 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update a833792...8c8ca60. Read the comment docs.

@wonderflow wonderflow requested review from resouer and ryanzhang-oss and removed request for resouer March 2, 2021 09:51
Copy link
Member

@hongchaodeng hongchaodeng left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

// Schematic defines the encapsulation of this capability(workload/trait/scope),
// the encapsulation can be defined in different ways, e.g. CUE/HCL(terraform)/KUBE(K8s Object)/HELM, etc...
type Schematic struct {
CUE *CUE `json:"cue,omitempty"`
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are some discussions about using a plug-in model instead of hardcode each schematic

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The agreement is we keep it as is until another new schematic type besides CUE, Helm, Kube, ARM comes in.

@wonderflow wonderflow merged commit 570cf01 into kubevela:master Mar 4, 2021
@wonderflow wonderflow deleted the cap branch March 4, 2021 03:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Upgrade template out from extension of Definition Spec
4 participants