Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
380 changes: 8 additions & 372 deletions crds/workspace.devfile.io_devworkspaces.v1beta1.yaml

Large diffs are not rendered by default.

380 changes: 8 additions & 372 deletions crds/workspace.devfile.io_devworkspaces.yaml

Large diffs are not rendered by default.

371 changes: 8 additions & 363 deletions crds/workspace.devfile.io_devworkspacetemplates.v1beta1.yaml

Large diffs are not rendered by default.

371 changes: 8 additions & 363 deletions crds/workspace.devfile.io_devworkspacetemplates.yaml

Large diffs are not rendered by default.

4 changes: 0 additions & 4 deletions pkg/apis/workspaces/v1alpha1/parent_conversion.go
Original file line number Diff line number Diff line change
Expand Up @@ -219,10 +219,6 @@ func convertParentCommandFrom_v1alpha2(src *v1alpha2.CommandParentOverride, dest
dest.Composite.Id = srcId
case src.Exec != nil:
dest.Exec.Id = srcId
case src.VscodeLaunch != nil:
dest.VscodeLaunch.Id = srcId
case src.VscodeTask != nil:
dest.VscodeTask.Id = srcId
}
return nil
}
Expand Down
46 changes: 1 addition & 45 deletions pkg/apis/workspaces/v1alpha2/commands.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,12 @@ import (

// CommandType describes the type of command.
// Only one of the following command type may be specified.
// +kubebuilder:validation:Enum=Exec;Apply;VscodeTask;VscodeLaunch;Composite;Custom
// +kubebuilder:validation:Enum=Exec;Apply;Composite;Custom
type CommandType string

const (
ExecCommandType CommandType = "Exec"
ApplyCommandType CommandType = "Apply"
VscodeTaskCommandType CommandType = "VscodeTask"
VscodeLaunchCommandType CommandType = "VscodeLaunch"
CompositeCommandType CommandType = "Composite"
CustomCommandType CommandType = "Custom"
)
Expand Down Expand Up @@ -92,14 +90,6 @@ type CommandUnion struct {
// +optional
Apply *ApplyCommand `json:"apply,omitempty"`

// Command providing the definition of a VsCode Task
// +optional
VscodeTask *VscodeConfigurationCommand `json:"vscodeTask,omitempty"`

// Command providing the definition of a VsCode launch action
// +optional
VscodeLaunch *VscodeConfigurationCommand `json:"vscodeLaunch,omitempty"`

// Composite command that allows executing several sub-commands
// either sequentially or concurrently
// +optional
Expand Down Expand Up @@ -173,40 +163,6 @@ type CompositeCommand struct {
Parallel bool `json:"parallel,omitempty"`
}

// VscodeConfigurationCommandLocationType describes the type of
// the location the configuration is fetched from.
// Only one of the following component type may be specified.
// +kubebuilder:validation:Enum=Uri;Inlined
type VscodeConfigurationCommandLocationType string

const (
UriVscodeConfigurationCommandLocationType VscodeConfigurationCommandLocationType = "Uri"
InlinedVscodeConfigurationCommandLocationType VscodeConfigurationCommandLocationType = "Inlined"
)

// +union
type VscodeConfigurationCommandLocation struct {
// Type of Vscode configuration command location
// +
// +unionDiscriminator
// +optional
LocationType VscodeConfigurationCommandLocationType `json:"locationType,omitempty"`

// Location as an absolute of relative URI
// the VsCode configuration will be fetched from
// +optional
Uri string `json:"uri,omitempty"`

// Inlined content of the VsCode configuration
// +optional
Inlined string `json:"inlined,omitempty"`
}

type VscodeConfigurationCommand struct {
BaseCommand `json:",inline"`
VscodeConfigurationCommandLocation `json:",inline"`
}

type CustomCommand struct {
LabeledCommand `json:",inline"`

Expand Down
2 changes: 1 addition & 1 deletion pkg/apis/workspaces/v1alpha2/projects.go
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ type ProjectSource struct {
// +optional
Git *GitProjectSource `json:"git,omitempty"`

// Project's GitHub source
// Project's GitHub source. Deprecated, use `Git` instead
// +optional
Github *GithubProjectSource `json:"github,omitempty"`

Expand Down
168 changes: 0 additions & 168 deletions pkg/apis/workspaces/v1alpha2/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading