Skip to content

Commit

Permalink
Chore: update cue version to 0.4.3
Browse files Browse the repository at this point in the history
Signed-off-by: FogDong <[email protected]>
  • Loading branch information
FogDong committed Aug 10, 2022
1 parent 3adc839 commit ed7a7c0
Show file tree
Hide file tree
Showing 45 changed files with 1,021 additions and 666 deletions.
4 changes: 2 additions & 2 deletions api/v1alpha1/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ type WorkflowRunStatus struct {
EndTime metav1.Time `json:"endTime,omitempty"`
}

// Workflow defines workflow steps and other attributes
// WorkflowSpec defines workflow steps and other attributes
type WorkflowSpec struct {
Steps []WorkflowStep `json:"steps,omitempty"`
}
Expand Down Expand Up @@ -140,7 +140,7 @@ type WorkflowStepMeta struct {
Alias string `json:"alias,omitempty"`
}

// WorkflowSubStep defines how to execute a workflow subStep.
// WorkflowStepBase defines the workflow step base
type WorkflowStepBase struct {
// Name is the unique name of the workflow step.
Name string `json:"name"`
Expand Down
6 changes: 3 additions & 3 deletions charts/vela-workflow/crds/core.oam.dev_workflowruns.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ spec:
workflowRef:
type: string
workflowSpec:
description: Workflow defines workflow steps and other attributes
description: WorkflowSpec defines workflow steps and other attributes
properties:
steps:
items:
Expand Down Expand Up @@ -114,8 +114,8 @@ spec:
x-kubernetes-preserve-unknown-fields: true
subSteps:
items:
description: WorkflowSubStep defines how to execute a
workflow subStep.
description: WorkflowStepBase defines the workflow step
base
properties:
dependsOn:
description: DependsOn is the dependency of the step
Expand Down
3 changes: 1 addition & 2 deletions charts/vela-workflow/crds/core.oam.dev_workflows.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,7 @@ spec:
x-kubernetes-preserve-unknown-fields: true
subSteps:
items:
description: WorkflowSubStep defines how to execute a workflow
subStep.
description: WorkflowStepBase defines the workflow step base
properties:
dependsOn:
description: DependsOn is the dependency of the step
Expand Down
1 change: 0 additions & 1 deletion charts/vela-workflow/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,6 @@ admissionWebhooks:
enabled: false
certManager:
enabled: false
revisionHistoryLimit: 3

## @param kubeClient.qps The qps for reconcile clients, default is 50
## @param kubeClient.burst The burst for reconcile clients, default is 100
Expand Down
4 changes: 1 addition & 3 deletions controllers/workflow_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1489,7 +1489,5 @@ metadata:
spec:
schematic:
cue:
template: "import (\n\t\"vela/op1\"\n)\n\napply: op.#Apply & {\n\tvalue: parameter.value\n\tcluster:
parameter.cluster\n}\nparameter: {\n\t// +usage=Specify the value of the object\n\tvalue:
{...}\n\t// +usage=Specify the cluster of the object\n\tcluster: *\"\" | string\n}\n"`
template: ":"`
)
1 change: 1 addition & 0 deletions controllers/workflowrun_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ var (
ReconcileTimeout = time.Minute * 3
)

// Reconcile reconciles the WorkflowRun object
//+kubebuilder:rbac:groups=core.oam.dev,resources=workflowruns,verbs=get;list;watch;create;update;patch;delete
//+kubebuilder:rbac:groups=core.oam.dev,resources=workflowruns/status,verbs=get;update;patch
//+kubebuilder:rbac:groups=core.oam.dev,resources=workflowruns/finalizers,verbs=update
Expand Down
6 changes: 2 additions & 4 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/kubevela/workflow
go 1.17

require (
cuelang.org/go v0.2.2
cuelang.org/go v0.4.4-0.20220729051708-0a46a1624353
github.com/agiledragon/gomonkey/v2 v2.4.0
github.com/crossplane/crossplane-runtime v0.14.1-0.20210722005935-0b469fcc77cd
github.com/evanphx/json-patch v4.12.0+incompatible
Expand All @@ -16,7 +16,7 @@ require (
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.7.0
gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
gopkg.in/yaml.v3 v3.0.1
k8s.io/api v0.24.2
k8s.io/apiextensions-apiserver v0.24.2
k8s.io/apimachinery v0.24.2
Expand Down Expand Up @@ -66,7 +66,6 @@ require (
github.com/prometheus/client_model v0.2.0 // indirect
github.com/prometheus/common v0.32.1 // indirect
github.com/prometheus/procfs v0.7.3 // indirect
github.com/rogpeppe/go-internal v1.8.0 // indirect
go.uber.org/atomic v1.9.0 // indirect
go.uber.org/multierr v1.6.0 // indirect
go.uber.org/zap v1.19.1 // indirect
Expand All @@ -77,7 +76,6 @@ require (
golang.org/x/text v0.3.7 // indirect
golang.org/x/time v0.0.0-20220224211638-0e9765cccd65 // indirect
golang.org/x/tools v0.1.11-0.20220316014157-77aa08bb151a // indirect
golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f // indirect
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/protobuf v1.28.0 // indirect
Expand Down
Loading

0 comments on commit ed7a7c0

Please sign in to comment.